Skip to content

Commit 391195f

Browse files
bouwewbouwew
authored
Merge pull request #482 from plugwise/update_bouwew_data
Refresh adam_plus_anna_new userdata
2 parents 5d0ad33 + 9f82bb9 commit 391195f

File tree

16 files changed

+5111
-4739
lines changed

16 files changed

+5111
-4739
lines changed

‎CHANGELOG.md‎

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

3+
## Ongoing
4+
5+
- Refresh adam_plus_anna_new userdata and adapt.
6+
37
## v0.35.4
48

59
- Remove support for Adam with fw 2.x and Anna with fw 3.x

‎fixtures/adam_plus_anna_new/all_data.json‎

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
"available": true,
55
"binary_sensors": {
66
"dhw_state": false,
7-
"flame_state": false,
7+
"flame_state": true,
88
"heating_state": true
99
},
1010
"dev_class": "heater_central",
1111
"location": "bc93488efab249e5bc54fd7e175a6f91",
1212
"maximum_boiler_temperature": {
1313
"lower_bound": 25.0,
1414
"resolution": 0.01,
15-
"setpoint": 60.0,
15+
"setpoint": 50.0,
1616
"upper_bound": 95.0
1717
},
1818
"model": "Generic heater",
1919
"name": "OpenTherm",
2020
"sensors": {
21-
"intended_boiler_temperature": 38.1,
22-
"water_temperature": 37.0
21+
"intended_boiler_temperature": 20.0,
22+
"water_temperature": 29.0
2323
},
2424
"switches": {
2525
"dhw_cm_switch": false
@@ -35,10 +35,10 @@
3535
"name": "Tom Badkamer",
3636
"sensors": {
3737
"battery": 99,
38-
"setpoint": 15.0,
39-
"temperature": 21.6,
40-
"temperature_difference": 2.3,
41-
"valve_position": 0.0
38+
"setpoint": 18.0,
39+
"temperature": 17.6,
40+
"temperature_difference": -0.2,
41+
"valve_position": 100
4242
},
4343
"temperature_offset": {
4444
"lower_bound": -2.0,
@@ -47,18 +47,18 @@
4747
"upper_bound": 2.0
4848
},
4949
"vendor": "Plugwise",
50-
"zigbee_mac_address": "ABCD012345670A01"
50+
"zigbee_mac_address": "000D6F000C8FF5EE"
5151
},
5252
"2568cc4b9c1e401495d4741a5f89bee1": {
5353
"available": true,
54-
"dev_class": "computer_desktop",
54+
"dev_class": "hometheater",
5555
"firmware": "2020-11-10T01:00:00+01:00",
5656
"location": "f2bf9048bef64cc5b6d5110154e33c81",
5757
"model": "Plug",
58-
"name": "Plug Werkplek",
58+
"name": "Plug MediaTV",
5959
"sensors": {
60-
"electricity_consumed": 98.0,
61-
"electricity_consumed_interval": 24.0,
60+
"electricity_consumed": 14.8,
61+
"electricity_consumed_interval": 3.0,
6262
"electricity_produced": 0.0,
6363
"electricity_produced_interval": 0.0
6464
},
@@ -67,18 +67,18 @@
6767
"relay": true
6868
},
6969
"vendor": "Plugwise",
70-
"zigbee_mac_address": "ABCD012345670A03"
70+
"zigbee_mac_address": "000D6F000D13CCFD"
7171
},
7272
"29542b2b6a6a4169acecc15c72a599b8": {
7373
"available": true,
74-
"dev_class": "hometheater",
74+
"dev_class": "computer_desktop",
7575
"firmware": "2020-11-10T01:00:00+01:00",
7676
"location": "f2bf9048bef64cc5b6d5110154e33c81",
7777
"model": "Plug",
78-
"name": "Plug Mediacenter",
78+
"name": "Plug Werkplek",
7979
"sensors": {
80-
"electricity_consumed": 12.2,
81-
"electricity_consumed_interval": 3.0,
80+
"electricity_consumed": 87.6,
81+
"electricity_consumed_interval": 23.0,
8282
"electricity_produced": 0.0,
8383
"electricity_produced_interval": 0.0
8484
},
@@ -87,7 +87,7 @@
8787
"relay": true
8888
},
8989
"vendor": "Plugwise",
90-
"zigbee_mac_address": "ABCD012345670A02"
90+
"zigbee_mac_address": "000D6F000D13CA9A"
9191
},
9292
"67d73d0bd469422db25a618a5fb8eeb0": {
9393
"available": true,
@@ -113,7 +113,7 @@
113113
"model": "Plug",
114114
"name": "Plug Vloerverwarming",
115115
"sensors": {
116-
"electricity_consumed": 46.8,
116+
"electricity_consumed": 43.8,
117117
"electricity_consumed_interval": 0.0,
118118
"electricity_produced": 0.0,
119119
"electricity_produced_interval": 0.0
@@ -122,22 +122,28 @@
122122
"relay": true
123123
},
124124
"vendor": "Plugwise",
125-
"zigbee_mac_address": "ABCD012345670A05"
125+
"zigbee_mac_address": "000D6F000D13CB6F"
126126
},
127127
"ad4838d7d35c4d6ea796ee12ae5aedf8": {
128-
"active_preset": "asleep",
129-
"available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
128+
"active_preset": "home",
129+
"available_schedules": [
130+
"Badkamer",
131+
"Test",
132+
"Vakantie",
133+
"Weekschema",
134+
"off"
135+
],
130136
"control_state": "heating",
131137
"dev_class": "thermostat",
132138
"location": "f2bf9048bef64cc5b6d5110154e33c81",
133139
"mode": "auto",
134140
"model": "ThermoTouch",
135141
"name": "Anna",
136-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
142+
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
137143
"select_schedule": "Weekschema",
138144
"sensors": {
139145
"setpoint": 18.5,
140-
"temperature": 18.1
146+
"temperature": 18.4
141147
},
142148
"thermostat": {
143149
"lower_bound": 1.0,
@@ -152,38 +158,44 @@
152158
"plugwise_notification": false
153159
},
154160
"dev_class": "gateway",
155-
"firmware": "3.6.4",
161+
"firmware": "3.7.8",
156162
"hardware": "AME Smile 2.0 board",
157163
"location": "bc93488efab249e5bc54fd7e175a6f91",
158-
"mac_address": "012345670001",
164+
"mac_address": "012345679891",
159165
"model": "Gateway",
160166
"name": "Adam",
161-
"regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
167+
"regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
162168
"select_regulation_mode": "heating",
163169
"sensors": {
164-
"outdoor_temperature": -1.25
170+
"outdoor_temperature": 9.19
165171
},
166172
"vendor": "Plugwise",
167-
"zigbee_mac_address": "ABCD012345670101"
173+
"zigbee_mac_address": "000D6F000D5A168D"
168174
},
169175
"e2f4322d57924fa090fbbc48b3a140dc": {
170176
"active_preset": "home",
171177
"available": true,
172-
"available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
173-
"control_state": "off",
178+
"available_schedules": [
179+
"Badkamer",
180+
"Test",
181+
"Vakantie",
182+
"Weekschema",
183+
"off"
184+
],
185+
"control_state": "preheating",
174186
"dev_class": "zone_thermostat",
175187
"firmware": "2016-10-10T02:00:00+02:00",
176188
"hardware": "255",
177189
"location": "f871b8c4d63549319221e294e4f88074",
178190
"mode": "auto",
179191
"model": "Lisa",
180192
"name": "Lisa Badkamer",
181-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
193+
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
182194
"select_schedule": "Badkamer",
183195
"sensors": {
184-
"battery": 56,
185-
"setpoint": 15.0,
186-
"temperature": 17.9
196+
"battery": 38,
197+
"setpoint": 18.0,
198+
"temperature": 16.5
187199
},
188200
"temperature_offset": {
189201
"lower_bound": -2.0,
@@ -194,11 +206,11 @@
194206
"thermostat": {
195207
"lower_bound": 0.0,
196208
"resolution": 0.01,
197-
"setpoint": 15.0,
209+
"setpoint": 18.0,
198210
"upper_bound": 99.9
199211
},
200212
"vendor": "Plugwise",
201-
"zigbee_mac_address": "ABCD012345670A04"
213+
"zigbee_mac_address": "000D6F000C869B61"
202214
},
203215
"e8ef2a01ed3b4139a53bf749204fe6b4": {
204216
"dev_class": "switching",

‎fixtures/adam_plus_anna_new/device_list.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"da224107914542988a88561b4452b0f6",
33
"056ee145a816487eaa69243c3280f8bf",
44
"67d73d0bd469422db25a618a5fb8eeb0",
5+
"e2f4322d57924fa090fbbc48b3a140dc",
6+
"854f8a9b0e7e425db97f1f110e1ce4b3",
57
"ad4838d7d35c4d6ea796ee12ae5aedf8",
68
"29542b2b6a6a4169acecc15c72a599b8",
7-
"2568cc4b9c1e401495d4741a5f89bee1",
8-
"854f8a9b0e7e425db97f1f110e1ce4b3",
99
"1772a4ea304041adb83f357b751341ff",
10-
"e2f4322d57924fa090fbbc48b3a140dc",
10+
"2568cc4b9c1e401495d4741a5f89bee1",
1111
"e8ef2a01ed3b4139a53bf749204fe6b4"
1212
]

‎fixtures/m_adam_cooling/all_data.json‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"binary_sensors": {
66
"cooling_state": true,
77
"dhw_state": false,
8-
"flame_state": false,
8+
"flame_state": true,
99
"heating_state": false
1010
},
1111
"dev_class": "heater_central",
1212
"location": "bc93488efab249e5bc54fd7e175a6f91",
1313
"maximum_boiler_temperature": {
1414
"lower_bound": 25.0,
1515
"resolution": 0.01,
16-
"setpoint": 60.0,
16+
"setpoint": 50.0,
1717
"upper_bound": 95.0
1818
},
1919
"model": "Generic heater",
@@ -37,8 +37,8 @@
3737
"sensors": {
3838
"battery": 99,
3939
"temperature": 21.6,
40-
"temperature_difference": 2.3,
41-
"valve_position": 0.0
40+
"temperature_difference": -0.2,
41+
"valve_position": 100
4242
},
4343
"temperature_offset": {
4444
"lower_bound": -2.0,
@@ -47,19 +47,25 @@
4747
"upper_bound": 2.0
4848
},
4949
"vendor": "Plugwise",
50-
"zigbee_mac_address": "ABCD012345670A01"
50+
"zigbee_mac_address": "000D6F000C8FF5EE"
5151
},
5252
"ad4838d7d35c4d6ea796ee12ae5aedf8": {
53-
"active_preset": "asleep",
53+
"active_preset": "home",
5454
"available": true,
55-
"available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
55+
"available_schedules": [
56+
"Badkamer",
57+
"Test",
58+
"Vakantie",
59+
"Weekschema",
60+
"off"
61+
],
5662
"control_state": "cooling",
5763
"dev_class": "thermostat",
5864
"location": "f2bf9048bef64cc5b6d5110154e33c81",
5965
"mode": "cool",
6066
"model": "ThermoTouch",
6167
"name": "Anna",
62-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
68+
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
6369
"select_schedule": "Weekschema",
6470
"selected_schedule": "None",
6571
"sensors": {
@@ -79,42 +85,48 @@
7985
"plugwise_notification": false
8086
},
8187
"dev_class": "gateway",
82-
"firmware": "3.6.4",
88+
"firmware": "3.7.8",
8389
"hardware": "AME Smile 2.0 board",
8490
"location": "bc93488efab249e5bc54fd7e175a6f91",
85-
"mac_address": "012345670001",
91+
"mac_address": "012345679891",
8692
"model": "Gateway",
8793
"name": "Adam",
8894
"regulation_modes": [
89-
"heating",
90-
"off",
91-
"bleeding_cold",
9295
"bleeding_hot",
96+
"bleeding_cold",
97+
"off",
98+
"heating",
9399
"cooling"
94100
],
95101
"select_regulation_mode": "cooling",
96102
"sensors": {
97103
"outdoor_temperature": 29.65
98104
},
99105
"vendor": "Plugwise",
100-
"zigbee_mac_address": "ABCD012345670101"
106+
"zigbee_mac_address": "000D6F000D5A168D"
101107
},
102108
"e2f4322d57924fa090fbbc48b3a140dc": {
103109
"active_preset": "home",
104110
"available": true,
105-
"available_schedules": ["Weekschema", "Badkamer", "Test", "off"],
106-
"control_state": "off",
111+
"available_schedules": [
112+
"Badkamer",
113+
"Test",
114+
"Vakantie",
115+
"Weekschema",
116+
"off"
117+
],
118+
"control_state": "preheating",
107119
"dev_class": "zone_thermostat",
108120
"firmware": "2016-10-10T02:00:00+02:00",
109121
"hardware": "255",
110122
"location": "f871b8c4d63549319221e294e4f88074",
111123
"mode": "auto",
112124
"model": "Lisa",
113125
"name": "Lisa Badkamer",
114-
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
126+
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
115127
"select_schedule": "Badkamer",
116128
"sensors": {
117-
"battery": 56,
129+
"battery": 38,
118130
"setpoint": 23.5,
119131
"temperature": 23.9
120132
},
@@ -131,7 +143,7 @@
131143
"upper_bound": 99.9
132144
},
133145
"vendor": "Plugwise",
134-
"zigbee_mac_address": "ABCD012345670A04"
146+
"zigbee_mac_address": "000D6F000C869B61"
135147
},
136148
"e8ef2a01ed3b4139a53bf749204fe6b4": {
137149
"dev_class": "switching",

‎fixtures/m_adam_cooling/device_list.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[
22
"da224107914542988a88561b4452b0f6",
33
"056ee145a816487eaa69243c3280f8bf",
4+
"e2f4322d57924fa090fbbc48b3a140dc",
45
"ad4838d7d35c4d6ea796ee12ae5aedf8",
56
"1772a4ea304041adb83f357b751341ff",
6-
"e2f4322d57924fa090fbbc48b3a140dc",
77
"e8ef2a01ed3b4139a53bf749204fe6b4"
88
]

0 commit comments

Comments
 (0)