foxesscloud 2.7.4__py3-none-any.whl → 2.7.6__py3-none-any.whl

foxesscloud/foxesscloud.py

@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2023
 ##################################################################################################
 
-version = "1.8.5"
+version = "1.8.7"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -435,7 +435,7 @@ device_sn = None
 var_list = None
 raw_vars = var_list
 
-def get_device(sn=None):
+def get_device(sn=None, device_type=None):
     global device_list, device, device_id, device_sn, firmware, battery, var_list, debug_setting, messages, flag, schedule, templates, remote_settings
     if get_token() is None:
         return None
@@ -490,31 +490,32 @@ def get_device(sn=None):
     firmware = get_firmware()
     remote_settings = get_ui()
     # parse the model code to work out attributes
-    model_code = device['deviceType'].upper()
-    if model_code[:1] == 'T':
-        model_code = 'T3-' + model_code[1:]
+    model_code = device['deviceType'].upper() if device_type is None else device_type
+    if model_code[0] in 'FGRST':
+        phase = '1' if model_code[0] in 'FGS' else '3'
+        model_code = model_code[0] + phase + '-' + model_code[1:]
     elif model_code[:2] == 'KH':
         model_code = 'KH-' + model_code[2:]
     elif model_code[:4] == 'AIO-':
         model_code = 'AIO' + model_code[4:]
-    device['eps'] = 'E' in model_code
+    device['eps'] = 'E' in model_code[2:]
     parts = model_code.split('-')
     model = parts[0]
