Revert accumulative usage sensor

Author: dan-r

custom_components/ohme/sensor.py

@@ -39,7 +39,7 @@ async def async_setup_entry(
                VoltageSensor(coordinator, hass, client),
                CTSensor(adv_coordinator, hass, client),
                EnergyUsageSensor(coordinator, hass, client),
-               AccumulativeEnergyUsageSensor(coordinator, stats_coordinator, hass, client),
+               AccumulativeEnergyUsageSensor(stats_coordinator, hass, client),
                NextSlotEndSensor(coordinator, hass, client),
                NextSlotStartSensor(coordinator, hass, client),
                SlotListSensor(coordinator, hass, client),
@@ -214,7 +214,7 @@ def native_value(self):
         return self.coordinator.data['clampAmps']
 
 
-class AccumulativeEnergyUsageSensor(SensorEntity):
+class AccumulativeEnergyUsageSensor(CoordinatorEntity[OhmeStatisticsCoordinator], SensorEntity):
     """Sensor for total energy usage."""
     _attr_name = "Accumulative Energy Usage"
     _attr_native_unit_of_measurement = UnitOfEnergy.WATT_HOUR
@@ -225,16 +225,12 @@ class AccumulativeEnergyUsageSensor(SensorEntity):
 
     def __init__(
             self,
-            coordinator_sessions,
-            coordinator_statistics,
+            coordinator: OhmeStatisticsCoordinator,
             hass: HomeAssistant,
             client):
-        self.coordinator_statistics = coordinator_statistics
-        self.coordinator_sessions = coordinator_sessions
+        super().__init__(coordinator=coordinator)
 
         self._state = None
-        self._stats_state = None
-
         self._attributes = {}
         self._last_updated = None
         self._client = client
@@ -245,62 +241,6 @@ def __init__(
         self._attr_device_info = hass.data[DOMAIN][DATA_CLIENT].get_device_info(
         )
 
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to hass."""
-        # Handle the coordinator listeners manually as we have 2
-        self.async_on_remove(
-            self.coordinator_sessions.async_add_listener(
-                self._handle_sessions_update, None
-            )
-        )
-        self.async_on_remove(
-            self.coordinator_statistics.async_add_listener(
-                self._handle_statistics_update, None
-            )
-        )
-
-        # Stats only run every hour so make sure they run at init
-        self._handle_sessions_update()
-        self._handle_statistics_update()
-
-    @callback
-    def _handle_statistics_update(self) -> None:
-        """Handle updated statistics (all time) data."""
-        # Guard
-        if self.coordinator_statistics.data is None or self.coordinator_sessions.data is None or not self.coordinator_statistics.data['energyChargedTotalWh']:
-            _LOGGER.debug(f"Stats: not enough data")
-            return
-
-        # Store the stats state
-        self._stats_state = self.coordinator_statistics.data['energyChargedTotalWh']
-
-        # If session not in progress, use the statistics data alone
-        if self.coordinator_sessions.data["mode"] == "DISCONNECTED":
-            _LOGGER.debug(f"Stats: using stats data only")
-            self._state = self._stats_state
-            self._last_updated = utcnow()
-            self.async_write_ha_state()
-
-    @callback
-    def _handle_sessions_update(self) -> None:
-        """Handle updated charge sessions (live data)."""
-        # Guard
-        if self.coordinator_sessions.data is None or self.coordinator_statistics.data is None or not self.coordinator_sessions.data['batterySoc']:
-            _LOGGER.debug(f"Sessions: not enough data")
-            return
-
-        # If session in progress, use statistics + charge data
-        if self._stats_state and not self.coordinator_sessions.data["mode"] == "DISCONNECTED":
-            _LOGGER.debug(f"Sessions: using stats + session")
-            # Calculate new state as stats total + session total
-            new_state = self._stats_state + max(0, self.coordinator_sessions.data['batterySoc']['wh'])
-
-            # This tends to go backwards? Make sure it only goes up
-            self._state = max(self._state or 0, new_state)
-
-            self._last_updated = utcnow()
-            self.async_write_ha_state()
-
     @property
     def unique_id(self) -> str:
         """Return the unique ID of the sensor."""
@@ -313,7 +253,11 @@ def icon(self):
 
     @property
     def native_value(self):
-        return self._state
+        """Get value from data returned from API by coordinator"""
+        if self.coordinator.data and self.coordinator.data['energyChargedTotalWh']:
+            return self.coordinator.data['energyChargedTotalWh']
+
+        return None
 
 
 class EnergyUsageSensor(CoordinatorEntity[OhmeChargeSessionsCoordinator], SensorEntity):