foxesscloud 2.6.1__tar.gz → 2.6.3__tar.gz

{foxesscloud-2.6.1/src/foxesscloud.egg-info → foxesscloud-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.6.1
+Version: 2.6.3
 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,15 @@ This setting can be:
 
 # Version Info
 
+2.6.3<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.
+Update charge_compare(), Solcast() and Solar() so date (d) parameter is more flexible.
+
 2.6.1<br>
 Fix problem where battery discharges below min_soc while waiting for charging to start.
 Update calibration for Force Charge with BMS 1.014 and later.

{foxesscloud-2.6.1 → foxesscloud-2.6.3}/README.md

@@ -773,6 +773,15 @@ This setting can be:
 
 # Version Info
 
+2.6.3<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.
+Update charge_compare(), Solcast() and Solar() so date (d) parameter is more flexible.
+
 2.6.1<br>
 Fix problem where battery discharges below min_soc while waiting for charging to start.
 Update calibration for Force Charge with BMS 1.014 and later.

{foxesscloud-2.6.1 → foxesscloud-2.6.3}/pyproject.toml

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

{foxesscloud-2.6.1 → foxesscloud-2.6.3}/src/foxesscloud/foxesscloud.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud
-Updated:  09 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.3"
+version = "1.7.5"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -65,7 +65,7 @@ def plot_show():
 ##################################################################################################
 ##################################################################################################
 
-def query_date(d, offset = None):
+def convert_date(d):
     if d is not None and len(d) < 18:
         if len(d) == 10:
             d += ' 00:00:00'
@@ -76,8 +76,12 @@ def query_date(d, offset = None):
     try:
         t = datetime.now() if d is None else datetime.strptime(d, "%Y-%m-%d %H:%M:%S")
     except Exception as e:
-        output(f"** query_date(): {str(e)}")
+        output(f"** convert_date(): {str(e)}")
         return None
+    return t
+
+def query_date(d, offset = None):
+    t = convert_date(d)
     if offset is not None:
         t += timedelta(days = offset)
     return {'year': t.year, 'month': t.month, 'day': t.day, 'hour': t.hour, 'minute': t.minute, 'second': t.second}
@@ -594,8 +598,8 @@ battery_params = {
     2: {'table': [ 0, 2, 10, 10, 15, 15, 25, 50, 50, 50, 30, 20, 0],
         'step': 5,
         'offset': 5,
-        'charge_loss': 1.080,
-        'discharge_loss': 0.975},
+        'charge_loss': 1.08,
+        'discharge_loss': 0.85},
 }
 
 def get_battery(info=1):
@@ -628,11 +632,15 @@ 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
+    battery['soh'] = None
+    battery['soh_supported'] = False
     if battery.get('residual') is not None:
         battery['residual'] /= 1000
-    if residual_handling == 2:
+    if battery['residual_handling'] == 2:
         capacity = battery.get('residual')
         soc = battery.get('soc')
         residual = capacity * soc / 100 if capacity is not None and soc is not None else capacity
@@ -643,7 +651,7 @@ def get_battery(info=1):
     battery['capacity'] = round(capacity, 3)
     battery['residual'] = round(residual, 3)
     battery['charge_rate'] = 50
-    params = battery_params[residual_handling]
+    params = battery_params[battery['residual_handling']]
     battery['charge_loss'] = params['charge_loss']
     battery['discharge_loss'] = params['discharge_loss']
     if battery.get('temperature') is not None:
@@ -679,20 +687,38 @@ 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':
-            residual_handling = 2
-        capacity = b['ratedCapacity'] / 1000 * int(b['soh']) / 100
-        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)
-        b['residual'] = round(residual, 3)
+        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'] = int(b['soh'])
+            b['soh_supported'] = True
+        else:
+            b['rated_capacity'] = None
+            b['soh'] = None
+            b['soh_supported'] = False
+    for i, b in enumerate(batteries):
+        if i == 0:
+            residual_handling = b['residual_handling']
+            get_battery(info=0)
+            battery['ratedCapacity'] = b.get('ratedCapacity')
+            b['capacity'] = battery.get('capacity')
+            b['residual'] = battery.get('residual')
+            b['soc'] = battery.get('soc')
+        if b.get('capacity') is None and b.get('soh') is not None:
+            capacity = (b['ratedCapacity'] / 1000 * b['soh'] / 100)
+            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)
+            b['residual'] = round(residual, 3)
+        if b.get('capacity') is not None and b.get('ratedCapacity') is not None:
+            b['soh'] = round(b['capacity'] / b['ratedCapacity'] * 1000 * 100, 1)
         b['charge_rate'] = 50
