python-bsblan 6.1.10__tar.gz → 6.1.11__tar.gz

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/.github/workflows/codeql.yaml

@@ -27,6 +27,6 @@ jobs:
         with:
           persist-credentials: false
       - name: 🏗 Initialize CodeQL
-        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/init@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
       - name: 🚀 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/analyze@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/.github/workflows/scorecard.yml

@@ -66,6 +66,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       - name: "Upload to code-scanning"
         # yamllint disable-line rule:line-length
-        uses: github/codeql-action/upload-sarif@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
         with:
           sarif_file: results.sarif

python_bsblan-6.1.11/.nvmrc

@@ -0,0 +1 @@
+24.22.0

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-bsblan
-Version: 6.1.10
+Version: 6.1.11
 Summary: Asynchronous Python client for BSBLAN API
 Project-URL: Homepage, https://github.com/liudger/python-bsblan
 Project-URL: Repository, https://github.com/liudger/python-bsblan

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/docs/getting-started.md

@@ -95,6 +95,26 @@ example, on PPS devices). The upper heating bound is the comfort maximum (`716`
 for circuit 1 and `1016` for circuit 2) when the device exposes those
 parameters.
 
+## Reduced setpoint and temporary override
+
+The reduced room setpoint (`712` for circuit 1, `1012` for circuit 2) can be
+written with `temp_reduced_setpoint`. It uses the same bounds as
+`target_temperature`.
+
+To switch a circuit to comfort or reduced only until the next time program
+switch point, write `temporary_mode` (`10110` for circuit 1, `10111` for circuit
+2): `0` (no override), `1` (reduced), or `2` (comfort). The override only has an
+effect in automatic mode and cannot be read back.
+
+```python
+async with BSBLAN(config) as client:
+    await client.thermostat(temp_reduced_setpoint="18.0")
+    await client.thermostat(temporary_mode=2)
+```
+
+Setting `temp_reduced_setpoint` and `temporary_mode` is not supported on PPS
+devices.
+
 ## Cooling setpoint support
 
 Some BSB/LPB controllers expose a cooling comfort setpoint for each heating
@@ -147,6 +167,24 @@ async with BSBLAN(config) as client:
 
 Setting `cooling_operating_mode` is not supported on PPS devices.
 
+## Active setpoints
+
+In automatic mode the controller switches between the comfort setpoint
+(`710`/`1010`) and the reduced setpoint (`712`/`1012`) following the time
+program, and room units can shift it temporarily. `target_temperature` always
+holds the comfort setpoint. The setpoint the controller currently applies is
+exposed as `current_setpoint` (`8741` for circuit 1, `8771` for circuit 2).
+
+Hot water works the same way: `nominal_setpoint` (`1610`) applies during the
+release periods (`1620`) and `reduced_setpoint` (`1612`) outside them. The
+setpoint currently applied is exposed as `dhw_current_setpoint` (`8831`).
+
+```python
+async with BSBLAN(config) as client:
+    state = await client.state(include=["target_temperature", "current_setpoint"])
+    hw_state = await client.hot_water_state(include=["dhw_current_setpoint"])
+```
+
 ## PPS bus support
 
 PPS bus devices are detected from the device metadata returned by BSB-LAN. The

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/examples/fake_bsblan_server.py

