Merge pull request #248 from tijsverkoyen/246-target_time-and-next_charging_time

246 target time and next charging time

Author: tijsverkoyen

README.md

@@ -532,12 +532,11 @@ This is exposed as a switch.
 * **Coupling Status Enum Sensor**, (only if supported), the connectivity status of the system.
 * **Boost Switch**, (only if supported), boost mode for capacity tariff Flanders
 * **TargetDistance Number Sensor**, (only if supported), distance to be charged additionally when in Smart mode
+* **TargetTime Time Entity**, (only if supported), charging completion time when in Smart mode
 * **ReachableDistance Number Sensor**, (only if supported), estimated max driving distance that could be charged during
   the Smart mode session
 * **TargetReached Binary Sensor**, (only if supported), charging target is reached during this Smart mode session
-
-__Remark:__ if you have a charging station that supports setting the Target Time or Next Charging Time: please contact
-us
+* **NextChargingTime Time Sensor**, (only if supported), estimated time when charging will start in Smart Mode
 
 ### NHC Heating Cooling Action
 

custom_components/nhc2/__init__.py

@@ -74,6 +74,7 @@ async def async_setup(hass, config):
     "select",
     "sensor",
     "switch",
+    "time",
     "update",
 )
 

custom_components/nhc2/entities/generic_chargingstation_charging_status.py

@@ -1,13 +1,13 @@
 from homeassistant.components.sensor import SensorEntity, SensorDeviceClass
 
-from ..nhccoco.devices.easee_chargingstation import CocoEaseeChargingstation
+from ..nhccoco.devices.generic_chargingstation import CocoGenericChargingstation
 from .nhc_entity import NHCBaseEntity
 
 
 class Nhc2GenericChargingstationChargingStatusEntity(NHCBaseEntity, SensorEntity):
     _attr_has_entity_name = True
 
-    def __init__(self, device_instance: CocoEaseeChargingstation, hub, gateway):
+    def __init__(self, device_instance: CocoGenericChargingstation, hub, gateway):
         """Initialize a sensor."""
         super().__init__(device_instance, hub, gateway)
 

custom_components/nhc2/entities/generic_chargingstation_next_charging_time.py

@@ -0,0 +1,26 @@
+from datetime import time
+
+from homeassistant.components.sensor import SensorEntity, SensorDeviceClass
+
+from ..nhccoco.devices.generic_chargingstation import CocoGenericChargingstation
+from .nhc_entity import NHCBaseEntity
+
+
+class Nhc2GenericChargingstationNextChargingTimeEntity(NHCBaseEntity, SensorEntity):
+    _attr_has_entity_name = True
+
+    def __init__(self, device_instance: CocoGenericChargingstation, hub, gateway):
+        """Initialize a time entity."""
+        super().__init__(device_instance, hub, gateway)
+
+        self._attr_unique_id = device_instance.uuid + '_next_charging_time'
+        self._attr_device_class = SensorDeviceClass.TIMESTAMP
+        self._attr_native_value = self._device.next_charging_time
+
+    @property
+    def name(self) -> str:
+        return 'Next Charging Time'
+
+    @property
+    def state(self) -> time:
+        return self._device.next_charging_time

custom_components/nhc2/entities/generic_chargingstation_target_time.py

@@ -0,0 +1,29 @@
+from datetime import time
+
+from homeassistant.components.time import TimeEntity
+
+from ..nhccoco.devices.generic_chargingstation import CocoGenericChargingstation
+from .nhc_entity import NHCBaseEntity
+
+
+class Nhc2GenericChargingstationTargetTimeEntity(NHCBaseEntity, TimeEntity):
+    _attr_has_entity_name = True
+
+    def __init__(self, device_instance: CocoGenericChargingstation, hub, gateway):
+        """Initialize a time entity."""
+        super().__init__(device_instance, hub, gateway)
+
+        self._attr_unique_id = device_instance.uuid + '_target_time'
+
+    @property
+    def name(self) -> str:
+        return 'Target Time'
+
+    @property
+    def state(self) -> time:
+        return self._device.target_time
+
+    async def async_set_value(self, value: time) -> None:
+        self._device.set_target_time(self._gateway, value)
+        self.schedule_update_ha_state()
+

custom_components/nhc2/nhccoco/devices/generic_chargingstation.py

@@ -1,9 +1,11 @@
+from datetime import time
+
 from ..const import PROPERTY_BOOST, PROPERTY_BOOST_VALUE_FALSE, PROPERTY_BOOST_VALUE_TRUE, PROPERTY_CHARGING_MODE, \
     PROPERTY_CHARGING_STATUS, PROPERTY_COUPLING_STATUS, PROPERTY_ELECTRICAL_POWER, PROPERTY_EV_STATUS, \
     PROPERTY_NEXT_CHARGING_TIME, PROPERTY_REACHABLE_DISTANCE, PROPERTY_STATUS, PROPERTY_STATUS_VALUE_OFF, \
     PROPERTY_STATUS_VALUE_ON, PROPERTY_TARGET_DISTANCE, PROPERTY_TARGET_TIME, PROPERTY_TARGET_REACHED, \
     PROPERTY_TARGET_REACHED_VALUE_TRUE
-from ..helpers import to_float_or_none, to_int_or_none
+from ..helpers import to_float_or_none, to_int_or_none, to_time_or_none
 from .device import CoCoDevice
 
 
@@ -101,8 +103,8 @@ def target_distance_range(self) -> tuple[float, float, float]:
         return self.extract_property_definition_description_range(PROPERTY_TARGET_DISTANCE)
 
     @property
