Merge pull request #3 from SirUli/feature-graceful-albatross

fix: revert setting None to some values and --> v1.9
SirUli · Nov 28, 2022 · 7ae9985 · 7ae9985
2 parents ef0691d + 284604a
commit 7ae9985
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/fronius-smartmeter.py b/fronius-smartmeter.py
@@ -150,43 +150,43 @@ def __init__(self, servicename, deviceinstance, ip=None):
             "/Role", self.role, writeable=True, onchangecallback=self.role_changed
         )
 
-        _kwh = lambda p, v: (str(round(v, 2)) + "kWh")
-        _a = lambda p, v: (str(round(v, 1)) + "A")
-        _w = lambda p, v: (str(round(v, 1)) + "W")
-        _v = lambda p, v: (str(round(v, 1)) + "V")
-        _ms = lambda p, v: (str(v) + "ms")
-        _hz = lambda p, v: (str(v) + "Hz")
-        _x = lambda p, v: (str(v))
+        _kwh = lambda p, v: (str(round(v, 2) or '') + "kWh")
+        _a = lambda p, v: (str(round(v, 1) or '') + "A")
+        _w = lambda p, v: (str(round(v, 1) or '') + "W")
+        _v = lambda p, v: (str(round(v, 1) or '') + "V")
+        _ms = lambda p, v: (str(v or '') + "ms")
+        _hz = lambda p, v: (str(v or '') + "Hz")
+        _x = lambda p, v: (str(v or ''))
 
         self._paths = {
-            "/Ac/Power": {"initial": None, "textformat": _w},
-            "/Ac/Current": {"initial": None, "textformat": _a},
-            "/Ac/Frequency": {"initial": None, "textformat": _hz},
-            "/Ac/L1/Voltage": {"initial": None, "textformat": _v},
-            "/Ac/L2/Voltage": {"initial": None, "textformat": _v},
-            "/Ac/L3/Voltage": {"initial": None, "textformat": _v},
-            "/Ac/L1/Current": {"initial": None, "textformat": _a},
-            "/Ac/L2/Current": {"initial": None, "textformat": _a},
-            "/Ac/L3/Current": {"initial": None, "textformat": _a},
-            "/Ac/L1/Power": {"initial": None, "textformat": _w},
-            "/Ac/L2/Power": {"initial": None, "textformat": _w},
-            "/Ac/L3/Power": {"initial": None, "textformat": _w},
+            "/Ac/Power": {"initial": 0, "textformat": _w},
+            "/Ac/Current": {"initial": 0, "textformat": _a},
+            "/Ac/Frequency": {"initial": 0, "textformat": _hz},
+            "/Ac/L1/Voltage": {"initial": 0, "textformat": _v},
+            "/Ac/L2/Voltage": {"initial": 0, "textformat": _v},
+            "/Ac/L3/Voltage": {"initial": 0, "textformat": _v},
+            "/Ac/L1/Current": {"initial": 0, "textformat": _a},
+            "/Ac/L2/Current": {"initial": 0, "textformat": _a},
+            "/Ac/L3/Current": {"initial": 0, "textformat": _a},
+            "/Ac/L1/Power": {"initial": 0, "textformat": _w},
+            "/Ac/L2/Power": {"initial": 0, "textformat": _w},
+            "/Ac/L3/Power": {"initial": 0, "textformat": _w},
             "/Ac/Energy/Forward": {
-                "initial": None,
+                "initial": 0,
                 "textformat": _kwh,
             },  # energy bought from the grid
             "/Ac/Energy/Reverse": {
-                "initial": None,
+                "initial": 0,
                 "textformat": _kwh,
             },  # energy sold to the grid
-            "/Ac/L1/Energy/Forward": {"initial": None, "textformat": _kwh},
-            "/Ac/L2/Energy/Forward": {"initial": None, "textformat": _kwh},
-            "/Ac/L3/Energy/Forward": {"initial": None, "textformat": _kwh},
-            "/Ac/L1/Energy/Reverse": {"initial": None, "textformat": _kwh},
-            "/Ac/L2/Energy/Reverse": {"initial": None, "textformat": _kwh},
-            "/Ac/L3/Energy/Reverse": {"initial": None, "textformat": _kwh},
-            "/Latency": {"initial": None, "textformat": _ms},
-            path_UpdateIndex: {"initial": None, "textformat": _x},
+            "/Ac/L1/Energy/Forward": {"initial": 0, "textformat": _kwh},
+            "/Ac/L2/Energy/Forward": {"initial": 0, "textformat": _kwh},
+            "/Ac/L3/Energy/Forward": {"initial": 0, "textformat": _kwh},
+            "/Ac/L1/Energy/Reverse": {"initial": 0, "textformat": _kwh},
+            "/Ac/L2/Energy/Reverse": {"initial": 0, "textformat": _kwh},
+            "/Ac/L3/Energy/Reverse": {"initial": 0, "textformat": _kwh},
+            "/Latency": {"initial": 0, "textformat": _ms},
+            path_UpdateIndex: {"initial": 0, "textformat": _x},
         }
 
         for path, settings in self._paths.items():
@@ -247,12 +247,12 @@ def _update(self):
             self._dbusservice["/Ac/L3/Energy/Forward"] = None
             self._dbusservice["/Ac/L3/Energy/Reverse"] = None
         if meter_model == 'Smart Meter TS 100A-1' or meter_model == "Smart Meter 63A-1":  # set values for single phase meter
-            meter_data["Voltage_AC_Phase_2"] = None
-            meter_data["Voltage_AC_Phase_3"] = None
-            meter_data["Current_AC_Phase_2"] = None
-            meter_data["Current_AC_Phase_3"] = None
-            meter_data["PowerReal_P_Phase_2"] = None
-            meter_data["PowerReal_P_Phase_3"] = None
+            meter_data["Voltage_AC_Phase_2"] = 0
+            meter_data["Voltage_AC_Phase_3"] = 0
+            meter_data["Current_AC_Phase_2"] = 0
+            meter_data["Current_AC_Phase_3"] = 0
+            meter_data["PowerReal_P_Phase_2"] = 0
+            meter_data["PowerReal_P_Phase_3"] = 0
             self._dbusservice["/Ac/L2/Energy/Forward"] = None
             self._dbusservice["/Ac/L2/Energy/Reverse"] = None
             self._dbusservice["/Ac/L3/Energy/Forward"] = None

diff --git a/version b/version
@@ -1 +1 @@
-v1.8
+v1.9