@@ -128,6 +128,7 @@ def build_parameter_db(
     # ---- Sensor params ----
     db["8700"] = _param("Outside temp sensor local", "6.1", unit="°C", readonly=1)
     db["8740"] = _param("Room temp 1 actual value", "21.3", unit="°C", readonly=1)
+    db["8741"] = _param("Room setpoint 1", "21.0", unit="°C", readonly=1)
     db["3113"] = _param("Total energy", "7968", unit="kWh", readonly=1)
 
     # ---- Time param (0) ----
@@ -161,6 +162,7 @@ def build_parameter_db(
         db["1663"] = _param("DHW circulation setpoint", "40.0", unit="°C")
         db["1680"] = _param("DHW changeover", "0", desc="---", data_type=1)
         db["8830"] = _param("DHW actual top temp", "48.2", unit="°C", readonly=1)
+        db["8831"] = _param("DHW current setpoint", "50.0", unit="°C", readonly=1)
         db["8820"] = _param(
             "DHW pump state", "255", desc="Off", data_type=1, readonly=1
         )
@@ -219,9 +221,10 @@ def build_parameter_db(
             data_type=1,
             readonly=1,
         )
-        db["8741"] = _param(
+        db["8770"] = _param(
             "Room temp 2 actual value", "19.8", unit="°C", readonly=1
         )
+        db["8771"] = _param("Room setpoint 2", "19.0", unit="°C", readonly=1)
         db["8750"] = _param(
             "HC2 Room1 thermostat mode",
             "1",
@@ -250,7 +253,7 @@ def build_parameter_db(
             data_type=1,
             readonly=1,
         )
-        db["8742"] = _param(
+        db["8800"] = _param(
             "Room temp 3 actual value", "17.5", unit="°C", readonly=1
         )
         db["8751"] = _param(
@@ -340,6 +343,7 @@ class FakeBSBLAN:
                     "1680",
                     "8820",
                     "8830",
+                    "8831",
                 }
             )
 

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/package-lock.json

@@ -12,13 +12,13 @@
         "url-parse": "1.5.10"
       },
       "devDependencies": {
-        "prettier": "3.9.9"
+        "prettier": "3.9.10"
       }
     },
     "node_modules/prettier": {
-      "version": "3.9.9",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.9.tgz",
-      "integrity": "sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg==",
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.10.tgz",
+      "integrity": "sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==",
       "dev": true,
       "license": "MIT",
       "bin": {

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/package.json

@@ -9,7 +9,7 @@
   "author": "WJL van Rootselaar <liudgervr@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "prettier": "3.9.9"
+    "prettier": "3.9.10"
   },
   "dependencies": {
     "url-parse": "1.5.10"

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-bsblan"
-version = "6.1.10"
+version = "6.1.11"
 description = "Asynchronous Python client for BSBLAN API"
 authors = [
     {name = "Willem-Jan van Rootselaar", email = "liudgervr@gmail.com"}
@@ -186,7 +186,7 @@ build-backend = "hatchling.build"
 dev = [
     "aresponses==3.0.0",
     "bandit==1.9.4",
-    "black==26.10.0",
+    "black==26.10.1",
     "blacken-docs==1.20.0",
     "codespell==2.4.3",
     "covdefaults==2.3.0",
@@ -197,16 +197,16 @@ dev = [
     # hatch is required to support type hinting and proper packaging of the py.typed file.
     "hatch>=1.14.1",
     "isort==8.0.1",
-    "ty==0.0.86",
+    "ty==0.0.89",
     "prek>=0.3.3",
     "pre-commit-hooks==6.0.0",
-    "pylint==4.1.2",
+    "pylint==4.1.3",
     "pytest>=8.3.5",
     "pytest-asyncio==1.4.0",
     "pytest-cov==7.1.0",
     "pytest-xdist>=3.8.0",
     "pyupgrade==3.22.0",
-    "ruff==0.16.10",
+    "ruff==0.17.1",
     "safety==3.8.1",
     "vulture==2.16",
     "yamllint==1.38.0",

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/src/bsblan/_thermostat.py

@@ -35,7 +35,7 @@ class ThermostatWriter:
         self._temperature = temperature
         self._set_payload = set_payload
 
-    async def prepare_state(  # pylint: disable=too-many-arguments
+    async def prepare_state(  # noqa: PLR0913  # pylint: disable=too-many-arguments
         self,
         target_temperature: str | None,
         hvac_mode: int | None,
@@ -43,6 +43,8 @@ class ThermostatWriter:
         target_temperature_high: str | float | None = None,
         *,
         cooling_operating_mode: int | None = None,
+        temp_reduced_setpoint: str | float | None = None,
+        temporary_mode: int | None = None,
     ) -> dict[str, Any]:
         """Prepare the thermostat state for setting.
 
@@ -53,6 +55,9 @@ class ThermostatWriter:
             target_temperature_high: The cooling comfort setpoint to set.
             cooling_operating_mode: The cooling circuit operating mode to set
                 as raw integer.
+            temp_reduced_setpoint: The reduced (eco) room setpoint to set.
+            temporary_mode: The temporary operating mode override to set as
+                raw integer.
 
         Returns:
             dict[str, Any]: The prepared state for the thermostat.
@@ -69,10 +74,7 @@ class ThermostatWriter:
                 self._set_payload(param_ids["target_temperature"], target_temperature),
             )
         if target_temperature_high is not None:
-            param_id = param_ids.get("target_temperature_high")
-            if param_id is None:
-                parameter_name = "target_temperature_high"
-                raise BSBLANInvalidParameterError(parameter_name)
+            param_id = self._param_id(param_ids, "target_temperature_high")
             await self._temperature.validate_target_temperature_high(
                 target_temperature_high,
                 circuit,
@@ -89,16 +91,35 @@ class ThermostatWriter:
                 self._set_payload(param_ids["hvac_mode"], hvac_value),
             )
         if cooling_operating_mode is not None:
-            param_id = param_ids.get("cooling_operating_mode")
-            if param_id is None:
-                parameter_name = "cooling_operating_mode"
-                raise BSBLANInvalidParameterError(parameter_name)
+            param_id = self._param_id(param_ids, "cooling_operating_mode")
             self.validate_cooling_operating_mode(cooling_operating_mode)
             state.update(
                 self._set_payload(param_id, str(cooling_operating_mode)),
             )
+        if temp_reduced_setpoint is not None:
+            param_id = self._param_id(param_ids, "temp_reduced_setpoint")
+            await self._temperature.validate_target_temperature(
+                str(temp_reduced_setpoint),
+                circuit,
+            )
+            state.update(
+                self._set_payload(param_id, str(temp_reduced_setpoint)),
+            )
+        if temporary_mode is not None:
+            param_id = self._param_id(param_ids, "temporary_mode")
+            self.validate_temporary_mode(temporary_mode)
+            state.update(
+                self._set_payload(param_id, str(temporary_mode)),
+            )
         return state
 
+    @staticmethod
+    def _param_id(param_ids: dict[str, str], parameter_name: str) -> str:
+        """Return the parameter ID for a write, or raise if unsupported."""
+        if (param_id := param_ids.get(parameter_name)) is None:
+            raise BSBLANInvalidParameterError(parameter_name)
+        return param_id
+
     def thermostat_params(self, circuit: int) -> dict[str, str]:
         """Return thermostat write parameters for the active bus type."""
         if self._uses_pps_bus():
@@ -135,3 +156,17 @@ class ThermostatWriter:
         """
         if cooling_operating_mode not in Validation.COOLING_OPERATING_MODES:
             raise BSBLANInvalidParameterError(str(cooling_operating_mode))
+
+    def validate_temporary_mode(self, temporary_mode: int) -> None:
+        """Validate the temporary operating mode override.
+
+        Args:
+            temporary_mode (int): The mode to validate. Valid values are
+                0=No override, 1=Reduced, 2=Comfort.
+
+        Raises:
+            BSBLANInvalidParameterError: If the mode is invalid.
+
+        """
+        if temporary_mode not in Validation.TEMPORARY_MODES:
+            raise BSBLANInvalidParameterError(str(temporary_mode))

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/src/bsblan/_validation.py

@@ -233,7 +233,7 @@ class SectionValidator:
 
         This enables more granular lazy loading for hot water - instead of
         validating all 29 hot water parameters at once, we only validate
-        the specific group needed (essential: 5, config: 16, schedule: 8).
+        the specific group needed (essential: 6, config: 16, schedule: 8).
 
         Uses a per-group lock to prevent concurrent validation of the same
         group, which could cause duplicate network requests.

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/src/bsblan/bsblan.py

@@ -171,7 +171,20 @@ class BSBLAN:
         if self.session is None:
             self.session = aiohttp.ClientSession()
             self._close_session = True
-        await self.initialize()
+        try:
+            await self.initialize()
+        except BaseException:
+            if self._close_session and self.session:
+                session = self.session
+                self.session = None
+                self._close_session = False
+                try:
+                    await session.close()
+                except Exception:
+                    logger.exception(
+                        "Failed to close session after initialization failure"
+                    )
+            raise
         return self
 
     async def __aexit__(self, *args: object) -> None:
@@ -332,7 +345,7 @@ class BSBLAN:
 
         This enables more granular lazy loading for hot water - instead of
         validating all 29 hot water parameters at once, we only validate
-        the specific group needed (essential: 5, config: 16, schedule: 8).
+        the specific group needed (essential: 6, config: 16, schedule: 8).
 
         Uses a per-group lock to prevent concurrent validation of the same
         group, which could cause duplicate network requests.
@@ -720,7 +733,7 @@ class BSBLAN:
             include: Optional list of parameter names to fetch. If None,
                 fetches all state parameters. Valid names include:
                 hvac_mode, target_temperature, hvac_action,
-                hvac_mode_changeover, current_temperature,
+                hvac_mode_changeover, current_temperature, current_setpoint,
                 room1_temp_setpoint_boost.
             circuit: The heating circuit number (1 or 2). Defaults to 1.
                 Circuit 2 uses separate parameter IDs but returns the
@@ -782,15 +795,17 @@ class BSBLAN:
         Args:
             include: Optional list of parameter names to fetch. If None,
                 fetches all static parameters. Valid names include:
-                min_temp, max_temp.
+                temp_reduced_setpoint, heating_protective_setpoint,
+                comfort_setpoint_max, cooling_comfort_setpoint_min,
+                cooling_reduced_setpoint, and min_temp, max_temp on PPS.
             circuit: The heating circuit number (1 or 2). Defaults to 1.
 
         Returns:
             StaticState: The static information from the BSBLAN device.
 
         Example:
-            # Fetch only min_temp
-            static = await client.static_values(include=["min_temp"])
+            # Fetch only the reduced setpoint
+            static = await client.static_values(include=["temp_reduced_setpoint"])
 
             # Fetch static values for heating circuit 2
             static_hc2 = await client.static_values(circuit=2)
@@ -866,7 +881,7 @@ class BSBLAN:
         )
         logger.debug("Response for setting time: %s", response)
 
-    async def thermostat(  # pylint: disable=too-many-arguments
+    async def thermostat(  # noqa: PLR0913  # pylint: disable=too-many-arguments
         self,
         target_temperature: str | None = None,
         hvac_mode: int | None = None,
@@ -874,6 +889,8 @@ class BSBLAN:
         target_temperature_high: str | float | None = None,
         *,
         cooling_operating_mode: int | None = None,
+        temp_reduced_setpoint: str | float | None = None,
+        temporary_mode: int | None = None,
     ) -> None:
         """Change the state of the thermostat through BSB-Lan.
 
@@ -888,6 +905,12 @@ class BSBLAN:
             cooling_operating_mode: The cooling circuit operating mode to set
                 as raw integer value: 0=Protection, 1=Automatic, 2=Reduced,
                 3=Comfort. Not supported on PPS devices.
+            temp_reduced_setpoint: The reduced (eco) room setpoint to set.
+                Not supported on PPS devices.
+            temporary_mode: Temporary operating mode override, active until
+                the next time program switch point. Raw integer value:
+                0=No override, 1=Reduced, 2=Comfort. Only has an effect in
+                automatic mode. Not supported on PPS devices.
 
         Example:
             # Set HC1 temperature
@@ -899,6 +922,12 @@ class BSBLAN:
             # Set HC1 cooling operating mode
             await client.thermostat(cooling_operating_mode=1)
 
+            # Set HC1 reduced setpoint
+            await client.thermostat(temp_reduced_setpoint="18.0")
+
+            # Switch HC1 to comfort until the next time program switch point
+            await client.thermostat(temporary_mode=2)
+
             # Set HC2 mode
             await client.thermostat(hvac_mode=1, circuit=2)
 
@@ -906,13 +935,14 @@ class BSBLAN:
         self._validate_circuit(circuit)
         if self._uses_pps_bus:
             self._validate_bus_write_supported()
-        await self._initialize_temperature_range(circuit)
 
         self._validate_single_parameter(
             target_temperature,
             hvac_mode,
             target_temperature_high,
             cooling_operating_mode,
+            temp_reduced_setpoint,
+            temporary_mode,
             error_msg=ErrorMsg.MULTI_PARAMETER,
         )
 
@@ -922,6 +952,8 @@ class BSBLAN:
             circuit,
             target_temperature_high,
             cooling_operating_mode=cooling_operating_mode,
+            temp_reduced_setpoint=temp_reduced_setpoint,
+            temporary_mode=temporary_mode,
         )
         await self._set_device_state(state)
 
@@ -1010,14 +1042,15 @@ class BSBLAN:
         that are typically checked frequently for monitoring purposes.
         This reduces API calls and improves performance for regular polling.
 
-        Uses granular lazy loading - only validates the 5 essential params,
+        Uses granular lazy loading - only validates the 6 essential params,
         not all 29 hot water parameters.
 
         Args:
             include: Optional list of parameter names to fetch. If None,
                 fetches all essential hot water parameters. Valid names include:
                 operating_mode, nominal_setpoint, release,
-                dhw_actual_value_top_temperature, state_dhw_pump.
+                dhw_actual_value_top_temperature, dhw_current_setpoint,
+                state_dhw_pump.
 
         Returns:
             HotWaterState: Essential hot water state information.

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/src/bsblan/constants.py

@@ -45,6 +45,7 @@ BASE_HEATING_PARAMS: Final[dict[str, str]] = {
     # -------
     "8000": "hvac_action",
     "8740": "current_temperature",
+    "8741": "current_setpoint",
     "770": "room1_temp_setpoint_boost",
 }
 
@@ -90,6 +91,7 @@ BASE_HOT_WATER_PARAMS: Final[dict[str, str]] = {
     "1680": "operating_mode_changeover",
     # -------
     "8830": "dhw_actual_value_top_temperature",
+    "8831": "dhw_current_setpoint",
     "8820": "state_dhw_pump",
     # -------
     "561": "dhw_time_program_monday",
@@ -113,6 +115,7 @@ BASE_HEATING_CIRCUIT2_PARAMS: Final[dict[str, str]] = {
     # -------
     "8001": "hvac_action",
     "8770": "current_temperature",
+    "8771": "current_setpoint",
     "1070": "room1_temp_setpoint_boost",
 }
 
@@ -181,12 +184,16 @@ class CircuitConfig:
             "target_temperature_high": "902",
             "hvac_mode": "700",
             "cooling_operating_mode": "901",
+            "temp_reduced_setpoint": "712",
+            "temporary_mode": "10110",
         },
         2: {
             "target_temperature": "1010",
             "target_temperature_high": "1202",
             "hvac_mode": "1000",
             "cooling_operating_mode": "1201",
+            "temp_reduced_setpoint": "1012",
+            "temporary_mode": "10111",
         },
     }
     PROBE_PARAMS: Final[dict[int, str]] = {
@@ -252,6 +259,9 @@ class Validation:
     # 901/1201 cooling circuit operating mode (ENUM, verified on device):
     # 0=Protection, 1=Automatic, 2=Reduced, 3=Comfort
     COOLING_OPERATING_MODES: Final[set[int]] = {0, 1, 2, 3}
+    # 10110/10111 temporary operating mode (write-only, verified on device):
+    # 0=No override, 1=Reduced, 2=Comfort, until the next time program switch
+    TEMPORARY_MODES: Final[set[int]] = {0, 1, 2}
     PPS_HVAC_MODES: Final[set[int]] = {0, 1, 3}
     PPS_HVAC_MODE_TO_BSBLAN: Final[dict[int, str]] = {
         0: "2",  # off
@@ -415,19 +425,20 @@ _STATUS_TO_CATEGORY: dict[HeatingCircuitStatus, HVACActionCategory] = {
     # Off states
     HeatingCircuitStatus.FAULT_ERROR: HVACActionCategory.OFF,
     HeatingCircuitStatus.STANDBY_1: HVACActionCategory.OFF,
-    HeatingCircuitStatus.OFF: HVACActionCategory.OFF,
     HeatingCircuitStatus.STANDBY_2: HVACActionCategory.OFF,
     HeatingCircuitStatus.COOLING_OFF: HVACActionCategory.OFF,
-    HeatingCircuitStatus.COOLING_LOCKED: HVACActionCategory.OFF,
     HeatingCircuitStatus.HEATING_GENERATOR_OFF: HVACActionCategory.OFF,
     HeatingCircuitStatus.HEATING_OFF: HVACActionCategory.OFF,
-    HeatingCircuitStatus.LOCKED_HEATING_MODE: HVACActionCategory.OFF,
-    HeatingCircuitStatus.LOCKED_GENERATOR: HVACActionCategory.OFF,
-    HeatingCircuitStatus.LOCKED_BUFFER: HVACActionCategory.OFF,
-    HeatingCircuitStatus.DAY_ECO: HVACActionCategory.OFF,
-    HeatingCircuitStatus.SETBACK_REDUCED: HVACActionCategory.OFF,
-    HeatingCircuitStatus.SETBACK_FROST_PROTECTION: HVACActionCategory.OFF,
-    HeatingCircuitStatus.ROOM_TEMPERATURE_LIMIT: HVACActionCategory.OFF,
+    # Idle states: the circuit runs but currently needs no heat
+    HeatingCircuitStatus.OFF: HVACActionCategory.IDLE,  # summer operation
+    HeatingCircuitStatus.COOLING_LOCKED: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.LOCKED_HEATING_MODE: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.LOCKED_GENERATOR: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.LOCKED_BUFFER: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.DAY_ECO: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.SETBACK_REDUCED: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.SETBACK_FROST_PROTECTION: HVACActionCategory.IDLE,
+    HeatingCircuitStatus.ROOM_TEMPERATURE_LIMIT: HVACActionCategory.IDLE,
     # Heating states
     HeatingCircuitStatus.MANUAL_CONTROL: HVACActionCategory.HEATING,
     HeatingCircuitStatus.OVERRUN: HVACActionCategory.HEATING,
@@ -642,6 +653,7 @@ class HotWaterParams:
             "nominal_setpoint",
             "release",
             "dhw_actual_value_top_temperature",
+            "dhw_current_setpoint",
             "state_dhw_pump",
         }
     }

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/src/bsblan/models.py

@@ -481,6 +481,8 @@ class State(BaseModel):
     # (0=Protection, 1=Automatic, 2=Reduced, 3=Comfort)
     cooling_operating_mode: EntityInfo[int] | None = None
     current_temperature: EntityInfo[float] | None = None
+    # 8741/8771: room setpoint currently applied by the controller
+    current_setpoint: EntityInfo[float] | None = None
     room1_temp_setpoint_boost: EntityInfo[float] | None = None
 
 
@@ -525,6 +527,7 @@ class HotWaterState(BaseModel):
     nominal_setpoint: EntityInfo[float] | None = None
     release: EntityInfo[int] | None = None
     dhw_actual_value_top_temperature: EntityInfo[float] | None = None
+    dhw_current_setpoint: EntityInfo[float] | None = None
     state_dhw_pump: EntityInfo[int] | None = None
 
 

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/tests/fixtures/hot_water_state.json

@@ -249,6 +249,19 @@
       "readwrite": 1,
       "unit": "°C"
   },
+  "8831": {
+      "name": "DHW temperature setpoint",
+      "dataType_name": "TEMP",
+      "dataType_family": "VALS",
+      "error": 0,
+      "value": "45.0",
+      "desc": "",
+      "precision": 0.1,
+      "dataType": 0,
+      "readonly": 1,
+      "readwrite": 1,
+      "unit": "°C"
+  },
   "8820": {
       "name": "State DHW pump",
       "dataType_name": "ONOFF",

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/tests/fixtures/state.json

@@ -86,6 +86,19 @@
     "readwrite": 1,
     "unit": "°C"
   },
+  "8741": {
+    "name": "Room temperature setpoint 1",
+    "dataType_name": "TEMP",
+    "dataType_family": "VALS",
+    "error": 0,
+    "value": "18.0",
+    "desc": "",
+    "precision": 0.1,
+    "dataType": 0,
+    "readonly": 1,
+    "readwrite": 1,
+    "unit": "°C"
+  },
   "770": {
     "name": "Room temp setpoint boost (boost heating)",
     "dataType_name": "TEMP",

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/tests/fixtures/state_circuit2.json

@@ -86,6 +86,19 @@
     "readwrite": 1,
     "unit": "°C"
   },
+  "8771": {
+    "name": "Room temperature setpoint 2",
+    "dataType_name": "TEMP",
+    "dataType_family": "VALS",
+    "error": 0,
+    "value": "19.0",
+    "desc": "",
+    "precision": 0.1,
+    "dataType": 0,
+    "readonly": 1,
+    "readwrite": 1,
+    "unit": "°C"
+  },
   "1070": {
     "name": "Room temp setpoint boost (boost heating)",
     "dataType_name": "TEMP",

{python_bsblan-6.1.10 → python_bsblan-6.1.11}/tests/test_circuit.py

@@ -149,6 +149,8 @@ async def test_state_circuit2(monkeypatch: Any) -> None:
         assert state.hvac_mode.desc == "Automatic"
         assert state.current_temperature is not None
         assert state.current_temperature.value == 18.5
+        assert state.current_setpoint is not None
+        assert state.current_setpoint.value == 19.0
         assert state.target_temperature_high is not None
         assert state.target_temperature_high.value == 24.0
         assert state.cooling_operating_mode is not None
@@ -491,6 +493,39 @@ async def test_thermostat_circuit2_cooling_operating_mode(
     )
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("kwargs", "parameter", "value"),
+    [
+        ({"temp_reduced_setpoint": "17"}, "1012", "17"),
+        ({"temporary_mode": 2}, "10111", "2"),
+    ],
+)
+async def test_thermostat_circuit2_reduced_and_temporary_mode(
+    mock_bsblan_circuit: BSBLAN,
+    aresponses: ResponsesMockServer,
+    kwargs: dict[str, Any],
+    parameter: str,
+    value: str,
+) -> None:
+    """Test setting the reduced setpoint and temporary mode on circuit 2."""
+    mock_bsblan_circuit._temperature._circuit_temp_ranges[2] = {
+        "min": 16.0,
+        "max": 28.0,
+    }
+    mock_bsblan_circuit._temperature._circuit_temp_initialized.add(2)
+
+    aresponses.add(
+        "example.com",
+        "/JS",
+        "POST",
+        create_response_handler(
+            {"Parameter": parameter, "Value": value, "Type": "1"},
+        ),
+    )
+    await mock_bsblan_circuit.thermostat(**kwargs, circuit=2)
+
+
 # --- Temperature range initialization tests ---