Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Ongoing

- Add Add missing Emma firmware via PR [#863](https://github.com/plugwise/python-plugwise/pull/863)
- Improve test function added in #860 via PR [#862](https://github.com/plugwise/python-plugwise/pull/862)

## v1.11.3

- Improve handling of missing thermostat data via PR [#860](https://github.com/plugwise/python-plugwise/pull/860)
Expand Down
1 change: 1 addition & 0 deletions fixtures/adam_plus_anna_new/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"low_battery": false
},
"dev_class": "zone_thermostat",
"firmware": "2025-11-10T01:00:00+01:00",
"hardware": "1",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"model": "Emma Pro",
Expand Down
1 change: 1 addition & 0 deletions fixtures/m_adam_cooling/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"low_battery": false
},
"dev_class": "zone_thermostat",
"firmware": "2025-11-10T01:00:00+01:00",
"hardware": "1",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"model": "Emma Pro",
Expand Down
1 change: 1 addition & 0 deletions fixtures/m_adam_heating/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"low_battery": false
},
"dev_class": "zone_thermostat",
"firmware": "2025-11-10T01:00:00+01:00",
"hardware": "1",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"model": "Emma Pro",
Expand Down
50 changes: 42 additions & 8 deletions tests/data/adam/adam_plus_anna_new.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"low_battery": false
},
"dev_class": "zone_thermostat",
"firmware": "2025-11-10T01:00:00+01:00",
"hardware": "1",
"location": "f2bf9048bef64cc5b6d5110154e33c81",
"model": "Emma Pro",
Expand Down Expand Up @@ -202,15 +203,24 @@
},
"dev_class": "gateway",
"firmware": "3.9.0",
"gateway_modes": ["away", "full", "vacation"],
"gateway_modes": [
"away",
"full",
"vacation"
],
"hardware": "AME Smile 2.0 board",
"location": "bc93488efab249e5bc54fd7e175a6f91",
"mac_address": "D40FB201CBA0",
"model": "Gateway",
"model_id": "smile_open_therm",
"name": "Adam",
"notifications": {},
"regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"],
"regulation_modes": [
"bleeding_cold",
"heating",
"off",
"bleeding_hot"
],
"select_gateway_mode": "full",
"select_regulation_mode": "heating",
"sensors": {
Expand Down Expand Up @@ -297,7 +307,13 @@
"dev_class": "climate",
"model": "ThermoZone",
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"preset_modes": [
"vacation",
"no_frost",
"asleep",
"home",
"away"
],
"select_schedule": "Weekschema",
"select_zone_profile": "active",
"sensors": {
Expand All @@ -320,7 +336,11 @@
"secondary": []
},
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
"zone_profiles": [
"active",
"off",
"passive"
]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -336,7 +356,13 @@
"dev_class": "climate",
"model": "ThermoZone",
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"preset_modes": [
"vacation",
"no_frost",
"asleep",
"home",
"away"
],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
Expand All @@ -351,10 +377,18 @@
"upper_bound": 99.9
},
"thermostats": {
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
"primary": [
"e2f4322d57924fa090fbbc48b3a140dc"
],
"secondary": [
"1772a4ea304041adb83f357b751341ff"
]
},
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
"zone_profiles": [
"active",
"off",
"passive"
]
}
}
2 changes: 1 addition & 1 deletion tests/test_adam.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async def test_connect_adam_plus_anna_new(self):

test_items = await self.device_test(api, "2025-10-12 00:00:01", testdata)
assert api.gateway_id == "da224107914542988a88561b4452b0f6"
assert self.entity_items == 230
assert self.entity_items == 231
assert test_items == self.entity_items
assert self.entity_list == [
"da224107914542988a88561b4452b0f6",
Expand Down
2 changes: 1 addition & 1 deletion userdata/adam_plus_anna_new/core.domain_objects.xml
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
<vendor_name>Plugwise</vendor_name>
<vendor_model>170-01</vendor_model>
<hardware_version>1</hardware_version>
<firmware_version></firmware_version>
<firmware_version>2025-11-10T01:00:00+01:00</firmware_version>
<upgrade/>
<created_date>2025-10-11T10:08:20.450+02:00</created_date>
<modified_date>2025-10-11T10:38:56.730+02:00</modified_date>
Expand Down
Loading