Fix tracking total kWh

mdeweerd · Nov 6, 2023 · 5977da1 · 5977da1
1 parent 7edf28d
commit 5977da1
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/apps/meters_to_ha/meters_to_ha.py b/apps/meters_to_ha/meters_to_ha.py
@@ -2537,10 +2537,11 @@ def update_grdf_device(self, json_file):
             if isinstance(response, dict) and "state" in response:
                 entity_data = response
                 previous_kWh = response["state"]
-                try:
-                    current_total_kWh = float(previous_kWh)
-                except ValueError:
-                    pass
+                if previous_kWh is not None:
+                    try:
+                        previous_kWh = float(previous_kWh)
+                    except ValueError:
+                        pass
 
                 attributes = response["attributes"]
                 if "meter_m3" in attributes:
@@ -2581,9 +2582,6 @@ def update_grdf_device(self, json_file):
             except (ValueError, RuntimeError):
                 sensor = "None"  # For log message just below
 
-        state = get_state_file(self.configuration[STATE_FILE])
-        self.mylog(f"state: {state!r}", "~~")
-        previous_kWh = None
         if previous_kWh is None:
             state = get_state_file(self.configuration[STATE_FILE])
             if "grdf" in state:
@@ -2600,6 +2598,9 @@ def update_grdf_device(self, json_file):
             f" from {sensor}"
         )
 
+        if previous_kWh is not None:
+            current_total_kWh = previous_kWh
+
         # sys.exit()   # For debug
         date_time = None
         for row in data[pce]["releves"]: