Fix cumulative EVCC energy export

Author: fbettag

dbus_service.py

@@ -116,15 +116,27 @@ def update(self, lp: Loadpoint) -> None:
         with self._svc as s:
             currents = lp.charge_currents
             voltages = lp.charge_voltages
-            # Per-phase power = current * per-phase voltage. Real grids run
-            # 225-237 V; EVCC reports actuals, so we use them instead of 230.
-            s["/Ac/L1/Power"] = float(currents[0]) * float(voltages[0])
-            s["/Ac/L2/Power"] = float(currents[1]) * float(voltages[1])
-            s["/Ac/L3/Power"] = float(currents[2]) * float(voltages[2])
+            charge_power = float(lp.charge_power)
+            apparent = [
+                float(currents[0]) * float(voltages[0]),
+                float(currents[1]) * float(voltages[1]),
+                float(currents[2]) * float(voltages[2]),
+            ]
+            apparent_total = sum(apparent)
+            if apparent_total > 0 and charge_power > 0:
+                phase_powers = [
+                    charge_power * apparent_power / apparent_total
+                    for apparent_power in apparent
+                ]
+            else:
+                phase_powers = [0.0, 0.0, 0.0]
+            s["/Ac/L1/Power"] = phase_powers[0]
+            s["/Ac/L2/Power"] = phase_powers[1]
+            s["/Ac/L3/Power"] = phase_powers[2]
             s["/Ac/Voltage"] = (
                 float(voltages[0]) + float(voltages[1]) + float(voltages[2])
             ) / 3.0
-            s["/Ac/Power"] = float(lp.charge_power)
+            s["/Ac/Power"] = charge_power
 
             total_current = sum(float(c) for c in currents)
             s["/Current"] = total_current
@@ -150,11 +162,15 @@ def update(self, lp: Loadpoint) -> None:
             s["/Status"] = status
             s["/Connected"] = 1
 
-            # Cumulative counters only refreshed while connected. UNVERIFIED:
-            # chargedEnergy is treated as Wh (-> /1000 = kWh). Must be confirmed
-            # against a real EVCC /api/state sample before deploy.
-            if status != STATUS_DISCONNECTED:
+            # chargeTotalImport is EVCC's cumulative kWh meter value. It keeps
+            # increasing for continuous heating devices where chargedEnergy is
+            # a per-session counter and may stay at 0.
+            total_import = float(lp.charge_total_import or 0.0)
+            if total_import > 0:
+                s["/Ac/Energy/Forward"] = total_import
+            elif status != STATUS_DISCONNECTED:
                 s["/Ac/Energy/Forward"] = float(lp.charged_energy) / 1000.0
+            if status != STATUS_DISCONNECTED:
                 s["/ChargingTime"] = int(lp.charge_duration_ns) // 1_000_000_000
 
             idx = (int(s["/UpdateIndex"]) + 1) % 256

evcc_api.py

@@ -26,6 +26,7 @@ class Loadpoint:
     charge_voltages: List[float] = field(default_factory=lambda: [230.0, 230.0, 230.0])
     effective_max_current: int = 16
     charged_energy: float = 0.0
+    charge_total_import: float = 0.0
     charge_duration_ns: int = 0
 
 
@@ -61,6 +62,7 @@ def _parse_loadpoints(state: dict) -> List[Loadpoint]:
             charge_voltages=_normalize_triple(raw.get("chargeVoltages"), 230.0),
             effective_max_current=int(raw.get("effectiveMaxCurrent") or 16),
             charged_energy=float(raw.get("chargedEnergy") or 0.0),
+            charge_total_import=float(raw.get("chargeTotalImport") or 0.0),
             charge_duration_ns=int(raw.get("chargeDuration") or 0),
         ))
     return out

tests/fixtures/evcc_state_1lp.json

@@ -10,6 +10,7 @@
       "chargeVoltages": [230, 230, 230],
       "effectiveMaxCurrent": 20,
       "chargedEnergy": 250.0,
+      "chargeTotalImport": 12.345,
       "chargeDuration": 600000000000
     }
   ]

tests/fixtures/evcc_state_3lp.json

@@ -10,6 +10,7 @@
       "chargeVoltages": [230, 230, 230],
       "effectiveMaxCurrent": 16,
       "chargedEnergy": 0.0,
+      "chargeTotalImport": 1.234,
       "chargeDuration": 0
     },
     {
@@ -22,6 +23,7 @@
       "chargeVoltages": [230, 230, 230],
       "effectiveMaxCurrent": 20,
       "chargedEnergy": 1800.0,
+      "chargeTotalImport": 98.765,
       "chargeDuration": 3600000000000
     },
     {
@@ -34,6 +36,7 @@
       "chargeVoltages": [230, 230, 230],
       "effectiveMaxCurrent": 16,
       "chargedEnergy": 0.0,
+      "chargeTotalImport": 19341.908,
       "chargeDuration": 0
     }
   ]

tests/test_dbus_service.py

@@ -125,20 +125,41 @@ def test_update_charging_uses_per_phase_voltages(monkeypatch):
     sets = dict(c.args for c in vedbus.__setitem__.call_args_list)
     assert sets["/Status"] == STATUS_CHARGING
     assert sets["/Ac/Power"] == 4500.0
-    assert sets["/Ac/L1/Power"] == 6.5 * 229.0
-    assert sets["/Ac/L2/Power"] == 6.5 * 231.0
-    assert sets["/Ac/L3/Power"] == 6.5 * 232.5
+    assert abs(
+        sets["/Ac/L1/Power"] + sets["/Ac/L2/Power"] + sets["/Ac/L3/Power"]
+        - 4500.0
+    ) < 0.01
+    assert sets["/Ac/L1/Power"] < sets["/Ac/L2/Power"] < sets["/Ac/L3/Power"]
     assert abs(sets["/Ac/Voltage"] - (229.0 + 231.0 + 232.5) / 3) < 0.01
     assert sets["/Current"] == 19.5
     assert sets["/MaxCurrent"] == 20
     assert sets["/Mode"] == MODE_AUTO
-    # UNVERIFIED unit: chargedEnergy treated as Wh; must confirm against
-    # a live EVCC /api/state sample before merging the deploy.
+    # Fallback for EVCC payloads without chargeTotalImport.
     assert sets["/Ac/Energy/Forward"] == 1.8
     assert sets["/ChargingTime"] == 3600
     assert sets["/UpdateIndex"] == 6
 
 
+def test_update_prefers_charge_total_import_for_cumulative_energy(monkeypatch):
+    svc, vedbus, _ = _make_svc(monkeypatch)
+    vedbus.__getitem__.return_value = 0
+    lp = Loadpoint(
+        title="Heatpump", connected=True, charging=False, mode="off",
+        charge_power=90.25,
+        charge_currents=[0.93, 0.49, 0.5],
+        charge_voltages=[237.5, 236.9, 236.9],
+        charged_energy=0.0,
+        charge_total_import=19341.908,
+    )
+    svc.update(lp)
+    sets = dict(c.args for c in vedbus.__setitem__.call_args_list)
+    assert sets["/Ac/Energy/Forward"] == 19341.908
+    assert abs(
+        sets["/Ac/L1/Power"] + sets["/Ac/L2/Power"] + sets["/Ac/L3/Power"]
+        - sets["/Ac/Power"]
+    ) < 0.01
+
+
 def test_update_index_wraps_at_255(monkeypatch):
     svc, vedbus, _ = _make_svc(monkeypatch)
     vedbus.__getitem__.return_value = 255

tests/test_evcc_api.py

@@ -30,6 +30,7 @@ def test_fetch_state_returns_loadpoints_1lp(requests_mock):
     assert lp.charge_currents == [6.5, 0, 0]
     assert lp.effective_max_current == 20
     assert lp.mode == "pv"
+    assert lp.charge_total_import == 12.345
 
 
 def test_fetch_state_returns_loadpoints_3lp(requests_mock):
@@ -90,6 +91,7 @@ def test_missing_optional_fields_use_defaults():
     assert lps[0].charge_currents == [0, 0, 0]
     assert lps[0].connected is False
     assert lps[0].charge_power == 0.0
+    assert lps[0].charge_total_import == 0.0
     assert lps[0].effective_max_current == 16