-        params = battery_params[residual_handling]
+        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'])]
-    battery = batteries[0]
     return batteries
 
 ##################################################################################################
@@ -2165,9 +2191,9 @@ def hours_difference(t1, t2):
     if t1 == t2:
         return 0.0
     if type(t1) is str:
-        t1 = datetime.strptime(t1, '%Y-%m-%d %H:%M')
+        t1 = convert_date(t1)
     if type(t2) is str:
-        t2 = datetime.strptime(t2, '%Y-%m-%d %H:%M')
+        t2 = convert_date(t2)
     return round((t1 - t2).total_seconds() / 3600,1)
 
 ##################################################################################################
@@ -2331,7 +2357,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
@@ -2344,7 +2370,7 @@ def get_agile_times(tariff=agile_octopus, d=None):
     if d is not None and len(d) < 11:
         d += " 18:00"
     # get dates and times
-    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if d is None else convert_date(d)
     time_offset = daylight_saving(system_time) if daylight_saving is not None else 0
     # adjust system to get local time now
     now = system_time + timedelta(hours=time_offset)
@@ -2815,7 +2841,7 @@ charge_needed_app_key = "awcr5gro2v13oher3v1qu6hwnovp28"
 def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=None, show_plot=None, run_after=None, reload=2,
         forecast_times=None, force_charge=0, test_time=None, test_soc=None, test_charge=None, **settings):
     global device, seasonality, solcast_api_key, debug_setting, tariff, solar_arrays, legend_location, time_shift, charge_needed_app_key
-    global timed_strategy, steps_per_hour, base_time, storage, battery
+    global timed_strategy, steps_per_hour, base_time, storage, battery, charge_rates
     print(f"\n---------------- charge_needed ----------------")
     # validate parameters
     args = locals()
@@ -2843,7 +2869,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if type(forecast_times) is not list:
         forecast_times = [forecast_times]
     # get dates and times
-    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if test_time is None else datetime.strptime(test_time, '%Y-%m-%d %H:%M')
+    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if test_time is None else convert_date(test_time)
     time_offset = daylight_saving(system_time) if daylight_saving is not None else 0
     now = system_time + timedelta(hours=time_offset)
     today = datetime.strftime(now, '%Y-%m-%d')
@@ -2916,14 +2942,14 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         output(f"full_charge = {full_charge}")
     if test_soc is not None:
         current_soc = test_soc
-        capacity = 14.54
+        capacity = 14.53
         residual = test_soc * capacity / 100
         bat_volt = 317.4
         bat_power = 0.0
         temperature = 30
         bms_charge_current = 15
-        charge_loss = 1.080
-        discharge_loss = 0.975
+        charge_loss = charge_rates[2]['charge_loss']
+        discharge_loss = charge_rates[2]['discharge_loss']
         bat_current = 0.0
         device_power = 6.0
         device_current = 35
@@ -2971,6 +2997,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     output(f"  Temperature: {temperature:.1f}°C")
     output(f"  Resistance:  {bat_resistance:.2f} ohms")
     output(f"  Nominal OCV: {bat_ocv:.1f}V at {nominal_soc}% SoC")
+    output(f"  Losses:      {charge_loss * 100:.1f}% charge / {discharge_loss * 100:.1f}% discharge")
     # charge current may be derated based on temperature
     charge_current = device_current if charge_config['charge_current'] is None else charge_config['charge_current']
     if charge_current > bms_charge_current:
