Skip to content

Hotfix: Hot water boost: Support old + new register names #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KevinVR wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Hotfix: Hot water boost: Support old + new register names #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ThermiaOnlineAPI/api/ThermiaAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
REG_GROUP_OPERATIONAL_TIME,
REG_GROUP_TEMPERATURES,
REG_HOT_WATER_STATUS,
REG_HOT_WATER_BOOST,
REG__HOT_WATER_BOOST,
REG_OPERATIONMODE,
THERMIA_CONFIG_URL,
Expand Down Expand Up @@ -376,9 +377,15 @@ def get_group_hot_water(self, device: ThermiaHeatPump) -> Dict[str, Optional[int
)
hot_water_boost_switch_data = (
self.__get_switch_register_index_and_value_from_group_by_register_name(
register_data, REG__HOT_WATER_BOOST
register_data, REG_HOT_WATER_BOOST
)
)
if hot_water_boost_switch_data["registerId"] is None:
hot_water_boost_switch_data = (
self.__get_switch_register_index_and_value_from_group_by_register_name(
register_data, REG__HOT_WATER_BOOST
)
)

device.set_register_index_hot_water_switch(hot_water_switch_data["registerId"])

Expand Down
1 change: 1 addition & 0 deletions ThermiaOnlineAPI/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
###############################################################################

REG_HOT_WATER_STATUS = "REG_HOT_WATER_STATUS"
REG_HOT_WATER_BOOST = "REG_HOT_WATER_BOOST"
REG__HOT_WATER_BOOST = "REG__HOT_WATER_BOOST"

###############################################################################
Expand Down
47 changes: 47 additions & 0 deletions ThermiaOnlineAPI/tests/test_hot_water_boost_register_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import pytest

from ..api.ThermiaAPI import ThermiaAPI


@pytest.mark.parametrize(
"register_name",
["REG_HOT_WATER_BOOST", "REG__HOT_WATER_BOOST"],
)
def test_hot_water_boost_register_name_aliases(monkeypatch, register_name):
register_group = [
{
"registerId": 115521,
"registerName": "REG_HOT_WATER_STATUS",
"registerValue": 1.0,
"valueNames": [{"value": 0}, {"value": 1}],
},
{
"registerId": 115537,
"registerName": register_name,
"registerValue": 1.0,
"valueNames": [{"value": 0}, {"value": 1}],
},
]

class HeatPump:
id = "test-device"

def set_register_index_hot_water_switch(self, register_index):
self.hot_water_switch_register_index = register_index

def set_register_index_hot_water_boost_switch(self, register_index):
self.hot_water_boost_register_index = register_index

api = ThermiaAPI.__new__(ThermiaAPI)
monkeypatch.setattr(
api,
"_ThermiaAPI__get_register_group",
lambda _device_id, _register_group: register_group,
)

heat_pump = HeatPump()
state = api.get_group_hot_water(heat_pump)

assert state == {"hot_water_switch": 1, "hot_water_boost_switch": 1}
assert heat_pump.hot_water_switch_register_index == 115521
assert heat_pump.hot_water_boost_register_index == 115537