Skip to content

Commit 99b60b4

Browse files
committed
Use the added constants
1 parent 4070d5e commit 99b60b4

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

plugwise/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import semver
1717

1818
from .constants import (
19+
ADAM,
1920
APPLIANCES,
2021
DEFAULT_PORT,
2122
DEFAULT_TIMEOUT,
@@ -113,7 +114,7 @@ def _update_gw_devices(self) -> None:
113114
device.update(data)
114115

115116
# Update for cooling
116-
if device["dev_class"] in ZONE_THERMOSTATS and self.smile_name != "Adam":
117+
if device["dev_class"] in ZONE_THERMOSTATS and self.smile_name != ADAM:
117118
self.update_for_cooling(device)
118119

119120
remove_empty_platform_dicts(device)
@@ -187,7 +188,7 @@ def _device_data_adam(
187188
"""
188189
# Indicate heating_state based on valves being open in case of city-provided heating
189190
if (
190-
self.smile_name == "Adam"
191+
self.smile_name == ADAM
191192
and device.get("dev_class") == "heater_central"
192193
and self._on_off_device
193194
and self._heating_valves() is not None
@@ -662,7 +663,7 @@ async def set_schedule_state(
662663
template = (
663664
'<template tag="zone_preset_based_on_time_and_presence_with_override" />'
664665
)
665-
if self.smile_name != "Adam":
666+
if self.smile_name != ADAM:
666667
locator = f'.//*[@id="{schedule_rule_id}"]/template'
667668
template_id = self._domain_objects.find(locator).attrib["id"]
668669
template = f'<template id="{template_id}" />'
@@ -715,7 +716,7 @@ async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
715716
if "setpoint" in items:
716717
setpoint = items["setpoint"]
717718

718-
if self._cooling_present and self.smile_name != "Adam":
719+
if self._cooling_present and self.smile_name != ADAM:
719720
if "setpoint_high" not in items:
720721
raise PlugwiseError(
721722
"Plugwise: failed setting temperature: no valid input provided"

plugwise/helper.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
from .constants import (
2222
ACTIVE_ACTUATORS,
2323
ACTUATOR_CLASSES,
24+
ADAM,
25+
ANNA,
2426
APPLIANCES,
2527
ATTR_NAME,
2628
ATTR_UNIT_OF_MEASUREMENT,
@@ -380,7 +382,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch | N
380382

381383
return appl
382384

383-
if self.smile_name == "Adam":
385+
if self.smile_name == ADAM:
384386
locator = "./logs/interval_log/electricity_interval_meter"
385387
mod_type = "electricity_interval_meter"
386388
module_data = self._get_module_data(appliance, locator, mod_type)
@@ -411,7 +413,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
411413
appl.vendor_name = "Plugwise"
412414

413415
# Adam: look for the ZigBee MAC address of the Smile
414-
if self.smile_name == "Adam" and (
416+
if self.smile_name == ADAM and (
415417
found := self._modules.find(".//protocols/zig_bee_coordinator")
416418
):
417419
appl.zigbee_mac = found.find("mac_address").text
@@ -830,7 +832,7 @@ def _wireless_availablity(self, appliance: etree, data: DeviceData) -> None:
830832
831833
Collect the availablity-status for wireless connected devices.
832834
"""
833-
if self.smile_name == "Adam":
835+
if self.smile_name == ADAM:
834836
# Collect for Plugs
835837
locator = "./logs/interval_log/electricity_interval_meter"
836838
mod_type = "electricity_interval_meter"
@@ -951,11 +953,11 @@ def _process_c_heating_state(self, data: DeviceData) -> None:
951953
if self._on_off_device:
952954
# Anna + OnOff heater: use central_heating_state to show heating_state
953955
# Solution for Core issue #81839
954-
if self.smile_name == "Smile Anna":
956+
if self.smile_name == ANNA:
955957
data["binary_sensors"]["heating_state"] = data["c_heating_state"]
956958

957959
# Adam + OnOff cooling: use central_heating_state to show heating/cooling_state
958-
if self.smile_name == "Adam":
960+
if self.smile_name == ADAM:
959961
if "heating_state" not in data["binary_sensors"]:
960962
self._count += 1
961963
data["binary_sensors"]["heating_state"] = False
@@ -1009,7 +1011,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData:
10091011
# Collect availability-status for wireless connected devices to Adam
10101012
self._wireless_availablity(appliance, data)
10111013

1012-
if dev_id == self.gateway_id and self.smile_name == "Adam":
1014+
if dev_id == self.gateway_id and self.smile_name == ADAM:
10131015
self._get_regulation_mode(appliance, data)
10141016

10151017
if "c_heating_state" in data:
@@ -1020,7 +1022,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData:
10201022

10211023
if (
10221024
self._is_thermostat
1023-
and self.smile_name == "Smile Anna"
1025+
and self.smile_name == ANNA
10241026
and dev_id == self._heater_id
10251027
):
10261028
# Anna+Elga: base cooling_state on the elga-status-code
@@ -1140,7 +1142,7 @@ def _get_group_switches(self) -> dict[str, DeviceData]:
11401142
"""
11411143
switch_groups: dict[str, DeviceData] = {}
11421144
# P1 and Anna don't have switchgroups
1143-
if self.smile_type == "power" or self.smile_name == "Smile Anna":
1145+
if self.smile_type == "power" or self.smile_name == ANNA:
11441146
return switch_groups
11451147

11461148
for group in self._domain_objects.findall("./group"):

0 commit comments

Comments
 (0)