From c2b649920b3ed44359cb7feb5ff97149a7724a24 Mon Sep 17 00:00:00 2001 From: snaky69 <108159253+ic-dev21@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:07:07 -0500 Subject: [PATCH 1/2] Fix issue #355 Remplacement des anciennes constantes par les nouvelles. Retrait code inutile dans la classe EnergySensor --- custom_components/hilo/climate.py | 4 ++-- custom_components/hilo/sensor.py | 34 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) mode change 100644 => 100755 custom_components/hilo/climate.py diff --git a/custom_components/hilo/climate.py b/custom_components/hilo/climate.py old mode 100644 new mode 100755 index 4322e3a1..bb8c0b87 --- a/custom_components/hilo/climate.py +++ b/custom_components/hilo/climate.py @@ -7,7 +7,7 @@ HVACMode, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, TEMP_CELSIUS +from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.util import slugify @@ -50,7 +50,7 @@ async def async_setup_entry( class HiloClimate(HiloEntity, ClimateEntity): _attr_hvac_modes = [HVACMode.HEAT] - _attr_temperature_unit: str = TEMP_CELSIUS + _attr_temperature_unit: str = UnitOfTemperature.CELSIUS _attr_precision: float = PRECISION_TENTHS _attr_supported_features: int = ClimateEntityFeature.TARGET_TEMPERATURE diff --git a/custom_components/hilo/sensor.py b/custom_components/hilo/sensor.py index 48731a96..dc337710 100755 --- a/custom_components/hilo/sensor.py +++ b/custom_components/hilo/sensor.py @@ -14,12 +14,12 @@ CONCENTRATION_PARTS_PER_MILLION, CONF_SCAN_INTERVAL, CURRENCY_DOLLAR, - ENERGY_KILO_WATT_HOUR, PERCENTAGE, - POWER_WATT, SIGNAL_STRENGTH_DECIBELS_MILLIWATT, - SOUND_PRESSURE_DB, - TEMP_CELSIUS, + UnitOfEnergy, + UnitOfPower, + UnitOfSoundPressure, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -239,7 +239,7 @@ class EnergySensor(IntegrationSensor): """Define a Hilo energy sensor entity.""" _attr_device_class = SensorDeviceClass.ENERGY - _attr_native_unit_of_measurement = ENERGY_KILO_WATT_HOUR + _attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR _attr_state_class = SensorStateClass.TOTAL_INCREASING _attr_icon = "mdi:lightning-bolt" @@ -247,15 +247,13 @@ def __init__(self, device): self._device = device self._attr_name = f"Hilo Energy {slugify(device.name)}" self._attr_unique_id = f"hilo_energy_{slugify(device.name)}" - self._unit_of_measurement = ENERGY_KILO_WATT_HOUR + self._unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR self._unit_prefix = None if device.type == "Meter": self._attr_name = HILO_ENERGY_TOTAL - self._unit_of_measurement = ENERGY_KILO_WATT_HOUR - self._unit_prefix = "k" + self._unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR if device.type == "Thermostat" or device.type == "FloorThermostat": - self._unit_of_measurement = ENERGY_KILO_WATT_HOUR - self._unit_prefix = "k" + self._unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR self._source = f"sensor.{slugify(device.name)}_power" super().__init__( @@ -264,7 +262,7 @@ def __init__(self, device): round_digits=2, source_entity=self._source, unique_id=self._attr_unique_id, - unit_prefix=self._unit_prefix, + unit_prefix="k", unit_time="h", ) self._state = 0 @@ -286,7 +284,7 @@ async def async_added_to_hass(self) -> None: class NoiseSensor(HiloEntity, SensorEntity): """Define a Netatmo noise sensor entity.""" - _attr_native_unit_of_measurement = SOUND_PRESSURE_DB + _attr_native_unit_of_measurement = UnitOfSoundPressure.DECIBEL _attr_state_class = SensorStateClass.MEASUREMENT def __init__(self, hilo, device): @@ -312,7 +310,7 @@ class PowerSensor(HiloEntity, SensorEntity): """Define a Hilo power sensor entity.""" _attr_device_class = SensorDeviceClass.POWER - _attr_native_unit_of_measurement = POWER_WATT + _attr_native_unit_of_measurement = UnitOfPower.WATT _attr_state_class = SensorStateClass.MEASUREMENT def __init__(self, hilo: Hilo, device: HiloDevice) -> None: @@ -340,7 +338,7 @@ class TemperatureSensor(HiloEntity, SensorEntity): """Define a Hilo temperature sensor entity.""" _attr_device_class = SensorDeviceClass.TEMPERATURE - _attr_native_unit_of_measurement = TEMP_CELSIUS + _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS _attr_state_class = SensorStateClass.MEASUREMENT def __init__(self, hilo, device): @@ -371,7 +369,7 @@ class TargetTemperatureSensor(HiloEntity, SensorEntity): """Define a Hilo target temperature sensor entity.""" _attr_device_class = SensorDeviceClass.TEMPERATURE - _attr_native_unit_of_measurement = TEMP_CELSIUS + _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS _attr_state_class = SensorStateClass.MEASUREMENT def __init__(self, hilo, device): @@ -704,7 +702,9 @@ def icon(self): class HiloCostSensor(HiloEntity, RestoreEntity, SensorEntity): _attr_device_class = SensorDeviceClass.MONETARY - _attr_native_unit_of_measurement = f"{CURRENCY_DOLLAR}/{ENERGY_KILO_WATT_HOUR}" + _attr_native_unit_of_measurement = ( + f"{CURRENCY_DOLLAR}/{UnitOfEnergy.KILO_WATT_HOUR}" + ) _attr_state_class = SensorStateClass.MEASUREMENT _attr_icon = "mdi:cash" @@ -714,7 +714,7 @@ def __init__(self, hilo, name, plan_name, amount=0): device = d if "low_threshold" in name: self._attr_device_class = SensorDeviceClass.ENERGY - self._attr_native_unit_of_measurement = ENERGY_KILO_WATT_HOUR + self._attr_native_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR self.data = None self._attr_name = name self.plan_name = plan_name From 32e6dfcbceec9bcffd0573d3af1103baed6e80db Mon Sep 17 00:00:00 2001 From: snaky69 <108159253+ic-dev21@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:09:41 -0500 Subject: [PATCH 2/2] Bump up version --- custom_components/hilo/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/hilo/manifest.json b/custom_components/hilo/manifest.json index 081bf24e..3d0ca243 100755 --- a/custom_components/hilo/manifest.json +++ b/custom_components/hilo/manifest.json @@ -12,5 +12,5 @@ "iot_class": "cloud_push", "issue_tracker": "https://github.com/dvd-dev/hilo/issues", "requirements": ["python-hilo>=2024.1.1"], - "version": "2024.1.1" + "version": "2024.2.1" }