Add sensors to capture current charge target

Author: tomasmcguinness

custom_components/mixergy/sensor.py

@@ -34,6 +34,7 @@ async def async_update_data():
     new_entities.append(HotWaterTemperatureSensor(coordinator, tank))
     new_entities.append(ColdestWaterTemperatureSensor(coordinator, tank))
     new_entities.append(ChargeSensor(coordinator, tank))
+    new_entities.append(TargetChargeSensor(coordinator, tank))
     new_entities.append(ElectricHeatSensor(coordinator, tank))
     new_entities.append(IndirectHeatSensor(coordinator, tank))
     new_entities.append(HeatPumpHeatSensor(coordinator,tank))
@@ -44,6 +45,7 @@ async def async_update_data():
     new_entities.append(TargetTemperatureSensor(coordinator, tank))
     new_entities.append(HolidayModeSensor(coordinator, tank))
     new_entities.append(PVPowerSensor(coordinator, tank))
+    new_entities.append(IsChargingSensor(coordinator, tank))
 
     async_add_entities(new_entities)
 
@@ -129,6 +131,31 @@ def icon(self):
     @property
     def name(self):
           return f"Current Charge"
+    
+class TargetChargeSensor(SensorBase):
+
+    def __init__(self, coordinator, tank:Tank):
+        super().__init__(coordinator, tank)
+
+    @property
+    def unique_id(self):
+        return f"mixergy_{self._tank.serial_number}_target_charge"
+
+    @property
+    def unit_of_measurement(self):
+        return PERCENTAGE
+
+    @property
+    def state(self):
+        return self._tank.target_charge
+
+    @property
+    def icon(self):
+        return "hass:water-percent"
+
+    @property
+    def name(self):
+          return f"Target Charge"
 
 class HotWaterTemperatureSensor(SensorBase):
 
@@ -306,6 +333,28 @@ def icon(self):
     @property
     def name(self):
         return f"Low Hot Water"
+    
+class IsChargingSensor(BinarySensorBase):
+
+    def __init__(self, coordinator, tank:Tank):
+        super().__init__( coordinator, tank)
+        self._state = STATE_OFF
+
+    @property
+    def unique_id(self):
+        return f"mixergy_{self._tank.tank_id}_charging"
+
+    @property
+    def is_on(self):
+        return self._tank.target_charge > 0
+
+    @property
+    def icon(self):
+        return "hass:water-percent-alert"
+
+    @property
+    def name(self):
+        return f"Is Charging"
 
 class PowerSensor(SensorBase):
 

custom_components/mixergy/tank.py

@@ -27,6 +27,7 @@ def __init__(self, hass, username, password, serial_number):
         self._hot_water_temperature = -1
         self._coldest_water_temperature = -1
         self._charge = -1
+        self._target_charge = -1
         self._indirect_heat_source = False
         self._electric_heat_source = False
         self._heatpump_heat_source = False
@@ -236,6 +237,18 @@ async def fetch_last_measurement(self):
 
             current = state["current"]
 
+            new_target_charge = -1
+
+            if "target" in current:
+                new_target_charge = current["target"]
+            else:
+                new_target_charge = -1
+
+            _LOGGER.debug("Current Target: %f", self._target_charge)
+            _LOGGER.debug("New Target: %f", new_target_charge)
+
+            self._target_charge = new_target_charge
+
             vacation = False
 
             # Source is only present when vacation is enabled it seems
@@ -331,6 +344,10 @@ def coldest_water_temperature(self):
     def charge(self):
         return self._charge
 
+    @property
+    def target_charge(self):
+        return self._target_charge
+
     @property
     def indirect_heat_source(self):
         return self._indirect_heat_source