⬆️ Refactor HVAC mode parameter: rename 'hvac_mode2' to 'hvac_mode_changeover' for clarity and consistency

Author: liudger

src/bsblan/constants.py

@@ -31,7 +31,8 @@ class APIConfig(TypedDict):
 BASE_HEATING_PARAMS: Final[dict[str, str]] = {
     "700": "hvac_mode",
     "710": "target_temperature",
-    "900": "hvac_mode2",
+    "900": "hvac_mode_changeover",
+    # -------
     "8000": "hvac_action",
     "8740": "current_temperature",
     "8749": "room1_thermostat_mode",
@@ -72,8 +73,10 @@ class APIConfig(TypedDict):
     "1661": "dhw_circulation_pump_cycling",
     "1663": "dhw_circulation_setpoint",
     "1680": "operating_mode_changeover",
+    # -------
     "8830": "dhw_actual_value_top_temperature",
     "8820": "state_dhw_pump",
+    # -------
     "561": "dhw_time_program_monday",
     "562": "dhw_time_program_tuesday",
     "563": "dhw_time_program_wednesday",

src/bsblan/models.py

@@ -154,7 +154,7 @@ class State(DataClassJSONMixin):
     hvac_mode: EntityInfo
     target_temperature: EntityInfo
     hvac_action: EntityInfo
-    hvac_mode2: EntityInfo | None = None
+    hvac_mode_changeover: EntityInfo | None = None
     current_temperature: EntityInfo | None = None
     room1_thermostat_mode: EntityInfo | None = None
     room1_temp_setpoint_boost: EntityInfo | None = None

tests/fixtures/dict_version.json

@@ -2,7 +2,7 @@
   "heating": {
     "700": "hvac_mode",
     "710": "target_temperature",
-    "900": "hvac_mode2",
+    "900": "hvac_mode_changeover",
     "8000": "hvac_action",
     "8740": "current_temperature",
     "8749": "room1_thermostat_mode"

tests/test_state.py

@@ -59,32 +59,32 @@ async def test_state(monkeypatch: Any) -> None:
         assert state.target_temperature.desc == ""
         assert state.target_temperature.unit == "°C"
 
-        # HVAC mode 2 assertions
-        assert state.hvac_mode2 is not None
-        assert state.hvac_mode2.value == 2
-        assert state.hvac_mode2.desc == "Reduced"
-
-        # HVAC action assertions
-        assert state.hvac_action is not None
-        assert state.hvac_action.value == 122
-        assert state.hvac_action.desc == "Room temperature limitation"
-
-        # Current temperature assertions
-        assert state.current_temperature is not None
-        assert state.current_temperature.value == 19.3
-        assert state.current_temperature.unit == "°C"
-
-        # Room thermostat mode assertions
-        assert state.room1_thermostat_mode is not None
-        assert state.room1_thermostat_mode.value == 0
-        assert state.room1_thermostat_mode.desc == "No demand"
-
-        # Room temperature setpoint boost assertions
-        assert state.room1_temp_setpoint_boost is not None
-        assert state.room1_temp_setpoint_boost.value == "---"
-        assert state.room1_temp_setpoint_boost.unit == "°C"
-
-        # Verify API call
-        request_mock.assert_called_once_with(
-            params={"Parameter": "700,710,900,8000,8740,8749,770"}
-        )
+    # HVAC mode changeover assertions
+    assert state.hvac_mode_changeover is not None
+    assert state.hvac_mode_changeover.value == 2
+    assert state.hvac_mode_changeover.desc == "Reduced"
+
+    # HVAC action assertions
+    assert state.hvac_action is not None
+    assert state.hvac_action.value == 122
+    assert state.hvac_action.desc == "Room temperature limitation"
+
+    # Current temperature assertions
+    assert state.current_temperature is not None
+    assert state.current_temperature.value == 19.3
+    assert state.current_temperature.unit == "°C"
+
+    # Room thermostat mode assertions
+    assert state.room1_thermostat_mode is not None
+    assert state.room1_thermostat_mode.value == 0
+    assert state.room1_thermostat_mode.desc == "No demand"
+
+    # Room temperature setpoint boost assertions
+    assert state.room1_temp_setpoint_boost is not None
+    assert state.room1_temp_setpoint_boost.value == "---"
+    assert state.room1_temp_setpoint_boost.unit == "°C"
+
+    # Verify API call
+    request_mock.assert_called_once_with(
+        params={"Parameter": "700,710,900,8000,8740,8749,770"}
+    )