Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Ongoing

- Avoid None-init for smile_version [#699](https://github.com/plugwise/python-plugwise/pull/699)

## v1.7.0

- Continuous improvements [#678](https://github.com/plugwise/python-plugwise/pull/678)
Expand Down
4 changes: 2 additions & 2 deletions plugwise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def __init__(
self.smile_model_id: str | None = None
self.smile_name: str = NONE
self.smile_type: str = NONE
self.smile_version: Version | None = None
self.smile_version: Version = Version("0.0.0")
self.smile_zigbee_mac_address: str | None = None

@property
Expand Down Expand Up @@ -115,7 +115,7 @@ def reboot(self) -> bool:
"""
return not self.smile_legacy

async def connect(self) -> Version | None:
async def connect(self) -> Version:
"""Connect to the Plugwise Gateway and determine its name, type, version, and other data."""
result = await self._request(DOMAIN_OBJECTS)
# Work-around for Stretch fw 2.7.18
Expand Down
4 changes: 2 additions & 2 deletions plugwise/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def __init__(self) -> None:
self.smile_mac_address: str | None
self.smile_model: str
self.smile_model_id: str | None
self.smile_version: version.Version | None
self.smile_version: version.Version
SmileCommon.__init__(self)

def _all_appliances(self) -> None:
Expand Down Expand Up @@ -786,7 +786,7 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:

# Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
# In newer firmware versions, default to "off" when control_state is not present
if self.smile_version is not None:
if self.smile_version != version.Version("0.0.0"):
if self.smile_version >= version.parse("3.2.0"):
return "off"

Expand Down
2 changes: 1 addition & 1 deletion plugwise/legacy/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def __init__(self) -> None:
self.gw_entities: dict[str, GwEntityData] = {}
self.smile_mac_address: str | None
self.smile_model: str
self.smile_version: Version | None
self.smile_version: Version
self.smile_zigbee_mac_address: str | None
SmileCommon.__init__(self)

Expand Down
2 changes: 1 addition & 1 deletion plugwise/legacy/smile.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(
smile_model: str,
smile_name: str,
smile_type: str,
smile_version: Version | None,
smile_version: Version,
smile_zigbee_mac_address: str | None,
) -> None:
"""Set the constructor for this class."""
Expand Down
2 changes: 1 addition & 1 deletion plugwise/smile.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(
smile_model_id: str | None,
smile_name: str,
smile_type: str,
smile_version: Version | None,
smile_version: Version,
) -> None:
"""Set the constructor for this class."""
self._cooling_present = _cooling_present
Expand Down
Loading