rename HeatingProgram to Program

2025-08-11 08:35:15 +02:00 · 2024-02-02 10:50:01 +01:00
parent f723154cb7
commit fa9667ef55
3 changed files with 47 additions and 71 deletions
--- a/homeassistant/components/vicare/climate.py
+++ b/homeassistant/components/vicare/climate.py
@@ -40,7 +40,7 @@ from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

-from .const import DOMAIN, VICARE_API, VICARE_DEVICE_CONFIG, HeatingProgram
+from .const import DOMAIN, VICARE_API, VICARE_DEVICE_CONFIG, Program
 from .entity import ViCareEntity
 from .utils import get_burners, get_circuits, get_compressors

@@ -75,17 +75,17 @@ VICARE_TO_HA_HVAC_HEATING: dict[str, HVACMode] = {
 }

 VICARE_TO_HA_PRESET_HEATING = {
-    HeatingProgram.COMFORT: PRESET_COMFORT,
-    HeatingProgram.ECO: PRESET_ECO,
-    HeatingProgram.NORMAL: PRESET_HOME,
-    HeatingProgram.REDUCED: PRESET_SLEEP,
+    Program.COMFORT: PRESET_COMFORT,
+    Program.ECO: PRESET_ECO,
+    Program.NORMAL: PRESET_HOME,
+    Program.REDUCED: PRESET_SLEEP,
 }

 HA_TO_VICARE_PRESET_HEATING = {
-    PRESET_COMFORT: HeatingProgram.COMFORT,
-    PRESET_ECO: HeatingProgram.ECO,
-    PRESET_HOME: HeatingProgram.NORMAL,
-    PRESET_SLEEP: HeatingProgram.REDUCED,
+    PRESET_COMFORT: Program.COMFORT,
+    PRESET_ECO: Program.ECO,
+    PRESET_HOME: Program.NORMAL,
+    PRESET_SLEEP: Program.REDUCED,
 }


@@ -309,9 +309,9 @@ class ViCareClimate(ViCareEntity, ClimateEntity):

        _LOGGER.debug("Current preset %s", self._current_program)
        if self._current_program and self._current_program not in [
-            HeatingProgram.NORMAL,
-            HeatingProgram.REDUCED,
-            HeatingProgram.STANDBY,
+            Program.NORMAL,
+            Program.REDUCED,
+            Program.STANDBY,
        ]:
            # We can't deactivate "normal", "reduced" or "standby"
            _LOGGER.debug("deactivating %s", self._current_program)
@@ -328,9 +328,9 @@ class ViCareClimate(ViCareEntity, ClimateEntity):

        _LOGGER.debug("Setting preset to %s / %s", preset_mode, target_program)
        if target_program not in [
-            HeatingProgram.NORMAL,
-            HeatingProgram.REDUCED,
-            HeatingProgram.STANDBY,
+            Program.NORMAL,
+            Program.REDUCED,
+            Program.STANDBY,
        ]:
            # And we can't explicitly activate "normal", "reduced" or "standby", either
            _LOGGER.debug("activating %s", target_program)
--- a/homeassistant/components/vicare/const.py
+++ b/homeassistant/components/vicare/const.py
@@ -34,7 +34,7 @@ VICARE_UNIT_TO_UNIT_OF_MEASUREMENT = {
 }


