Skip to content

Small changes to Circle+ load function to align to Circle load function #322

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 4 commits into from
Aug 24, 2025
Merged

Small changes to Circle+ load function to align to Circle load function #322

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7dd745
C+ align load-function to circle load-function
dirixmjm Aug 16, 2025
c9ea5b5
fixup: mdi_cp Python code reformatted using Ruff
Aug 16, 2025
b8440f3
CR: use universal str representation variable to communicate mac into…
dirixmjm Aug 18, 2025
2bd581a
indentation went wrong
dirixmjm Aug 19, 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
44 changes: 16 additions & 28 deletions plugwise_usb/nodes/circle_plus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,38 +38,26 @@ async def load(self) -> bool:
if self._loaded:
return True
if self._cache_enabled:
_LOGGER.debug("Loading Circle node %s from cache", self._node_info.mac)
_LOGGER.debug("Loading Circle+ node %s from cache", self._mac_in_str)
if await self._load_from_cache():
self._loaded = True
self._setup_protocol(CIRCLE_PLUS_FIRMWARE_SUPPORT, FEATURES_CIRCLE_PLUS)
if await self.initialize():
await self._loaded_callback(NodeEvent.LOADED, self.mac)
return True

_LOGGER.info(
"Loading Circle+ node %s from cache failed",
self._node_info.mac,
)
else:
_LOGGER.debug("Loading Circle+ node %s", self._node_info.mac)

# Check if node is online
if not self._available and not await self.is_online():
_LOGGER.warning(
"Failed to load Circle+ node %s because it is not online",
self._node_info.mac,
)
return False

# Get node info
if await self.node_info_update() is None:
_LOGGER.warning(
"Failed to load Circle+ node %s because it is not responding to information request",
self._node_info.mac,
)
return False
if not self._loaded:
_LOGGER.debug("Retrieving info for Circle+ node %s", self._mac_in_str)

# Check if node is online
if (
not self._available
and not await self.is_online()
or await self.node_info_update() is None
):
_LOGGER.warning(
"Failed to load Circle+ node %s because it is not online or not responding",
self._mac_in_str,
)
return False

self._loaded = True

self._setup_protocol(CIRCLE_PLUS_FIRMWARE_SUPPORT, FEATURES_CIRCLE_PLUS)
if not await self.initialize():
return False
Expand Down