Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0039eb8
Add regulation_control to collect
bouwew Nov 8, 2025
d1f2523
Change
bouwew Nov 8, 2025
8f4b3cf
Let float_measure() handle string-type
bouwew Nov 8, 2025
c2b2bd7
Move control_state collection
bouwew Nov 8, 2025
46bb0c8
Adapt _control_state()
bouwew Nov 8, 2025
96690dc
Clean up
bouwew Nov 8, 2025
f63daf9
Add regulation_control items to data
bouwew Nov 8, 2025
8bd0955
Correct entity_items assert
bouwew Nov 8, 2025
ec7fd90
Handle None-cases
bouwew Nov 8, 2025
bfcfe74
Correct item_count
bouwew Nov 8, 2025
7f42767
Sort
bouwew Nov 8, 2025
2c2e016
Correct entity_items asserts
bouwew Nov 8, 2025
ae37d61
Save updated fixtures
bouwew Nov 8, 2025
73f4d56
Ruff fixes
bouwew Nov 8, 2025
c438526
Amend typing
bouwew Nov 8, 2025
8c32844
Revert format_measure() update, move try-except to helper.py
bouwew Nov 8, 2025
f2b9976
Force str(control_state)
bouwew Nov 8, 2025
83e5c57
Save updated manual fixtures
bouwew Nov 8, 2025
31067c8
Improve datakey names
bouwew Nov 8, 2025
6f5b3a1
Save updated fixtures
bouwew Nov 8, 2025
a122134
Update typing
bouwew Nov 8, 2025
9307515
Save updated manual fixtures
bouwew Nov 8, 2025
95e9b87
Update related adam-test-jsons
bouwew Nov 8, 2025
2d7befc
Fix entity_items assert
bouwew Nov 8, 2025
2e18285
Fix missing test-updates after rebase
bouwew Nov 8, 2025
f983a9b
Fix 2nd entity_items assert
bouwew Nov 8, 2025
0ee8fd6
Save fixture updates
bouwew Nov 8, 2025
5dc9adc
Rename constant for widened scope
bouwew Nov 8, 2025
6fe72a8
Start adding set-function
bouwew Nov 8, 2025
cbbdeda
Set uri and call method
bouwew Nov 9, 2025
a7ec36a
Constant allowed zone profiles
bouwew Nov 9, 2025
d63a898
Add tinker_zone_profile()
bouwew Nov 9, 2025
6b382aa
Replace constant in legacy path
bouwew Nov 9, 2025
a8d92e4
Add missing loc_id arg
bouwew Nov 9, 2025
8543102
Fix constant format
bouwew Nov 9, 2025
48784bb
Add zone_profile tests
bouwew Nov 9, 2025
bec4deb
Add missing loc_id arg
bouwew Nov 9, 2025
b07a6b7
Add POST router routes for locations
bouwew Nov 9, 2025
e695f9a
Add f-string marker
bouwew Nov 9, 2025
5e6eb36
Add unhappy-zone_profile test
bouwew Nov 9, 2025
5fd3d42
Fix time_out route
bouwew Nov 9, 2025
1e4d62d
Update CHANGELOG
bouwew Nov 9, 2025
83de0fe
Improve CHANGELOG
bouwew Nov 9, 2025
8f6669f
Improve doc-string
bouwew Nov 9, 2025
8637b54
Change constant definition for multi-use
bouwew Nov 9, 2025
405124f
Add comment for _count increment
bouwew Nov 9, 2025
e25fe7f
Fix lint issue
bouwew Nov 9, 2025
d9af1be
Bump to v1.10.0a0 test-version
bouwew Nov 9, 2025
cc6aa9f
Set to v1.10.0 release version
bouwew Nov 9, 2025
cd30b1f
Update CHANGELOG
bouwew Nov 9, 2025
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: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changelog

## Ongoing
## v1.10.0

