Skip to content

Commit 640c7f4

Browse files
bouwewbouwew
authored
Merge pull request #186 from plugwise/no_vacation_preset
Remove vacation-preset for Adam
2 parents 5aab073 + b88d75a commit 640c7f4

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

‎CHANGELOG.md‎

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

3+
# v0.18.1: Smile Adam: don't show vacation-preset, as not shown in the Plugwise App or on the local Adam-website
4+
35
# v0.18.0: Smile: add generation of cooling-schedules
46
- Further improve typing hints: e.g. all collected measurements are now typed via TypedDicts
57
- Implement correct generation of schedules for both heating and cooling (needs testing)

‎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.0"
3+
__version__ = "0.18.1"
44

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

‎plugwise/smile.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ def _device_data_climate(
144144
device_data["preset_modes"] = None
145145
device_data["active_preset"] = None
146146
if presets := self._presets(loc_id):
147-
device_data["preset_modes"] = list(presets)
147+
presets_list = list(presets)
148+
# Adam does not show vacation preset anymore, issue #185
149+
if self.smile_name == "Adam":
150+
presets_list.remove("vacation")
151+
device_data["preset_modes"] = presets_list
152+
148153
device_data["active_preset"] = self._preset(loc_id)
149154

150155
# Schedule

‎tests/test_smile.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ async def test_connect_adam_plus_anna(self):
13771377
"lower_bound": 1.0,
13781378
"upper_bound": 35.0,
13791379
"resolution": 0.01,
1380-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1380+
"preset_modes": ["home", "asleep", "away", "no_frost"],
13811381
"active_preset": "home",
13821382
"available_schedules": ["Weekschema"],
13831383
"selected_schedule": "Weekschema",
@@ -1485,7 +1485,7 @@ async def test_connect_adam_plus_anna_new(self):
14851485
"lower_bound": 1.0,
14861486
"upper_bound": 35.0,
14871487
"resolution": 0.01,
1488-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1488+
"preset_modes": ["home", "asleep", "away", "no_frost"],
14891489
"active_preset": "asleep",
14901490
"available_schedules": ["Weekschema", "Badkamer", "Test"],
14911491
"selected_schedule": "Weekschema",
@@ -1575,7 +1575,7 @@ async def test_connect_adam_plus_anna_new(self):
15751575
"lower_bound": 0.0,
15761576
"upper_bound": 99.9,
15771577
"resolution": 0.01,
1578-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1578+
"preset_modes": ["home", "asleep", "away", "no_frost"],
15791579
"active_preset": "home",
15801580
"available_schedules": ["Weekschema", "Badkamer", "Test"],
15811581
"selected_schedule": "Badkamer",
@@ -1689,7 +1689,7 @@ async def test_connect_adam_zone_per_device(self):
16891689
"lower_bound": 0.0,
16901690
"upper_bound": 99.9,
16911691
"resolution": 0.01,
1692-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1692+
"preset_modes": ["home", "asleep", "away", "no_frost"],
16931693
"active_preset": "away",
16941694
"available_schedules": [
16951695
"CV Roan",
@@ -1755,7 +1755,7 @@ async def test_connect_adam_zone_per_device(self):
17551755
"lower_bound": 0.0,
17561756
"upper_bound": 99.9,
17571757
"resolution": 0.01,
1758-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1758+
"preset_modes": ["home", "asleep", "away", "no_frost"],
17591759
"active_preset": "home",
17601760
"available_schedules": [
17611761
"CV Roan",
@@ -1925,7 +1925,7 @@ async def test_connect_adam_zone_per_device(self):
19251925
"lower_bound": 0.0,
19261926
"upper_bound": 99.9,
19271927
"resolution": 0.01,
1928-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1928+
"preset_modes": ["home", "asleep", "away", "no_frost"],
19291929
"active_preset": "asleep",
19301930
"available_schedules": [
19311931
"CV Roan",
@@ -1972,7 +1972,7 @@ async def test_connect_adam_zone_per_device(self):
19721972
"lower_bound": 0.0,
19731973
"upper_bound": 99.9,
19741974
"resolution": 0.01,
1975-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1975+
"preset_modes": ["home", "asleep", "away", "no_frost"],
19761976
"active_preset": "away",
19771977
"available_schedules": [
19781978
"CV Roan",
@@ -2015,7 +2015,7 @@ async def test_connect_adam_zone_per_device(self):
20152015
"lower_bound": 0.0,
20162016
"upper_bound": 100.0,
20172017
"resolution": 0.01,
2018-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2018+
"preset_modes": ["home", "asleep", "away", "no_frost"],
20192019
"active_preset": "no_frost",
20202020
"available_schedules": [
20212021
"CV Roan",
@@ -2109,7 +2109,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
21092109
"lower_bound": 0.0,
21102110
"upper_bound": 99.9,
21112111
"resolution": 0.01,
2112-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2112+
"preset_modes": ["home", "asleep", "away", "no_frost"],
21132113
"active_preset": "away",
21142114
"available_schedules": [
21152115
"CV Roan",
@@ -2175,7 +2175,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
21752175
"lower_bound": 0.0,
21762176
"upper_bound": 99.9,
21772177
"resolution": 0.01,
2178-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2178+
"preset_modes": ["home", "asleep", "away", "no_frost"],
21792179
"active_preset": "home",
21802180
"available_schedules": [
21812181
"CV Roan",
@@ -2345,7 +2345,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
23452345
"lower_bound": 0.0,
23462346
"upper_bound": 99.9,
23472347
"resolution": 0.01,
2348-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2348+
"preset_modes": ["home", "asleep", "away", "no_frost"],
23492349
"active_preset": "asleep",
23502350
"available_schedules": [
23512351
"CV Roan",
@@ -2392,7 +2392,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
23922392
"lower_bound": 0.0,
23932393
"upper_bound": 99.9,
23942394
"resolution": 0.01,
2395-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2395+
"preset_modes": ["home", "asleep", "away", "no_frost"],
23962396
"active_preset": "away",
23972397
"available_schedules": [
23982398
"CV Roan",
@@ -2435,7 +2435,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
24352435
"lower_bound": 0.0,
24362436
"upper_bound": 100.0,
24372437
"resolution": 0.01,
2438-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2438+
"preset_modes": ["home", "asleep", "away", "no_frost"],
24392439
"active_preset": "no_frost",
24402440
"available_schedules": [
24412441
"CV Roan",
@@ -2540,7 +2540,7 @@ async def test_adam_plus_jip(self):
25402540
"lower_bound": 0.0,
25412541
"upper_bound": 99.9,
25422542
"resolution": 0.01,
2543-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2543+
"preset_modes": ["home", "asleep", "away", "no_frost"],
25442544
"active_preset": "home",
25452545
"available_schedules": ["None"],
25462546
"selected_schedule": "None",
@@ -2562,7 +2562,7 @@ async def test_adam_plus_jip(self):
25622562
"lower_bound": 0.0,
25632563
"upper_bound": 99.9,
25642564
"resolution": 0.01,
2565-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2565+
"preset_modes": ["home", "asleep", "away", "no_frost"],
25662566
"active_preset": "no_frost",
25672567
"available_schedules": ["None"],
25682568
"selected_schedule": "None",
@@ -2603,7 +2603,7 @@ async def test_adam_plus_jip(self):
26032603
"lower_bound": 0.0,
26042604
"upper_bound": 99.9,
26052605
"resolution": 0.01,
2606-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2606+
"preset_modes": ["home", "asleep", "away", "no_frost"],
26072607
"active_preset": "home",
26082608
"available_schedules": ["None"],
26092609
"selected_schedule": "None",
@@ -2625,7 +2625,7 @@ async def test_adam_plus_jip(self):
26252625
"lower_bound": 4.0,
26262626
"upper_bound": 30.0,
26272627
"resolution": 0.01,
2628-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
2628+
"preset_modes": ["home", "asleep", "away", "no_frost"],
26292629
"active_preset": "home",
26302630
"available_schedules": ["None"],
26312631
"selected_schedule": "None",

0 commit comments

Comments
 (0)