-    def target_time(self) -> str | None:
-        return self.extract_property_value(PROPERTY_TARGET_TIME)
+    def target_time(self) -> time | None:
+        return to_time_or_none(self.extract_property_value(PROPERTY_TARGET_TIME))
 
     @property
     def supports_target_time(self) -> bool:
@@ -133,8 +135,8 @@ def supports_target_reached(self) -> bool:
         return self.has_property(PROPERTY_TARGET_REACHED)
 
     @property
-    def next_charging_time(self) -> str | None:
-        return self.extract_property_value(PROPERTY_NEXT_CHARGING_TIME)
+    def next_charging_time(self) -> time | None:
+        return to_time_or_none(self.extract_property_value(PROPERTY_NEXT_CHARGING_TIME))
 
     @property
     def supports_next_charging_time(self) -> bool:
@@ -158,11 +160,8 @@ def set_boost(self, gateway, active: bool):
     def set_target_distance(self, gateway, target_distance: int):
         gateway.add_device_control(self.uuid, PROPERTY_TARGET_DISTANCE, target_distance)
 
-    def set_target_time(self, gateway, target_time: str):
-        gateway.add_device_control(self.uuid, PROPERTY_TARGET_TIME, target_time)
+    def set_target_time(self, gateway, target_time: time):
+        gateway.add_device_control(self.uuid, PROPERTY_TARGET_TIME, target_time.strftime('%H:%M'))
 
     def set_reachable_distance(self, gateway, reachable_distance: int):
         gateway.add_device_control(self.uuid, PROPERTY_REACHABLE_DISTANCE, reachable_distance)
-
-    def set_next_charging_time(self, gateway, next_charging_time: str):
-        gateway.add_device_control(self.uuid, PROPERTY_NEXT_CHARGING_TIME, next_charging_time)

custom_components/nhc2/nhccoco/helpers.py

@@ -1,3 +1,5 @@
+from datetime import time
+
 from .const import MQTT_DATA_PARAMS, MQTT_DATA_PARAMS_DEVICES, MQTT_DATA_PARAMS_DEVICES_PROPERTIES, \
     MQTT_DATA_PARAMS_DEVICES_UUID, MQTT_DATA_METHOD, MQTT_DATA_METHOD_DEVICES_CONTROL, MQTT_DATA_PARAMS_SYSTEMINFO, \
     MQTT_DATA_PARAMS_SYSTEMINFO_SWVERSIONS, MQTT_DATA_PARAMS_SYSTEMINFO_SWVERSIONS_COCO_IMAGE, \
@@ -73,3 +75,14 @@ def to_int_or_none(value) -> int | None:
     if value is None or value == '':
         return None
     return int(float(value))
+
+
+def to_time_or_none(value) -> time | None:
+    if value is None or value == '':
+        return None
+
+    try:
+        hours, minutes = map(int, value.split(':'))
+        return time(hour=hours, minute=minutes)
+    except ValueError:
+        return None

custom_components/nhc2/sensor.py

@@ -29,6 +29,7 @@
 from .entities.generic_chargingstation_coupling_status import Nhc2GenericChargingstationCouplingStatusEntity
 from .entities.generic_chargingstation_electrical_power import Nhc2GenericChargingstationElectricalPowerEntity
 from .entities.generic_chargingstation_ev_status import Nhc2GenericChargingstationEvStatusEntity
+from .entities.generic_chargingstation_next_charging_time import Nhc2GenericChargingstationNextChargingTimeEntity
 from .entities.generic_domestichotwaterunit_coupling_status import Nhc2GenericDomestichotwaterunitCouplingStatusEntity
 from .entities.generic_energyhome_electrical_power_consumption import \
     Nhc2GenericEnergyhomeElectricalPowerConsumptionEntity
@@ -439,6 +440,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                 entities.append(Nhc2GenericChargingstationEvStatusEntity(device_instance, hub, gateway))
             if device_instance.supports_charging_status:
                 entities.append(Nhc2GenericChargingstationChargingStatusEntity(device_instance, hub, gateway))
+            if device_instance.supports_next_charging_time:
+                entities.append(Nhc2GenericChargingstationNextChargingTimeEntity(device_instance, hub, gateway))
 
         async_add_entities(entities)
 

custom_components/nhc2/time.py

@@ -0,0 +1,34 @@
+"""Support for NHC2 time."""
+import logging
+
+from homeassistant.const import CONF_USERNAME
+
+from .nhccoco.coco import CoCo
+
+from .entities.generic_chargingstation_target_time import Nhc2GenericChargingstationTargetTimeEntity
+from .nhccoco.devices.generic_chargingstation import CocoGenericChargingstation
+
+from .const import DOMAIN, KEY_GATEWAY
+
+KEY_ENTITY = 'nhc2_times'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    _LOGGER.info('Configuring time')
+
+    hass.data.setdefault(KEY_ENTITY, {})[config_entry.entry_id] = []
+
+    gateway: CoCo = hass.data[KEY_GATEWAY][config_entry.entry_id]
+    hub = (DOMAIN, config_entry.data[CONF_USERNAME])
+
+    device_instances = gateway.get_device_instances(CocoGenericChargingstation)
+    _LOGGER.info('→ Found %s Generic Chargingstation Implementation', len(device_instances))
+    if len(device_instances) > 0:
+        entities = []
+        for device_instance in device_instances:
+            if device_instance.supports_target_time:
+                entities.append(Nhc2GenericChargingstationTargetTimeEntity(device_instance, hub, gateway))
+
+        async_add_entities(entities)