- Improve testing: compare internal and code testcounters, line up fixture and test-json format, fix a missed count.
- New feature: implement setting Adam zone profile via PR [#814](https://github.com/plugwise/python-plugwise/pull/814)
- Improve testing: compare internal and code testcounters, line up fixture and test-json format, fix a missed count via PR [#815](https://github.com/plugwise/python-plugwise/pull/815)

## v1.9.0

Expand Down
40 changes: 30 additions & 10 deletions fixtures/adam_heatpump_cooling/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"name": "Slaapkamer SJ",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -29,7 +30,8 @@
"primary": ["d3a276aeb3114a509bab1e4bf8c40348"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"0ca13e8176204ca7bf6f09de59f81c83": {
"available": true,
Expand Down Expand Up @@ -132,6 +134,7 @@
"name": "Slaapkamer DB",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -147,7 +150,8 @@
"primary": ["47e2c550a33846b680725aa3fb229473"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"2e0fc4db2a6d4cbeb7cf786143543961": {
"available": true,
Expand Down Expand Up @@ -246,6 +250,7 @@
"name": "Badkamer 2",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "Werkdag schema",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"temperature": 21.9
Expand All @@ -260,7 +265,8 @@
"primary": ["f04c985c11ad4848b8fcd710343f9dcf"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"5ead63c65e5f44e7870ba2bd680ceb9e": {
"available": true,
Expand Down Expand Up @@ -388,6 +394,7 @@
"name": "Badkamer 1",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "Werkdag schema",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -403,7 +410,8 @@
"primary": ["eac5db95d97241f6b17790897847ccf5"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"93ac3f7bf25342f58cbb77c4a99ac0b3": {
"active_preset": "away",
Expand All @@ -420,6 +428,7 @@
"name": "Slaapkamer RB",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 3.13,
"temperature": 20.7
Expand All @@ -434,7 +443,8 @@
"primary": ["c4ed311d54e341f58b4cdd201d1fde7e"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"96714ad90fc948bcbcb5021c4b9f5ae9": {
"available": true,
Expand Down Expand Up @@ -471,6 +481,7 @@
"name": "Slaapkamer SQ",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -486,7 +497,8 @@
"primary": ["beb32da072274e698146db8b022f3c36"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"a03b6e8e76dd4646af1a77c31dd9370c": {
"available": true,
Expand Down Expand Up @@ -523,6 +535,7 @@
"name": "Keuken",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "Werkdag schema",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 2.13,
"electricity_produced": 0.0,
Expand All @@ -538,7 +551,8 @@
"primary": ["ea8372c0e3ad4622ad45a041d02425f5"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"b52908550469425b812c87f766fe5303": {
"active_preset": "away",
Expand All @@ -555,6 +569,7 @@
"name": "Bijkeuken",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -570,7 +585,8 @@
"primary": ["1053c8bbf8be43c6921742b146a625f1"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"bbcffa48019f4b09b8368bbaf9559e68": {
"available": true,
Expand Down Expand Up @@ -685,6 +701,7 @@
"name": "Slaapkamer JM",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -700,7 +717,8 @@
"primary": ["7fda9f84f01342f8afe9ebbbbff30c0f"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"ea8372c0e3ad4622ad45a041d02425f5": {
"available": true,
Expand Down Expand Up @@ -787,6 +805,7 @@
"name": "Woonkamer",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "Werkdag schema",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -802,6 +821,7 @@
"primary": ["ca79d23ae0094120b877558734cff85c"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
16 changes: 12 additions & 4 deletions fixtures/adam_jip/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"name": "Slaapkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 24.2
},
Expand All @@ -22,7 +23,8 @@
"primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
"secondary": ["356b65335e274d769c338223e7af9c33"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"13228dab8ce04617af318a2888b3c548": {
"active_preset": "home",
Expand All @@ -34,6 +36,7 @@
"name": "Woonkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 27.4
},
Expand All @@ -47,7 +50,8 @@
"primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
"secondary": ["833de10f269c4deab58fb9df69901b4e"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"1346fbd8498d4dbcab7e18d51b771f3d": {
"available": true,
Expand Down Expand Up @@ -249,6 +253,7 @@
"name": "Kinderkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 30.0
},
Expand All @@ -262,7 +267,8 @@
"primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
"secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"d4496250d0e942cfa7aea3476e9070d5": {
"available": true,
Expand Down Expand Up @@ -298,6 +304,7 @@
"name": "Logeerkamer",
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
"select_schedule": null,
"select_zone_profile": "active",
"sensors": {
"temperature": 30.0
},
Expand All @@ -311,7 +318,8 @@
"primary": ["a6abc6a129ee499c88a4d420cc413b47"],
"secondary": ["1da4d325838e4ad8aac12177214505c9"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"e4684553153b44afbef2200885f379dc": {
"available": true,
Expand Down
4 changes: 3 additions & 1 deletion fixtures/adam_onoff_cooling_fake_firmware/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
"name": "Woonkamer",
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
"select_schedule": "Werkdag schema",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -107,6 +108,7 @@
"primary": ["ca79d23ae0094120b877558734cff85c"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
8 changes: 6 additions & 2 deletions fixtures/adam_plus_anna_new/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "Weekschema",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 60.8,
"electricity_produced": 0.0,
Expand All @@ -299,7 +300,8 @@
],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -317,6 +319,7 @@
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -332,6 +335,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
8 changes: 6 additions & 2 deletions fixtures/adam_plus_anna_new_regulation_off/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"name": "Living room",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 149.9,
"electricity_produced": 0.0,
Expand All @@ -248,7 +249,8 @@
"primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "home",
Expand All @@ -266,6 +268,7 @@
"name": "Bathroom",
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -281,6 +284,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
8 changes: 6 additions & 2 deletions fixtures/m_adam_cooling/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
"name": "Living room",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "active",
"sensors": {
"electricity_consumed": 60.8,
"electricity_produced": 0.0,
Expand All @@ -215,7 +216,8 @@
],
"secondary": []
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
},
"f871b8c4d63549319221e294e4f88074": {
"active_preset": "vacation",
Expand All @@ -233,6 +235,7 @@
"name": "Bathroom",
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
"select_schedule": "off",
"select_zone_profile": "passive",
"sensors": {
"electricity_consumed": 0.0,
"electricity_produced": 0.0,
Expand All @@ -248,6 +251,7 @@
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
"secondary": ["1772a4ea304041adb83f357b751341ff"]
},
"vendor": "Plugwise"
"vendor": "Plugwise",
"zone_profiles": ["active", "off", "passive"]
}
}
Loading
Loading