Skip to content

Commit e4eb965

Browse files
bouwewbouwew
authored
Merge pull request #202 from plugwise/pre_0_18_7
Change Anna-gateway name to Smile
2 parents bf48a4f + 0f8e567 commit e4eb965

6 files changed

Lines changed: 31 additions & 28 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
# v0.18.7: Smile Anna: change Anna-gateway name to Smile
4+
- Related to https://developers.home-assistant.io/blog/2022/07/10/entity_naming/ and changes in the Core Plugwise(-beta) code.
5+
36
# v0.18.6: Smile: Maximum_boiler_temperature related improvements
47
- Improve set_max_boiler_temperature() function
58
- Add lower/upper_bound and resolution for maximum_boiler_temperature

‎plugwise/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Plugwise module."""
22

3-
__version__ = "0.18.6"
3+
__version__ = "0.18.7a0"
44

55
from plugwise.smile import Smile
66
from plugwise.stick import Stick

‎plugwise/constants.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,15 +520,15 @@
520520
},
521521
"smile_thermo_v4": {
522522
"type": "thermostat",
523-
"friendly_name": "Anna",
523+
"friendly_name": "Smile",
524524
},
525525
"smile_thermo_v3": {
526526
"type": "thermostat",
527-
"friendly_name": "Anna",
527+
"friendly_name": "Smile",
528528
},
529529
"smile_thermo_v1": {
530530
"type": "thermostat",
531-
"friendly_name": "Anna",
531+
"friendly_name": "Smile",
532532
"legacy": "true",
533533
},
534534
"smile_v4": {

‎plugwise/helper.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ def _all_appliances(self) -> None:
525525
if self.smile_type == "thermostat":
526526
self._appl_data[self._home_location].update(
527527
{
528-
"model": "Anna",
529-
"name": "Anna",
528+
"model": "Smile",
529+
"name": "Smile",
530530
"vendor": "Plugwise B.V.",
531531
}
532532
)
@@ -895,7 +895,7 @@ def _group_switches(self) -> dict[str, ApplianceData]:
895895
"""
896896
switch_groups: dict[str, ApplianceData] = {}
897897
# P1 and Anna don't have switchgroups
898-
if self.smile_type == "power" or self.smile_name == "Anna":
898+
if self.smile_type == "power" or self.smile_name == "Smile":
899899
return switch_groups
900900

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

‎plugwise/smile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ async def set_max_boiler_temperature(self, temperature: float) -> None:
587587
if th_func_list := self._appliances.findall(locator):
588588
for th_func in th_func_list:
589589
if th_func.find("type").text != "maximum_boiler_temperature":
590-
continue
590+
continue # pragma: no cover
591591

592592
thermostat_id = th_func.attrib["id"]
593593
uri = f"{APPLIANCES};id={self._heater_id}/thermostat;id={thermostat_id}"

