Skip to content

Refresh Anna Elga 2 main userdata#679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bouwew merged 10 commits into from
Dec 31, 2024
Merged

Refresh Anna Elga 2 main userdata #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9d48dc6
Update anna_elga_2 userdata with added inactive control_state
bouwew Dec 31, 2024
50a2f3c
Add missed device-item-count
bouwew Dec 31, 2024
3784798
Perform a single find-action
bouwew Dec 31, 2024
c13ae98
Update anna-device-item asserts
bouwew Dec 31, 2024
a3bdf95
Save updated fixtures
bouwew Dec 31, 2024
eb255d0
Refresh anna+elga2 userdata
bouwew Dec 31, 2024
fc8f0a9
Refresh all anna_elga_2 related
bouwew Dec 31, 2024
e743f5a
Line up json-headers
bouwew Dec 31, 2024
2775347
Revert updating older xml-files
bouwew Dec 31, 2024
029cf54
Update CHANGELOG
bouwew Dec 31, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
## Ongoing

- Continuous improvements [#678](https://github.com/plugwise/python-plugwise/pull/678)
- Refresh Anna_Elga_2 userdata and adapt, add missing item-count, line-up test-data headers [#679](https://github.com/plugwise/python-plugwise/pull/679)

## v1.6.4

Expand Down
40 changes: 17 additions & 23 deletions fixtures/anna_elga_2/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,43 +3,37 @@
"573c152e7d4f4720878222bd75638f5b": {
"available": true,
"binary_sensors": {
"compressor_state": false,
"compressor_state": true,
"cooling_enabled": false,
"cooling_state": false,
"dhw_state": false,
"flame_state": false,
"heating_state": false,
"secondary_boiler_state": false
"flame_state": true,
"heating_state": true,
"secondary_boiler_state": true
},
"dev_class": "heater_central",
"location": "d34dfe6ab90b410c98068e75de3eb631",
"maximum_boiler_temperature": {
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"model": "Generic heater/cooler",
"name": "OpenTherm",
"sensors": {
"domestic_hot_water_setpoint": 60.0,
"intended_boiler_temperature": 0.0,
"modulation_level": 0.0,
"outdoor_air_temperature": 14.0,
"return_temperature": 23.4,
"intended_boiler_temperature": 58.3,
"modulation_level": 55,
"outdoor_air_temperature": 6.0,
"return_temperature": 35.5,
"water_pressure": 0.5,
"water_temperature": 22.8
"water_temperature": 42.6
},
"switches": {
"dhw_cm_switch": true
"dhw_cm_switch": false
},
"vendor": "Techneco"
},
"ebd90df1ab334565b5895f37590ccff4": {
"active_preset": "home",
"available_schedules": ["Thermostat schedule", "off"],
"climate_mode": "auto",
"control_state": "idle",
"control_state": "heating",
"dev_class": "thermostat",
"firmware": "2018-02-08T11:15:53+01:00",
"hardware": "6539-1301-5002",
Expand All@@ -49,12 +43,12 @@
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
"select_schedule": "Thermostat schedule",
"sensors": {
"cooling_activation_outdoor_temperature": 26.0,
"cooling_deactivation_threshold": 3.0,
"cooling_activation_outdoor_temperature": 24.0,
"cooling_deactivation_threshold": 2.0,
"illuminance": 0.5,
"setpoint_high": 30.0,
"setpoint_low": 19.5,
"temperature": 20.9
"temperature": 19.2
},
"temperature_offset": {
"lower_bound": -2.0,
Expand All@@ -76,15 +70,15 @@
"plugwise_notification": false
},
"dev_class": "gateway",
"firmware": "4.2.1",
"firmware": "4.4.1",
"hardware": "AME Smile 2.0 board",
"location": "d34dfe6ab90b410c98068e75de3eb631",
"mac_address": "C4930002FE76",
"model": "Gateway",
"model_id": "smile_thermo",
"name": "Smile Anna",
"sensors": {
"outdoor_temperature": 13.0
"outdoor_temperature": 6.38
},
"vendor": "Plugwise"
}
Expand All@@ -93,7 +87,7 @@
"cooling_present": true,
"gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
"heater_id": "573c152e7d4f4720878222bd75638f5b",
"item_count": 63,
"item_count": 60,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_elga_2_cooling/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
"cooling_present": true,
"gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
"heater_id": "573c152e7d4f4720878222bd75638f5b",
"item_count": 63,
"item_count": 64,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_elga_2_schedule_off/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
"cooling_present": true,
"gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
"heater_id": "573c152e7d4f4720878222bd75638f5b",
"item_count": 63,
"item_count": 64,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_elga_no_cooling/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,7 @@
"cooling_present": false,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 63,
"item_count": 64,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_heatpump_cooling/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 64,
"item_count": 65,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_heatpump_cooling_fake_firmware/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 64,
"item_count": 65,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_heatpump_heating/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 67,
"item_count": 68,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_loria_cooling_active/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@
"cooling_present": true,
"gateway_id": "9ff0569b4984459fb243af64c0901894",
"heater_id": "bfb5ee0a88e14e5f97bfa725a760cc49",
"item_count": 66,
"item_count": 67,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_loria_driessens/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@
"cooling_present": true,
"gateway_id": "5c118b1842e943c0a5b6ef88a60bb17a",
"heater_id": "a449cbc334ae4a5bb7f89064984b2906",
"item_count": 66,
"item_count": 67,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_loria_heating_idle/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@
"cooling_present": true,
"gateway_id": "9ff0569b4984459fb243af64c0901894",
"heater_id": "bfb5ee0a88e14e5f97bfa725a760cc49",
"item_count": 66,
"item_count": 67,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_v4/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@
"cooling_present": false,
"gateway_id": "0466eae8520144c78afb29628384edeb",
"heater_id": "cd0e6156b1f04d5f952349ffbe397481",
"item_count": 58,
"item_count": 59,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_v4_dhw/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@
"cooling_present": false,
"gateway_id": "0466eae8520144c78afb29628384edeb",
"heater_id": "cd0e6156b1f04d5f952349ffbe397481",
"item_count": 58,
"item_count": 59,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_v4_no_tag/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@
"cooling_present": false,
"gateway_id": "0466eae8520144c78afb29628384edeb",
"heater_id": "cd0e6156b1f04d5f952349ffbe397481",
"item_count": 58,
"item_count": 59,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/anna_without_boiler_fw441/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
"cooling_present": false,
"gateway_id": "a270735e4ccd45239424badc0578a2b1",
"heater_id": "c46b4794d28149699eacf053deedd003",
"item_count": 39,
"item_count": 40,
Comment thread
bouwew marked this conversation as resolved.
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/m_anna_heatpump_cooling/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 67,
"item_count": 68,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/m_anna_heatpump_idle/all_data.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,7 @@
"cooling_present": true,
"gateway_id": "015ae9ea3f964e668e490fa39da3870b",
"heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
"item_count": 67,
"item_count": 68,
"notifications": {},
"reboot": true,
"smile_name": "Smile Anna"
Expand Down
1 change: 1 addition & 0 deletions plugwise/data.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,7 @@ def check_reg_mode(self, mode: str) -> bool:
def _get_anna_control_state(self, data: GwEntityData) -> None:
"""Set the thermostat control_state based on the opentherm/onoff device state."""
data["control_state"] = "idle"
self._count += 1
for entity in self.gw_entities.values():
if entity["dev_class"] != "heater_central":
continue
Expand Down
8 changes: 3 additions & 5 deletions plugwise/helper.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -968,11 +968,9 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
Represents the heating/cooling demand-state of the local primary thermostat.
Note: heating or cooling can still be active when the setpoint has been reached.
"""
locator = f'location[@id="{loc_id}"]'
if (location := self._domain_objects.find(locator)) is not None:
locator = './actuator_functionalities/thermostat_functionality[type="thermostat"]/control_state'
if (ctrl_state := location.find(locator)) is not None:
return str(ctrl_state.text)
locator = f'location[@id="{loc_id}"]/actuator_functionalities/thermostat_functionality[type="thermostat"]/control_state'
if (ctrl_state := self._domain_objects.find(locator)) is not None:
return str(ctrl_state.text)

# Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
# In newer firmware versions, default to "off" when control_state is not present
Expand Down
2 changes: 1 addition & 1 deletion tests/data/adam/adam_jip.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"entities": {
"devices": {
"06aecb3d00354375924f50c47af36bd2": {
"active_preset": "no_frost",
"climate_mode": "heat",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/adam/adam_onoff_cooling_fake_firmware.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"entities": {
"devices": {
"0ca13e8176204ca7bf6f09de59f81c83": {
"binary_sensors": {
"cooling_enabled": true,
Expand Down
2 changes: 1 addition & 1 deletion tests/data/adam/adam_plus_anna_new.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"device_zones": {
"devices": {
"056ee145a816487eaa69243c3280f8bf": {
"available": true,
"binary_sensors": {
Expand Down
2 changes: 1 addition & 1 deletion tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"entities": {
"devices": {
"67d73d0bd469422db25a618a5fb8eeb0": {
"switches": {
"lock": true
Expand Down
2 changes: 1 addition & 1 deletion tests/data/adam/adam_plus_anna_new_regulation_off.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"device_zones": {
"devices": {
"056ee145a816487eaa69243c3280f8bf": {
"available": true,
"binary_sensors": {
Expand Down
40 changes: 17 additions & 23 deletions tests/data/anna/anna_elga_2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,39 @@
{
"entities": {
"devices": {
"573c152e7d4f4720878222bd75638f5b": {
"available": true,
"binary_sensors": {
"compressor_state": false,
"compressor_state": true,
"cooling_enabled": false,
"cooling_state": false,
"dhw_state": false,
"flame_state": false,
"heating_state": false,
"secondary_boiler_state": false
"flame_state": true,
"heating_state": true,
"secondary_boiler_state": true
},
"dev_class": "heater_central",
"location": "d34dfe6ab90b410c98068e75de3eb631",
"maximum_boiler_temperature": {
"lower_bound": 0.0,
"resolution": 1.0,
"setpoint": 60.0,
"upper_bound": 100.0
},
"model": "Generic heater/cooler",
"name": "OpenTherm",
"sensors": {
"domestic_hot_water_setpoint": 60.0,
"intended_boiler_temperature": 0.0,
"modulation_level": 0.0,
"outdoor_air_temperature": 14.0,
"return_temperature": 23.4,
"intended_boiler_temperature": 58.3,
"modulation_level": 55,
"outdoor_air_temperature": 6.0,
"return_temperature": 35.5,
"water_pressure": 0.5,
"water_temperature": 22.8
"water_temperature": 42.6
},
"switches": {
"dhw_cm_switch": true
"dhw_cm_switch": false
},
"vendor": "Techneco"
},
"ebd90df1ab334565b5895f37590ccff4": {
"active_preset": "home",
"available_schedules": ["Thermostat schedule", "off"],
"climate_mode": "auto",
"control_state": "idle",
"control_state": "heating",
"dev_class": "thermostat",
"firmware": "2018-02-08T11:15:53+01:00",
"hardware": "6539-1301-5002",
Expand All@@ -49,12 +43,12 @@
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
"select_schedule": "Thermostat schedule",
"sensors": {
"cooling_activation_outdoor_temperature": 26.0,
"cooling_deactivation_threshold": 3.0,
"cooling_activation_outdoor_temperature": 24.0,
"cooling_deactivation_threshold": 2.0,
"illuminance": 0.5,
"setpoint_high": 30.0,
"setpoint_low": 19.5,
"temperature": 20.9
"temperature": 19.2
},
"temperature_offset": {
"lower_bound": -2.0,
Expand All@@ -76,15 +70,15 @@
"plugwise_notification": false
},
"dev_class": "gateway",
"firmware": "4.2.1",
"firmware": "4.4.1",
"hardware": "AME Smile 2.0 board",
"location": "d34dfe6ab90b410c98068e75de3eb631",
"mac_address": "C4930002FE76",
"model": "Gateway",
"model_id": "smile_thermo",
"name": "Smile Anna",
"sensors": {
"outdoor_temperature": 13.0
"outdoor_temperature": 6.38
},
"vendor": "Plugwise"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/data/anna/anna_elga_2_cooling.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"entities": {
"devices": {
"573c152e7d4f4720878222bd75638f5b": {
"available": true,
"binary_sensors": {
Expand Down
Loading