Skip to content

Improve node_info_update and update_node_details logic #333

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

Merged
merged 6 commits into from
Sep 6, 2025
Merged

Improve node_info_update and update_node_details logic #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2924bc1
improve node_info_update/node_detail_update logic
dirixmjm Sep 5, 2025
9c0b4a6
CR: fix language
dirixmjm Sep 5, 2025
e9772f5
CR: recommendations implemented
dirixmjm Sep 5, 2025
38c7a04
return None if node_info is None
dirixmjm Sep 5, 2025
0c145a1
accept NodeInfoMessage for update_node_details
dirixmjm Sep 6, 2025
1d23f0b
update CHANGELOG
dirixmjm Sep 6, 2025
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## ongoing

- PR [333](https://github.com/plugwise/python-plugwise-usb/pull/333): Improve node_info_update and update_node_details logic

## 0.45.0 - 2025-09-03

- PR [330](https://github.com/plugwise/python-plugwise-usb/pull/330): Add sense hysteresis based switch action
Expand Down
46 changes: 23 additions & 23 deletions plugwise_usb/nodes/circle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,39 +1033,39 @@ async def node_info_update(
return None

await super().node_info_update(node_info)
await self._relay_update_state(
node_info.relay_state, timestamp=node_info.timestamp
)
if self._current_log_address is not None and (
self._current_log_address > node_info.current_logaddress_pointer
or self._current_log_address == 1
):
# Rollover of log address
_LOGGER.debug(
"Rollover log address from %s into %s for node %s",
self._current_log_address,
node_info.current_logaddress_pointer,
self._mac_in_str,
)

if self._current_log_address != node_info.current_logaddress_pointer:
self._current_log_address = node_info.current_logaddress_pointer

return self._node_info

# pylint: disable=too-many-arguments
async def update_node_details(
self, node_info: NodeInfoResponse | None = None
self, node_info: NodeInfoResponse | NodeInfoMessage | None = None
) -> bool:
"""Process new node info and return true if all fields are updated."""
if node_info is None:
return False

if node_info.relay_state is not None:
self._relay_state = replace(
self._relay_state,
state=node_info.relay_state,
timestamp=node_info.timestamp,
await self._relay_update_state(
node_info.relay_state, timestamp=node_info.timestamp
)

if (
node_info.current_logaddress_pointer is not None
and self._current_log_address is not None
and self._current_log_address > node_info.current_logaddress_pointer
):
# Rollover of log address
_LOGGER.debug(
"Rollover log address from %s to %s for node %s",
self._current_log_address,
node_info.current_logaddress_pointer,
self._mac_in_str,
)

if node_info.current_logaddress_pointer is not None:
if (
node_info.current_logaddress_pointer is not None
and node_info.current_logaddress_pointer != self._current_log_address
):
self._current_log_address = node_info.current_logaddress_pointer

return await super().update_node_details(node_info)
Expand Down