‎tests/test_smile.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ async def test_connect_legacy_anna(self):
604604
"dev_class": "gateway",
605605
"firmware": "1.8.0",
606606
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
607-
"model": "Anna",
608-
"name": "Anna",
607+
"model": "Smile",
608+
"name": "Smile",
609609
"vendor": "Plugwise B.V.",
610610
"binary_sensors": {"plugwise_notification": False},
611611
},
@@ -693,8 +693,8 @@ async def test_connect_legacy_anna_2(self):
693693
"dev_class": "gateway",
694694
"firmware": "1.8.0",
695695
"location": "be81e3f8275b4129852c4d8d550ae2eb",
696-
"model": "Anna",
697-
"name": "Anna",
696+
"model": "Smile",
697+
"name": "Smile",
698698
"vendor": "Plugwise B.V.",
699699
"binary_sensors": {"plugwise_notification": False},
700700
"sensors": {"outdoor_temperature": 21.0},
@@ -908,8 +908,8 @@ async def test_connect_anna_v4(self):
908908
"hardware": "AME Smile 2.0 board",
909909
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
910910
"mac_address": "012345670001",
911-
"model": "Anna",
912-
"name": "Anna",
911+
"model": "Smile",
912+
"name": "Smile",
913913
"vendor": "Plugwise B.V.",
914914
"binary_sensors": {"plugwise_notification": False},
915915
"sensors": {"outdoor_temperature": 7.44},
@@ -1003,8 +1003,8 @@ async def test_connect_anna_v4_dhw(self):
10031003
"hardware": "AME Smile 2.0 board",
10041004
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
10051005
"mac_address": "012345670001",
1006-
"model": "Anna",
1007-
"name": "Anna",
1006+
"model": "Smile",
1007+
"name": "Smile",
10081008
"vendor": "Plugwise B.V.",
10091009
"binary_sensors": {"plugwise_notification": False},
10101010
"sensors": {"outdoor_temperature": 7.44},
@@ -1122,8 +1122,8 @@ async def test_connect_anna_without_boiler_fw3(self):
11221122
"hardware": "AME Smile 2.0 board",
11231123
"location": "0f4f2ada20734a339fe353348fe87b96",
11241124
"mac_address": "012345670001",
1125-
"model": "Anna",
1126-
"name": "Anna",
1125+
"model": "Smile",
1126+
"name": "Smile",
11271127
"vendor": "Plugwise B.V.",
11281128
"binary_sensors": {"plugwise_notification": False},
11291129
"sensors": {"outdoor_temperature": 10.8},
@@ -1180,8 +1180,8 @@ async def test_connect_anna_without_boiler_fw4(self):
11801180
"hardware": "AME Smile 2.0 board",
11811181
"location": "0f4f2ada20734a339fe353348fe87b96",
11821182
"mac_address": "012345670001",
1183-
"model": "Anna",
1184-
"name": "Anna",
1183+
"model": "Smile",
1184+
"name": "Smile",
11851185
"vendor": "Plugwise B.V.",
11861186
"binary_sensors": {"plugwise_notification": False},
11871187
"sensors": {"outdoor_temperature": 16.6},
@@ -1283,8 +1283,8 @@ async def test_connect_anna_without_boiler_fw42(self):
12831283
"hardware": "AME Smile 2.0 board",
12841284
"location": "0f4f2ada20734a339fe353348fe87b96",
12851285
"mac_address": "012345670001",
1286-
"model": "Anna",
1287-
"name": "Anna",
1286+
"model": "Smile",
1287+
"name": "Smile",
12881288
"vendor": "Plugwise B.V.",
12891289
"binary_sensors": {"plugwise_notification": False},
12901290
"sensors": {"outdoor_temperature": 3.56},
@@ -2921,8 +2921,8 @@ async def test_connect_anna_heatpump_heating(self):
29212921
"hardware": "AME Smile 2.0 board",
29222922
"location": "a57efe5f145f498c9be62a9b63626fbf",
29232923
"mac_address": "012345670001",
2924-
"model": "Anna",
2925-
"name": "Anna",
2924+
"model": "Smile",
2925+
"name": "Smile",
29262926
"vendor": "Plugwise B.V.",
29272927
"binary_sensors": {"plugwise_notification": False},
29282928
"sensors": {"outdoor_temperature": 20.2},
@@ -3141,8 +3141,8 @@ async def test_connect_anna_elga_2(self):
31413141
"hardware": "AME Smile 2.0 board",
31423142
"location": "d34dfe6ab90b410c98068e75de3eb631",
31433143
"mac_address": "C4930002FE76",
3144-
"model": "Anna",
3145-
"name": "Anna",
3144+
"model": "Smile",
3145+
"name": "Smile",
31463146
"vendor": "Plugwise B.V.",
31473147
"binary_sensors": {"plugwise_notification": False},
31483148
"sensors": {"outdoor_temperature": 13.0},
@@ -3232,8 +3232,8 @@ async def test_connect_anna_elga_2_cooling(self):
32323232
"hardware": "AME Smile 2.0 board",
32333233
"location": "d34dfe6ab90b410c98068e75de3eb631",
32343234
"mac_address": "C4930002FE76",
3235-
"model": "Anna",
3236-
"name": "Anna",
3235+
"model": "Smile",
3236+
"name": "Smile",
32373237
"vendor": "Plugwise B.V.",
32383238
"binary_sensors": {"plugwise_notification": False},
32393239
"sensors": {"outdoor_temperature": 31.0},

0 commit comments

Comments
 (0)