-    if model not in ['T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
+    if model not in ['F1', 'G1', 'R3', 'S1', 'T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
         output(f"** device model not recognised for deviceType: {device['deviceType']}")
         return device
     device['model'] = model
     device['phase'] = 3 if model[-1:] == '3' else 1
     for p in parts[1:]:
         if p.replace('.','').isnumeric():
-            power = float(p)
-            if power >= 1.0 and power < 50.0:
-                device['power'] = float(p)
+            power = float(p)  / (1000 if model in ['F1', 'S1'] else 1.0)
+            if power >= 0.5 and power < 100.0:
+                device['power'] = power
             break
     if device.get('power') is None:
         output(f"** device power not found for deviceType: {device['deviceType']}")
     # set max charge current
-    if model in ['T3']:
+    if model in ['F1', 'G1', 'R3', 'S1', 'T3']:
         device['max_charge_current'] = None
     elif model in ['KH']:
         device['max_charge_current'] = 50
@@ -1249,9 +1250,6 @@ def get_flag():
         return None
     result = response.json().get('result')
     if result is None:
-        errno = response.json().get('errno')
-        if errno == 40256:
-            output(f"** get_flag(), not suported on this device")
         return None
     if schedule is None:
         schedule = {'enable': None, 'support': None, 'pollcy': None}
@@ -3067,7 +3065,7 @@ 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.40
+        capacity = 14.36
         residual = test_soc * capacity / 100
         bat_volt = 317.4
         bat_power = 0.0
@@ -3919,7 +3917,7 @@ def get_pvoutput(d = None, tou = 0):
     export_tou = ',,,'
     # process list of report_data values (no TOU)
     for var in report_data:
-        wh = int(var['total'] * 1000)
+        wh = int(var['total'] * 1000) if var['total'] is not None else 0
         if var['variable'] == 'feedin':
             export_wh = wh 
             export = f"{wh},"

foxesscloud/openapi.py

@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2024
 ##################################################################################################
 
-version = "2.7.4"
+version = "2.7.6"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -419,7 +419,7 @@ device_list = None
 device = None
 device_sn = None
 
-def get_device(sn=None):
+def get_device(sn=None, device_type=None):
     global device_list, device, device_sn, battery, debug_setting, schedule, remote_settings
     if get_vars() is None:
         return None
@@ -480,31 +480,32 @@ def get_device(sn=None):
     get_generation()
 #    remote_settings = get_ui()
     # parse the model code to work out attributes
-    model_code = device['deviceType'].upper()
-    if model_code[:1] == 'T':
-        model_code = 'T3-' + model_code[1:]
-    if model_code[:2] == 'KH':
+    model_code = device['deviceType'].upper() if device_type is None else device_type
+    if model_code[0] in 'FGRST':
+        phase = '1' if model_code[0] in 'FGS' else '3'
+        model_code = model_code[0] + phase + '-' + model_code[1:]
+    elif model_code[:2] == 'KH':
         model_code = 'KH-' + model_code[2:]
     elif model_code[:4] == 'AIO-':
         model_code = 'AIO' + model_code[4:]
-    device['eps'] = 'E' in model_code
+    device['eps'] = 'E' in model_code[2:]
     parts = model_code.split('-')
     model = parts[0]
-    if model not in ['T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
+    if model not in ['F1', 'G1', 'R3', 'S1', 'T3', 'KH', 'H1', 'AC1', 'H3', 'AC3', 'AIOH1', 'AIOH3']:
         output(f"** device model not recognised for deviceType: {device['deviceType']}")
         return device
     device['model'] = model
     device['phase'] = 3 if model[-1:] == '3' else 1
     for p in parts[1:]:
         if p.replace('.','').isnumeric():
-            power = float(p)
-            if power >= 1.0 and power < 50.0:
-                device['power'] = float(p)
+            power = float(p)  / (1000 if model in ['F1', 'S1'] else 1.0)
+            if power >= 0.5 and power < 100.0:
+                device['power'] = power
             break
     if device.get('power') is None:
         output(f"** device power not found for deviceType: {device['deviceType']}")
     # set max charge current
-    if model in ['T3']:
+    if model in ['F1', 'G1', 'R3', 'S1', 'T3']:
         device['max_charge_current'] = None
     elif model in ['KH']:
         device['max_charge_current'] = 50
@@ -842,7 +843,7 @@ def get_settings():
 named_settings = {}
 
 def get_remote_settings(name):
-    global device_sn, debug_setting, messages, name_data
+    global device_sn, debug_setting, messages, name_data, named_settings
     if get_device() is None:
         return None
     output(f"getting remote settings", 2)
@@ -878,7 +879,7 @@ def get_named_settings(name):
     return get_remote_settings(name)
 
 def set_named_settings(name, value, force=0):
-    global device_sn, debug_setting
+    global device_sn, debug_setting, named_settings
     if get_device() is None:
         return None
     if force == 1 and get_schedule().get('enable'):
@@ -888,6 +889,10 @@ def set_named_settings(name, value, force=0):
         for (n, v) in name:
             result.append(set_named_settings(name=n, value=v))
         return result
+    if named_settings.get(name) is None:
+        result = get_named_settings(name)
+        if result is None:
+            return None
     output(f"\nSetting {name} to {value}", 1)
     body = {'sn': device_sn, 'key': name, 'value': f"{value}"}
     setting_delay()
@@ -901,8 +906,9 @@ def set_named_settings(name, value, force=0):
             output(f"** cannot update {name} when schedule is active")
         else:
             output(f"** set_named_settings(): ({name}, {value}) {errno_message(response)}")
-        return 0
-    return 1
+        return None
+    named_settings[name]['value'] = f"{value}"
+    return value
 
 ##################################################################################################
 # wrappers for named settings
@@ -1006,8 +1012,6 @@ def get_flag():
         return None
     result = response.json().get('result')
     if result is None:
-        if errno == 40256:
-            output(f"** get_flag(), not suported on this device")
         return None
     if schedule is None:
         schedule = {'enable': None, 'support': None, 'periods': None}
@@ -2732,7 +2736,7 @@ 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.40
+        capacity = 14.36
         residual = test_soc * capacity / 100
         bat_volt = 317.4
         bat_power = 0.0
@@ -3585,7 +3589,7 @@ def get_pvoutput(d = None, tou = 0):
     export_tou = ',,,'
     # process list of report_data values (no TOU)
     for var in report_data:
-        wh = int(var['total'] * 1000)
+        wh = int(var['total'] * 1000) if var['total'] is not None else 0
         if var['variable'] == 'feedin':
             export_wh = wh 
             export = f"{wh},"

{foxesscloud-2.7.4.dist-info → foxesscloud-2.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.7.4
+Version: 2.7.6
 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
@@ -807,7 +807,12 @@ This setting can be:
 
 # Version Info
 
-2.7.4<br>
+2.7.6<br>
+Updates to support F, G, R and S series inverters.
+Updates to set_named_settings() to load metadata if not already done and save new value.
+Fix divide by zero error when using pvoutput with solar only inverters.
+
+2.7.5<br>
 Update to support T series inverters.
 
 2.7.3<br>

foxesscloud-2.7.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+foxesscloud/foxesscloud.py,sha256=rveGdZDyv3zwQmjw6UzJJKtw_L_lXA2fQFFqMI0lvWI,223108
+foxesscloud/openapi.py,sha256=GTiyfeMke5i_mLgdYb35pJ0JiCMsFXaMGSXMsqiQ5RI,207522
+foxesscloud-2.7.6.dist-info/LICENCE,sha256=-3xv8CElCJV8Bc8PbAsg3iyxMpAK8MoJneM3rXigxqI,1074
+foxesscloud-2.7.6.dist-info/METADATA,sha256=7g3S1fNFk8eL-TiZncUO_2hVIeOod8m5hLm5jEaxMCE,62666
+foxesscloud-2.7.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foxesscloud-2.7.6.dist-info/top_level.txt,sha256=IWOrKSNZCLU6IDXSX_b4_bqCfbZoWAT4CC0w0Lg7PuU,12
+foxesscloud-2.7.6.dist-info/RECORD,,

foxesscloud-2.7.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-foxesscloud/foxesscloud.py,sha256=-StB3jyYKQc0dIdzx0vZK8eBHgThZMwT9rquaXo6gh4,222979
-foxesscloud/openapi.py,sha256=tcc83zs1e_Z9aKc0l9r5LYA5Mi0-c1i-hlaR-vOnfVU,207126
-foxesscloud-2.7.4.dist-info/LICENCE,sha256=-3xv8CElCJV8Bc8PbAsg3iyxMpAK8MoJneM3rXigxqI,1074
-foxesscloud-2.7.4.dist-info/METADATA,sha256=A8wIra0loiQQ0DuliBSRn_BcmmcDGw3j8VLTuB2h2S8,62438
-foxesscloud-2.7.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foxesscloud-2.7.4.dist-info/top_level.txt,sha256=IWOrKSNZCLU6IDXSX_b4_bqCfbZoWAT4CC0w0Lg7PuU,12
-foxesscloud-2.7.4.dist-info/RECORD,,