Skip to content

Commit 6244aec

Browse files
authored
Merge pull request #863 from plugwise/emma_firmware
Add missing Emma firmware to userdata
2 parents 457a7c1 + 6df98a3 commit 6244aec

7 files changed

Lines changed: 52 additions & 10 deletions

File tree

CHANGELOG.md

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

3+
## Ongoing
4+
5+
- Add Add missing Emma firmware via PR [#863](https://github.com/plugwise/python-plugwise/pull/863)
6+
- Improve test function added in #860 via PR [#862](https://github.com/plugwise/python-plugwise/pull/862)
7+
38
## v1.11.3
49

510
- Improve handling of missing thermostat data via PR [#860](https://github.com/plugwise/python-plugwise/pull/860)

fixtures/adam_plus_anna_new/data.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"low_battery": false
4343
},
4444
"dev_class": "zone_thermostat",
45+
"firmware": "2025-11-10T01:00:00+01:00",
4546
"hardware": "1",
4647
"location": "f2bf9048bef64cc5b6d5110154e33c81",
4748
"model": "Emma Pro",

fixtures/m_adam_cooling/data.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"low_battery": false
3232
},
3333
"dev_class": "zone_thermostat",
34+
"firmware": "2025-11-10T01:00:00+01:00",
3435
"hardware": "1",
3536
"location": "f2bf9048bef64cc5b6d5110154e33c81",
3637
"model": "Emma Pro",

fixtures/m_adam_heating/data.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"low_battery": false
3737
},
3838
"dev_class": "zone_thermostat",
39+
"firmware": "2025-11-10T01:00:00+01:00",
3940
"hardware": "1",
4041
"location": "f2bf9048bef64cc5b6d5110154e33c81",
4142
"model": "Emma Pro",

tests/data/adam/adam_plus_anna_new.json

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"low_battery": false
4343
},
4444
"dev_class": "zone_thermostat",
45+
"firmware": "2025-11-10T01:00:00+01:00",
4546
"hardware": "1",
4647
"location": "f2bf9048bef64cc5b6d5110154e33c81",
4748
"model": "Emma Pro",
@@ -202,15 +203,24 @@
202203
},
203204
"dev_class": "gateway",
204205
"firmware": "3.9.0",
205-
"gateway_modes": ["away", "full", "vacation"],
206+
"gateway_modes": [
207+
"away",
208+
"full",
209+
"vacation"
210+
],
206211
"hardware": "AME Smile 2.0 board",
207212
"location": "bc93488efab249e5bc54fd7e175a6f91",
208213
"mac_address": "D40FB201CBA0",
209214
"model": "Gateway",
210215
"model_id": "smile_open_therm",
211216
"name": "Adam",
212217
"notifications": {},
213-
"regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"],
218+
"regulation_modes": [
219+
"bleeding_cold",
220+
"heating",
221+
"off",
222+
"bleeding_hot"
223+
],
214224
"select_gateway_mode": "full",
215225
"select_regulation_mode": "heating",
216226
"sensors": {
@@ -297,7 +307,13 @@
297307
"dev_class": "climate",
298308
"model": "ThermoZone",
299309
"name": "Living room",
300-
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
310+
"preset_modes": [
311+
"vacation",
312+
"no_frost",
313+
"asleep",
314+
"home",
315+
"away"
316+
],
301317
"select_schedule": "Weekschema",
302318
"select_zone_profile": "active",
303319
"sensors": {
@@ -320,7 +336,11 @@
320336
"secondary": []
321337
},
322338
"vendor": "Plugwise",
323-
"zone_profiles": ["active", "off", "passive"]
339+
"zone_profiles": [
340+
"active",
341+
"off",
342+
"passive"
343+
]
324344
},
325345
"f871b8c4d63549319221e294e4f88074": {
326346
"active_preset": "vacation",
@@ -336,7 +356,13 @@
336356
"dev_class": "climate",
337357
"model": "ThermoZone",
338358
"name": "Bathroom",
339-
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
359+
"preset_modes": [
360+
"vacation",
361+
"no_frost",
362+
"asleep",
363+
"home",
364+
"away"
365+
],
340366
"select_schedule": "off",
341367
"select_zone_profile": "passive",
342368
"sensors": {
@@ -351,10 +377,18 @@
351377
"upper_bound": 99.9
352378
},
353379
"thermostats": {
354-
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
355-
"secondary": ["1772a4ea304041adb83f357b751341ff"]
380+
"primary": [
381+
"e2f4322d57924fa090fbbc48b3a140dc"
382+
],
383+
"secondary": [
384+
"1772a4ea304041adb83f357b751341ff"
385+
]
356386
},
357387
"vendor": "Plugwise",
358-
"zone_profiles": ["active", "off", "passive"]
388+
"zone_profiles": [
389+
"active",
390+
"off",
391+
"passive"
392+
]
359393
}
360394
}

tests/test_adam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async def test_connect_adam_plus_anna_new(self):
4747

4848
test_items = await self.device_test(api, "2025-10-12 00:00:01", testdata)
4949
assert api.gateway_id == "da224107914542988a88561b4452b0f6"
50-
assert self.entity_items == 230
50+
assert self.entity_items == 231
5151
assert test_items == self.entity_items
5252
assert self.entity_list == [
5353
"da224107914542988a88561b4452b0f6",

userdata/adam_plus_anna_new/core.domain_objects.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
<vendor_name>Plugwise</vendor_name>
403403
<vendor_model>170-01</vendor_model>
404404
<hardware_version>1</hardware_version>
405-
<firmware_version></firmware_version>
405+
<firmware_version>2025-11-10T01:00:00+01:00</firmware_version>
406406
<upgrade/>
407407
<created_date>2025-10-11T10:08:20.450+02:00</created_date>
408408
<modified_date>2025-10-11T10:38:56.730+02:00</modified_date>

0 commit comments

Comments
 (0)