@@ -3309,10 +3336,10 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
 
 def charge_compare(save=None, v=None, show_data=1, show_plot=3, d=None):
     global charge_config, storage
-    now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+    now = convert_date(d)
     yesterday = datetime.strftime(datetime.date(now - timedelta(days=1)), '%Y-%m-%d')
     if save is None and charge_config.get('save') is not None:
-        save = charge_config.get('save').replace('###', yesterday)
+        save = charge_config.get('save').replace('###', yesterday if d is None else d[:10])
         if not os.path.exists(storage + save):
             save = None
     if save is None:
@@ -3339,7 +3366,7 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3, d=None):
     base_hour = int(time_hours(base_time[11:16]))
     start_day = base_time[:10]
     print(f"Run at {start_day} {hours_time(hour_now)} with SoC {current_soc:.0f}%")
-    now = datetime.strptime(base_time, '%Y-%m-%d %H:%M')
+    now = convert_date(base_time)
     end_day = datetime.strftime(now + timedelta(hours=run_time / steps_per_hour), '%Y-%m-%d')
     if v is None:
         v = ['pvPower', 'loadsPower', 'SoC']
@@ -3372,13 +3399,14 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3, d=None):
         for i in range(0, run_time):
             plots[v][i] = plots[v][i] / count[v][i] if count[v][i] > 0 else None
     if show_data > 0 and plots.get('SoC') is not None:
-        data_wrap = charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 6
-        s = f"\nBattery Energy kWh:" if show_data == 2 else f"\nBattery SoC:"
+        data_wrap = 1 #charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 1
+        s = f"\nBattery Energy kWh (predicted / actual):" if show_data == 2 else f"\nBattery SoC (predicted / actual):"
         h = base_hour
         t = 0
         while t < len(time_line) and bat_timed[t] is not None and plots['SoC'][t] is not None:
             col = h % data_wrap
             s += f"\n  {hours_time(time_line[t])}" if t == 0 or col == 0 else ""
+            s += f" {bat_timed[t]:5.2f}" if show_data == 2 else f"  {bat_timed[t] / capacity * 100:3.0f}%"
             s += f" {plots['SoC'][t]:5.2f}" if show_data == 2 else f"  {plots['SoC'][t] / capacity * 100:3.0f}%"
             h += 1
             t += steps_per_hour
@@ -3529,12 +3557,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)")
@@ -3944,7 +3972,7 @@ class Solcast :
         # The forecasts and estimated also both include the current time, so the data has to be de-duplicated to get an accurate total for a day
         global debug_setting, solcast_url, solcast_api_key, solcast_save, storage
         self.data = {}
-        now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+        now = convert_date(d)
         self.shading = None if shading is None else shading if shading.get('solcast') is None else shading['solcast'] 
         self.today = datetime.strftime(datetime.date(now), '%Y-%m-%d')
         self.quarter = int(self.today[5:7]) // 3 % 4
@@ -4288,7 +4316,7 @@ class Solar :
     def __init__(self, reload=0, quiet=False, shading=None, d=None):
         global solar_arrays, solar_save, solar_total, solar_url, solar_api_key, storage
         self.shading = None if shading is None else shading if shading.get('solar') is None else shading['solar'] 
-        now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+        now = convert_date(d)
         self.today = datetime.strftime(datetime.date(now), '%Y-%m-%d')
         self.quarter = int(self.today[5:7]) // 3 % 4
         self.tomorrow = datetime.strftime(datetime.date(now + timedelta(days=1)), '%Y-%m-%d')

{foxesscloud-2.6.1 → foxesscloud-2.6.3}/src/foxesscloud/openapi.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud using Open API
-Updated:  09 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.1"
+version = "2.6.3"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -66,8 +66,7 @@ def plot_show():
 ##################################################################################################
 ##################################################################################################
 
-# return query date as a dictionary with year, month, day, hour, minute, second
-def query_date(d, offset = None):
+def convert_date(d):
     if d is not None and len(d) < 18:
         if len(d) == 10:
             d += ' 00:00:00'