-class HeatingProgram(enum.StrEnum):
+class Program(enum.StrEnum):
    """ViCare preset heating programs.

    As listed inhttps://github.com/somm15/PyViCare/blob/63f9f7fea505fdf9a26c77c6cd0bff889abcdb05/PyViCare/PyViCareHeatingDevice.py#L606
--- a/homeassistant/components/vicare/number.py
+++ b/homeassistant/components/vicare/number.py
@@ -30,7 +30,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

 from . import ViCareRequiredKeysMixin
-from .const import DOMAIN, VICARE_API, VICARE_DEVICE_CONFIG, HeatingProgram
+from .const import DOMAIN, VICARE_API, VICARE_DEVICE_CONFIG, Program
 from .entity import ViCareEntity
 from .utils import get_circuits, is_supported

@@ -89,19 +89,13 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.NORMAL
-        ),
+        value_getter=lambda api: api.getDesiredTemperatureForProgram(Program.NORMAL),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.NORMAL, value
+            Program.NORMAL, value
        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.NORMAL
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.NORMAL
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(HeatingProgram.NORMAL),
+        min_value_getter=lambda api: api.getProgramMinTemperature(Program.NORMAL),
+        max_value_getter=lambda api: api.getProgramMaxTemperature(Program.NORMAL),
+        stepping_getter=lambda api: api.getProgramStepping(Program.NORMAL),
    ),
    ViCareNumberEntityDescription(
        key="reduced_temperature",
@@ -109,19 +103,13 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.REDUCED
-        ),
+        value_getter=lambda api: api.getDesiredTemperatureForProgram(Program.REDUCED),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.REDUCED, value
+            Program.REDUCED, value
        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.REDUCED
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.REDUCED
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(HeatingProgram.REDUCED),
+        min_value_getter=lambda api: api.getProgramMinTemperature(Program.REDUCED),
+        max_value_getter=lambda api: api.getProgramMaxTemperature(Program.REDUCED),
+        stepping_getter=lambda api: api.getProgramStepping(Program.REDUCED),
    ),
    ViCareNumberEntityDescription(
        key="comfort_temperature",
@@ -129,19 +117,13 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.COMFORT
-        ),
+        value_getter=lambda api: api.getDesiredTemperatureForProgram(Program.COMFORT),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.COMFORT, value
+            Program.COMFORT, value
        ),
-        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.COMFORT
-        ),
-        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.COMFORT
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(HeatingProgram.COMFORT),
+        min_value_getter=lambda api: api.getProgramMinTemperature(Program.COMFORT),
+        max_value_getter=lambda api: api.getProgramMaxTemperature(Program.COMFORT),
+        stepping_getter=lambda api: api.getProgramStepping(Program.COMFORT),
    ),
    ViCareNumberEntityDescription(
        key="normal_heating_temperature",
@@ -150,20 +132,18 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.NORMAL_HEATING
+            Program.NORMAL_HEATING
        ),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.NORMAL_HEATING, value
+            Program.NORMAL_HEATING, value
        ),
        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.NORMAL_HEATING
+            Program.NORMAL_HEATING
        ),
        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.NORMAL_HEATING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.NORMAL_HEATING
+            Program.NORMAL_HEATING
        ),
+        stepping_getter=lambda api: api.getProgramStepping(Program.NORMAL_HEATING),
    ),
    ViCareNumberEntityDescription(
        key="reduced_heating_temperature",
@@ -172,20 +152,18 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.REDUCED_HEATING
+            Program.REDUCED_HEATING
        ),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.NORMAL_HEATING, value
+            Program.NORMAL_HEATING, value
        ),
        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.REDUCED_HEATING
+            Program.REDUCED_HEATING
        ),
        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.REDUCED_HEATING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.REDUCED_HEATING
+            Program.REDUCED_HEATING
        ),
+        stepping_getter=lambda api: api.getProgramStepping(Program.REDUCED_HEATING),
    ),
    ViCareNumberEntityDescription(
        key="comfort_heating_temperature",
@@ -194,20 +172,18 @@ CIRCUIT_ENTITY_DESCRIPTIONS: tuple[ViCareNumberEntityDescription, ...] = (
        device_class=NumberDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        value_getter=lambda api: api.getDesiredTemperatureForProgram(
-            HeatingProgram.COMFORT_HEATING
+            Program.COMFORT_HEATING
        ),
        value_setter=lambda api, value: api.setProgramTemperature(
-            HeatingProgram.COMFORT_HEATING, value
+            Program.COMFORT_HEATING, value
        ),
        min_value_getter=lambda api: api.getProgramMinTemperature(
-            HeatingProgram.COMFORT_HEATING
+            Program.COMFORT_HEATING
        ),
        max_value_getter=lambda api: api.getProgramMaxTemperature(
-            HeatingProgram.COMFORT_HEATING
-        ),
-        stepping_getter=lambda api: api.getProgramStepping(
-            HeatingProgram.COMFORT_HEATING
+            Program.COMFORT_HEATING
        ),
+        stepping_getter=lambda api: api.getProgramStepping(Program.COMFORT_HEATING),
    ),
 )