Skip to content
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

Jump to bottom

Fix for #192: improve OpenTherm/OnOff boiler detection #194

Merged
merged 4 commits into from
May 23, 2022
Merged

Fix for #192: improve OpenTherm/OnOff boiler detection #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4eebe4
Improve OpenTherm/OnOff boiler detection
bouwew May 23, 2022
9306dd9
Bump to v0.18.5a1 test-version
bouwew May 23, 2022
bd0988b
Update Changelog
bouwew May 23, 2022
dfcdee3
Bump to v0.18.5 release-version
bouwew May 23, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

# v0.18.5: Smile bugfix for #192

# v0.18.4: Smile: schedule-related bug-fixes and clean-up
- Update `_last_used_schedule()`: provide the collected schedules as input in order to find the last-modified valid schedule.
- `_rule_ids_by_x()`: replace None by NONE, allowing for simpler typing.
Expand Down
2 changes: 1 addition & 1 deletion plugwise/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Plugwise module."""

__version__ = "0.18.4"
__version__ = "0.18.5"

from plugwise.smile import Smile
from plugwise.stick import Stick
16 changes: 4 additions & 12 deletions plugwise/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,18 +542,10 @@ def _all_appliances(self) -> None:
)

# Find the connected heating/cooling device (heater_central), e.g. heat-pump or gas-fired heater
# Legacy Anna only:
boiler_state = self._appliances.find(".//logs/point_log[type='boiler_state']")
# Anna, Adam:
c_heating_state = self._appliances.find(
".//logs/point_log[type='central_heating_state']"
)
ot_fault_code = self._appliances.find(
".//logs/point_log[type='open_therm_oem_fault_code']"
)
if boiler_state is not None or c_heating_state is not None:
self._opentherm_device = ot_fault_code is not None
self._on_off_device = ot_fault_code is None
onoff_boiler = self._modules.find("./module/protocols/onoff_boiler")
open_therm_boiler = self._modules.find("./module/protocols/open_therm_boiler")
self._on_off_device = onoff_boiler is not None
self._opentherm_device = open_therm_boiler is not None

for appliance in self._appliances.findall("./appliance"):
appl = Munch()
Expand Down