@@ -78,8 +77,13 @@ def query_date(d, offset = None):
     try:
         t = datetime.now() if d is None else datetime.strptime(d, "%Y-%m-%d %H:%M:%S")
     except Exception as e:
-        output(f"** query_date(): {str(e)}")
+        output(f"** convert_date(): {str(e)}")
         return None
+    return t
+
+# return query date as a dictionary with year, month, day, hour, minute, second
+def query_date(d, offset = None):
+    t = convert_date(d)
     if offset is not None:
         t += timedelta(days = offset)
     return {'year': t.year, 'month': t.month, 'day': t.day, 'hour': t.hour, 'minute': t.minute, 'second': t.second}
@@ -94,7 +98,7 @@ def query_time(d, time_span):
         else:
             d += ':00'
     try:
-        t = datetime.now().replace(minute=0, second=0, microsecond=0) if d is None else datetime.strptime(d, "%Y-%m-%d %H:%M:%S")
+        t = datetime.now().replace(minute=0, second=0, microsecond=0) if d is None else convert_date(d)
     except Exception as e:
         output(f"** query_time(): {str(e)}")
         return (None, None)
@@ -560,7 +564,7 @@ battery_params = {
         'step': 5,
         'offset': 5,
         'charge_loss': 1.080,
-        'discharge_loss': 0.975},
+        'discharge_loss': 0.85},
 }
 
 def get_battery(info=0, v=None):
@@ -575,7 +579,11 @@ def get_battery(info=0, v=None):
         battery = {}
     for i in range(0, len(battery_vars)):
         battery[battery_data[i]] = result[i].get('value')
-    if residual_handling == 2:
+    battery['residual_handling'] = residual_handling
+    battery['rated_capacity'] = None
+    battery['soh'] = None
+    battery['soh_supported'] = False
+    if battery['residual_handling'] == 2:
         capacity = battery.get('residual')
         soc = battery.get('soc')
         residual = capacity * soc / 100 if capacity is not None and soc is not None else capacity
@@ -587,7 +595,7 @@ def get_battery(info=0, v=None):
     battery['residual'] = round(residual, 3)
     battery['status'] = 1
     battery['charge_rate'] = 50
-    params = battery_params[residual_handling]
+    params = battery_params[battery['residual_handling']]
     battery['charge_loss'] = params['charge_loss']
     battery['discharge_loss'] = params['discharge_loss']
     if battery.get('temperature') is not None:
@@ -597,8 +605,8 @@ def get_battery(info=0, v=None):
 def get_batteries(info=0):
     global battery, batteries
     get_battery(info=info)
-    battery['ratedCapacity'] = None
-    battery['soh'] = None
+    if battery is None:
+        return None
     batteries = [battery]
     return batteries
 
@@ -1984,9 +1992,9 @@ def hours_difference(t1, t2):
     if t1 == t2:
         return 0.0
     if type(t1) is str:
-        t1 = datetime.strptime(t1, '%Y-%m-%d %H:%M')
+        t1 = convert_date(t1)
     if type(t2) is str:
-        t2 = datetime.strptime(t2, '%Y-%m-%d %H:%M')
+        t2 = convert_date(t2)
     return round((t1 - t2).total_seconds() / 3600,1)
 
 ##################################################################################################
@@ -2150,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
@@ -2163,7 +2171,7 @@ def get_agile_times(tariff=agile_octopus, d=None):
     if d is not None and len(d) < 11:
         d += " 18:00"
     # get dates and times
-    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if d is None else convert_date(d)
     time_offset = daylight_saving(system_time) if daylight_saving is not None else 0
     # adjust system to get local time now
     now = system_time + timedelta(hours=time_offset)
@@ -2634,7 +2642,7 @@ charge_needed_app_key = "awcr5gro2v13oher3v1qu6hwnovp28"
 def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=None, show_plot=None, run_after=None, reload=2,
         forecast_times=None, force_charge=0, test_time=None, test_soc=None, test_charge=None, **settings):
     global device, seasonality, solcast_api_key, debug_setting, tariff, solar_arrays, legend_location, time_shift, charge_needed_app_key
