Fix issue when only another phase than L1 is provided

mr-manuel · mr-manuel · commit 85a8b61783df · 2024-02-26T13:30:43.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.1.6
+* Changed: Allow to populate only L2 and/or L3 even if L1 is missing
+
 ## v0.1.5
 * Added: Timeout on driver startup. Prevents problems, if the MQTT broker is not reachable on driver startup
 * Changed: Fixed status flapping between running and standby
diff --git a/dbus-mqtt-pv/dbus-mqtt-pv.py b/dbus-mqtt-pv/dbus-mqtt-pv.py
@@ -222,7 +222,7 @@ def __init__(
         self._dbusservice.add_path('/ProductId', 0xFFFF)
         self._dbusservice.add_path('/ProductName', productname)
         self._dbusservice.add_path('/CustomName', customname)
-        self._dbusservice.add_path('/FirmwareVersion', '0.1.5 (20231218)')
+        self._dbusservice.add_path('/FirmwareVersion', '0.1.6 (20240226)')
         # self._dbusservice.add_path('/HardwareVersion', '')
         self._dbusservice.add_path('/Connected', 1)
 
@@ -258,7 +258,8 @@ def _update(self):
                 self._dbusservice['/Ac/L1/Voltage'] = round(pv_L1_voltage, 2) if pv_L1_voltage is not None else None
                 self._dbusservice['/Ac/L1/Frequency'] = round(pv_L1_frequency, 2) if pv_L1_frequency is not None else None
                 self._dbusservice['/Ac/L1/Energy/Forward'] = round(pv_L1_forward, 2) if pv_L1_forward is not None else None
-            else:
+            # at least one phase is needed to work properly
+            elif pv_L2_power is None and pv_L3_power is None:
                 self._dbusservice['/Ac/L1/Power'] = round(pv_power, 2) if pv_power is not None else None
                 self._dbusservice['/Ac/L1/Current'] = round(pv_current, 2) if pv_current is not None else None
                 self._dbusservice['/Ac/L1/Voltage'] = round(pv_voltage, 2) if pv_voltage is not None else None
@@ -389,35 +390,35 @@ def _n(p, v): return (str("%i" % v))
         '/Ac/Voltage': {'initial': 0, 'textformat': _v},
         '/Ac/Energy/Forward': {'initial': None, 'textformat': _kwh},
 
-        '/Ac/L1/Power': {'initial': 0, 'textformat': _w},
-        '/Ac/L1/Current': {'initial': 0, 'textformat': _a},
-        '/Ac/L1/Voltage': {'initial': 0, 'textformat': _v},
-        '/Ac/L1/Frequency': {'initial': None, 'textformat': _hz},
-        '/Ac/L1/Energy/Forward': {'initial': None, 'textformat': _kwh},
-
         '/Ac/MaxPower': {'initial': int(config['PV']['max']), 'textformat': _w},
         '/Ac/Position': {'initial': int(config['PV']['position']), 'textformat': _n},
         '/Ac/StatusCode': {'initial': 0, 'textformat': _n},
         '/UpdateIndex': {'initial': 0, 'textformat': _n},
     }
 
-    if pv_L2_power is not None:
-        paths_dbus.update({
-            '/Ac/L2/Power': {'initial': 0, 'textformat': _w},
-            '/Ac/L2/Current': {'initial': 0, 'textformat': _a},
-            '/Ac/L2/Voltage': {'initial': 0, 'textformat': _v},
-            '/Ac/L2/Frequency': {'initial': None, 'textformat': _hz},
-            '/Ac/L2/Energy/Forward': {'initial': None, 'textformat': _kwh},
-        })
-
-    if pv_L3_power is not None:
-        paths_dbus.update({
-            '/Ac/L3/Power': {'initial': 0, 'textformat': _w},
-            '/Ac/L3/Current': {'initial': 0, 'textformat': _a},
-            '/Ac/L3/Voltage': {'initial': 0, 'textformat': _v},
-            '/Ac/L3/Frequency': {'initial': None, 'textformat': _hz},
-            '/Ac/L3/Energy/Forward': {'initial': None, 'textformat': _kwh},
-        })
+    paths_dbus.update({
+        '/Ac/L1/Power': {'initial': None, 'textformat': _w},
+        '/Ac/L1/Current': {'initial': None, 'textformat': _a},
+        '/Ac/L1/Voltage': {'initial': None, 'textformat': _v},
+        '/Ac/L1/Frequency': {'initial': None, 'textformat': _hz},
+        '/Ac/L1/Energy/Forward': {'initial': None, 'textformat': _kwh},
+    })
+
+    paths_dbus.update({
+        '/Ac/L2/Power': {'initial': None, 'textformat': _w},
+        '/Ac/L2/Current': {'initial': None, 'textformat': _a},
+        '/Ac/L2/Voltage': {'initial': None, 'textformat': _v},
+        '/Ac/L2/Frequency': {'initial': None, 'textformat': _hz},
+        '/Ac/L2/Energy/Forward': {'initial': None, 'textformat': _kwh},
+    })
+
+    paths_dbus.update({
+        '/Ac/L3/Power': {'initial': None, 'textformat': _w},
+        '/Ac/L3/Current': {'initial': None, 'textformat': _a},
+        '/Ac/L3/Voltage': {'initial': None, 'textformat': _v},
+        '/Ac/L3/Frequency': {'initial': None, 'textformat': _hz},
+        '/Ac/L3/Energy/Forward': {'initial': None, 'textformat': _kwh},
+    })
 
     DbusMqttPvService(
         servicename='com.victronenergy.pvinverter.mqtt_pv_' + str(config['MQTT']['device_instance']),
