foxesscloud 2.6.2__tar.gz → 2.6.4__tar.gz

{foxesscloud-2.6.2/src/foxesscloud.egg-info → foxesscloud-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.6.2
+Version: 2.6.4
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -787,6 +787,10 @@ This setting can be:
 
 # Version Info
 
+2.6.4<br>
+Increase default plungs_slots from 6 to 8.
+Correct battery capacity in get_batteries().
+
 2.6.2<br>
 Update battery calibration for charge_needed() when residual_handling is 2.
 Update get_battery() and get_batteries() to include states for ratedCapacity, soh, residual_handling and soh_supported.

{foxesscloud-2.6.2 → foxesscloud-2.6.4}/README.md

@@ -773,6 +773,10 @@ This setting can be:
 
 # Version Info
 
+2.6.4<br>
+Increase default plungs_slots from 6 to 8.
+Correct battery capacity in get_batteries().
+
 2.6.2<br>
 Update battery calibration for charge_needed() when residual_handling is 2.
 Update get_battery() and get_batteries() to include states for ratedCapacity, soh, residual_handling and soh_supported.

{foxesscloud-2.6.2 → foxesscloud-2.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "foxesscloud"
-version = "2.6.2"
+version = "2.6.4"
 authors = [
   {name="Tony Matthews", email="tony@quasair.co.uk"},
 ]

{foxesscloud-2.6.2 → foxesscloud-2.6.4}/src/foxesscloud/foxesscloud.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud
-Updated:  12 October 2024
+Updated:  13 October 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2023
 ##################################################################################################
 
-version = "1.7.4"
+version = "1.7.6"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -632,7 +632,7 @@ def get_battery(info=1):
                 output(f"** get_battery().info, no result data, {errno_message(errno)}")
             else:
                 battery['info'] = result['batteries'][0]
-                if battery['info']['masterVersion'] >= '1.014':
+                if battery['info']['masterVersion'] >= '1.014' and battery['info']['masterSN'][:7] == '60BBHV2':
                     residual_handling = 2
     battery['residual_handling'] = residual_handling
     battery['rated_capacity'] = None
@@ -687,32 +687,35 @@ def get_batteries(info=1):
                 for i in range(0, len(batteries)):
                     batteries[i]['info'] = result['batteries'][i]
     for b in batteries:
-        if b.get('info') is not None and b['info']['masterVersion'] >= '1.014':
+        b['residual_handling'] = residual_handling
+        if b.get('info') is not None and b['info']['masterVersion'] >= '1.014' and b['info']['masterSN'][:7] == '60BBHV2':
             b['residual_handling'] = 2
-        if b.get('soh') is not None and b['soh'].isnumeric():
-            b['soh_supported'] = True
-        else:
-            b['rated_capacity'] = None
-            b['soh'] = None
-            b['soh_supported'] = False
-    for b in batteries:
-        if b.get('soh_supported') is not None and b['soh_supported']:
-            capacity = (b['ratedCapacity'] / 1000 * int(b['soh']) / 100)
+        rated_capacity = b.get('ratedCapacity')
+        b['ratedCapacity'] = rated_capacity if rated_capacity is not None and rated_capacity > 100 else None
+        soh = b.get('soh')
+        b['soh'] = int(soh) if soh.isnumeric() and int(soh) > 10 else None
+        b['soh_supported'] = b['soh'] is not None
+    for i, b in enumerate(batteries):
+        if i == 0:
+            residual_handling = b['residual_handling']
+            get_battery(info=0)
+            b['capacity'] = battery.get('capacity')
+            b['residual'] = battery.get('residual')
+            b['soc'] = battery.get('soc')
+        if b.get('capacity') is None and b.get('ratedCapacity') is not None and b.get('soh') is not None:
+            b['capacity'] = round(b['ratedCapacity'] / 1000 * b['soh'] / 100, 3)
+        if b.get('residual') is None and b.get('capacity') is not None and b.get('soc') is not None:
             soc = b.get('soc')
-            residual = capacity * soc / 100 if capacity is not None and soc is not None else capacity
-            b['capacity'] = round(capacity, 3)
+            residual = b['capacity'] * b['soc'] / 100
             b['residual'] = round(residual, 3)
-            b['charge_rate'] = 50
-            params = battery_params[residual_handling]
-            b['charge_loss'] = params['charge_loss']
-            b['discharge_loss'] = params['discharge_loss']
-            if b.get('temperature') is not None:
-                b['charge_rate'] = params['table'][int((b['temperature'] - params['offset']) / params['step'])]
-        else:
-            get_battery(info=info)
-            batteries = [battery]
-            break
-    battery = batteries[0]
+        if b.get('capacity') is not None and b.get('ratedCapacity') is not None:
+            b['soh'] = round(b['capacity'] * 1000 / b['ratedCapacity'] * 100, 1)
+        b['charge_rate'] = 50
+        params = battery_params[b['residual_handling']]
+        b['charge_loss'] = params['charge_loss']
+        b['discharge_loss'] = params['discharge_loss']
+        if b.get('temperature') is not None:
+            b['charge_rate'] = params['table'][int((b['temperature'] - params['offset']) / params['step'])]
     return batteries
 
 ##################################################################################################
@@ -2351,7 +2354,7 @@ tariff_config = {
     'update_time': 16.5,                  # time in hours when tomrow's data can be fetched
     'weighting': None,                    # weights for weighted average
     'plunge_price': [3, 3],               # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
-    'plunge_slots': 6,                    # number of 30 minute slots to use
+    'plunge_slots': 8,                    # number of 30 minute slots to use
     'data_wrap': 6,                       # prices to show per line
     'show_data': 1,                       # show pricing data
     'show_plot': 1                        # plot pricing data
@@ -2412,9 +2415,9 @@ def get_agile_times(tariff=agile_octopus, d=None):
     plunge = []
     plunge_price = tariff_config['plunge_price'] if tariff_config.get('plunge_price') is not None else 2
     plunge_price = [plunge_price] if type(plunge_price) is not list else plunge_price
-    plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 6
+    plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 8
     for i in range(0, len(prices)):
-        # hour relative index into list of plunge prices, starting at 7am
+        # hour relative index into list of plunge prices and slots, starting at 7am
         x = int(((now.hour - 7 + i / 2) % 24) * len(plunge_price) / 24)
         if prices[i] is not None and prices[i]['price'] < plunge_price[x]:
             plunge.append(i)
@@ -3551,12 +3554,12 @@ def battery_info(log=0, plot=1, count=None, info=1, bat=None):
                 for v in cell_temps:
                     s +=f",{v:.0f}"
         return s
-    if rated_capacity is not None:
-        output(f"Rated Capacity:      {rated_capacity / 1000:.2f}kWh")
-        output(f"SoH:                 {bat_soh}%")
     output(f"Current SoC:         {current_soc}%")
-    output(f"Capacity:            {capacity:.2f}kWh")
-    output(f"Residual:            {residual:.2f}kWh" + (" (SoC x Capacity)" if bat['residual_handling'] == 2 else ""))
+    output(f"Capacity:            {capacity:.2f}kWh" + (" (Residual / SoC x 100)" if bat['residual_handling'] == 1 else ""))
+    output(f"Residual:            {residual:.2f}kWh" + (" (SoC x Capacity / 100)" if bat['residual_handling'] == 2 else ""))
+    if rated_capacity is not None and bat_soh is not None:
+        output(f"Rated Capacity:      {rated_capacity / 1000:.2f}kWh")
+        output(f"SoH:                 {bat_soh:.1f}%" + (" (Capacity / Rated Capacity x 100)" if not bat['soh_supported'] else ""))
     output(f"InvBatVolt:          {bat_volt:.1f}V")
     output(f"InvBatCurrent:       {bat_current:.1f}A")
     output(f"State:               {'Charging' if bat_power < 0 else 'Discharging'} ({abs(bat_power):.3f}kW)")

{foxesscloud-2.6.2 → foxesscloud-2.6.4}/src/foxesscloud/openapi.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud using Open API
-Updated:  12 October 2024
+Updated:  13 October 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2024
 ##################################################################################################
 
-version = "2.6.2"
+version = "2.6.4"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -605,6 +605,8 @@ def get_battery(info=0, v=None):
 def get_batteries(info=0):
     global battery, batteries
     get_battery(info=info)
+    if battery is None:
+        return None
     batteries = [battery]
     return batteries
 
@@ -2156,7 +2158,7 @@ tariff_config = {
     'update_time': 16.5,                  # time in hours when tomrow's data can be fetched
     'weighting': None,                    # weights for weighted average
     'plunge_price': [3, 3],               # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
-    'plunge_slots': 6,                    # number of 30 minute slots to use
+    'plunge_slots': 8,                    # number of 30 minute slots to use
     'data_wrap': 6,                       # prices to show per line
     'show_data': 1,                       # show pricing data
     'show_plot': 1                        # plot pricing data
@@ -2217,7 +2219,7 @@ def get_agile_times(tariff=agile_octopus, d=None):
     plunge = []
     plunge_price = tariff_config['plunge_price'] if tariff_config.get('plunge_price') is not None else 2
     plunge_price = [plunge_price] if type(plunge_price) is not list else plunge_price
-    plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 6
+    plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 8
     for i in range(0, len(prices)):
         # hour relative index into list of plunge prices, starting at 7am
         x = int(((now.hour - 7 + i / 2) % 24) * len(plunge_price) / 24)
@@ -3351,12 +3353,12 @@ def battery_info(log=0, plot=1, count=None, info=1, bat=None):
                 for v in cell_temps:
                     s +=f",{v:.0f}"
         return s
-    if rated_capacity is not None:
-        output(f"Rated Capacity:      {rated_capacity / 1000:.2f}kWh")
-        output(f"SoH:                 {bat_soh}%")
     output(f"Current SoC:         {current_soc}%")
-    output(f"Capacity:            {capacity:.2f}kWh")
-    output(f"Residual:            {residual:.2f}kWh")
+    output(f"Capacity:            {capacity:.2f}kWh" + (" (Residual / SoC x 100)" if bat['residual_handling'] == 1 else ""))
+    output(f"Residual:            {residual:.2f}kWh" + (" (SoC x Capacity / 100)" if bat['residual_handling'] == 2 else ""))
+    if rated_capacity is not None and bat_soh is not None:
+        output(f"Rated Capacity:      {rated_capacity / 1000:.2f}kWh")
+        output(f"SoH:                 {bat_soh:.1f}%" + (" (Capacity / Rated Capacity x 100)" if not bat['soh_supported'] else ""))
     output(f"InvBatVolt:          {bat_volt:.1f}V")
     output(f"InvBatCurrent:       {bat_current:.1f}A")
     output(f"State:               {'Charging' if bat_power < 0 else 'Discharging'} ({abs(bat_power):.3f}kW)")

{foxesscloud-2.6.2 → foxesscloud-2.6.4/src/foxesscloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.6.2
+Version: 2.6.4
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -787,6 +787,10 @@ This setting can be:
 
 # Version Info
 
+2.6.4<br>
+Increase default plungs_slots from 6 to 8.
+Correct battery capacity in get_batteries().
+
 2.6.2<br>
 Update battery calibration for charge_needed() when residual_handling is 2.
 Update get_battery() and get_batteries() to include states for ratedCapacity, soh, residual_handling and soh_supported.