-    global timed_strategy, steps_per_hour, base_time, storage, battery
+    global timed_strategy, steps_per_hour, base_time, storage, battery, charge_rates
     print(f"\n---------------- charge_needed ----------------")
     # validate parameters
     args = locals()
@@ -2662,7 +2670,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if type(forecast_times) is not list:
         forecast_times = [forecast_times]
     # get dates and times
-    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if test_time is None else datetime.strptime(test_time, '%Y-%m-%d %H:%M')
+    system_time = (datetime.now(tz=timezone.utc) + timedelta(hours=time_shift)) if test_time is None else convert_date(test_time)
     time_offset = daylight_saving(system_time) if daylight_saving is not None else 0
     now = system_time + timedelta(hours=time_offset)
     today = datetime.strftime(now, '%Y-%m-%d')
@@ -2741,8 +2749,8 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         bat_power = 0.0
         temperature = 30
         bms_charge_current = 15
-        charge_loss = 1.080
-        discharge_loss = 0.975
+        charge_loss = charge_rates[2]['charge_loss']
+        discharge_loss = charge_rates[2]['discharge_loss']
         bat_current = 0.0
         device_power = 6.0
         device_current = 35
@@ -3126,10 +3134,10 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
 
 def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     global charge_config, storage
-    now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+    now = convert_date(d)
     yesterday = datetime.strftime(datetime.date(now - timedelta(days=1)), '%Y-%m-%d')
     if save is None and charge_config.get('save') is not None:
-        save = charge_config.get('save').replace('###', yesterday)
+        save = charge_config.get('save').replace('###', yesterday if d is None else d[:10])
         if not os.path.exists(storage + save):
             save = None
     if save is None:
@@ -3156,7 +3164,7 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     base_hour = int(time_hours(base_time[11:16]))
     start_day = base_time[:10]
     print(f"Run at {start_day} {hours_time(hour_now)} with SoC {current_soc:.0f}%")
-    now = datetime.strptime(base_time, '%Y-%m-%d %H:%M')
+    now = convert_date(base_time)
     end_day = datetime.strftime(now + timedelta(hours=run_time / steps_per_hour), '%Y-%m-%d')
     if v is None:
         v = ['pvPower', 'loadsPower', 'SoC']
@@ -3345,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)")
@@ -3760,7 +3768,7 @@ class Solcast :
         # The forecasts and estimated also both include the current time, so the data has to be de-duplicated to get an accurate total for a day
         global debug_setting, solcast_url, solcast_api_key, solcast_save, storage
         self.data = {}
-        now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+        now = convert_date(d)
         self.shading = None if shading is None else shading if shading.get('solcast') is None else shading['solcast'] 
         self.today = datetime.strftime(datetime.date(now), '%Y-%m-%d')
         self.quarter = int(self.today[5:7]) // 3 % 4
@@ -4104,7 +4112,7 @@ class Solar :
     def __init__(self, reload=0, quiet=False, shading=None, d=None):
         global solar_arrays, solar_save, solar_total, solar_url, solar_api_key, storage
         self.shading = None if shading is None else shading if shading.get('solar') is None else shading['solar'] 
-        now = datetime.now() if d is None else datetime.strptime(d, '%Y-%m-%d %H:%M')
+        now = convert_date(d)
         self.today = datetime.strftime(datetime.date(now), '%Y-%m-%d')
         self.quarter = int(self.today[5:7]) // 3 % 4
         self.tomorrow = datetime.strftime(datetime.date(now + timedelta(days=1)), '%Y-%m-%d')

{foxesscloud-2.6.1 → foxesscloud-2.6.3/src/foxesscloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.6.1
+Version: 2.6.3
 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,15 @@ This setting can be:
 
 # Version Info
 
+2.6.3<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.
+Update charge_compare(), Solcast() and Solar() so date (d) parameter is more flexible.
+
 2.6.1<br>
 Fix problem where battery discharges below min_soc while waiting for charging to start.
 Update calibration for Force Charge with BMS 1.014 and later.