diff --git a/CHANGELOG.md b/CHANGELOG.md index 687496b2f..a8d8c1f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,16 @@ # Changelog +## v0.31.9: Further typing improvements + +- Add NumberType, SelectType and SelectOptionsType constants to improve typing further +- Code quality housekeeping + ## v0.31.8: Improve typing as per Core PR #96915 +## v0.31.8: Improve typing + +- Add BinarySensorType, SensorType, SwitchType as per HA Core PR 96915 + ## v0.31.7: Various small updates - Repair coverage/fix testing - #294 diff --git a/fixtures/adam_heatpump_cooling/all_data.json b/fixtures/adam_heatpump_cooling/all_data.json index c7d34b06d..06bba9b08 100644 --- a/fixtures/adam_heatpump_cooling/all_data.json +++ b/fixtures/adam_heatpump_cooling/all_data.json @@ -52,7 +52,7 @@ "model": "Lisa", "name": "Thermostaat BK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 55, "setpoint_high": 18.0, @@ -159,7 +159,7 @@ "model": "Lisa", "name": "Thermostaat DB", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.0, "setpoint_low": 4.0, @@ -205,7 +205,6 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "cooling", "regulation_modes": [ "heating", "off", @@ -213,6 +212,7 @@ "bleeding_hot", "cooling" ], + "select_regulation_mode": "cooling", "sensors": { "outdoor_temperature": 13.4 }, @@ -233,7 +233,7 @@ "model": "Lisa", "name": "Thermostaat JM", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.0, "setpoint_low": 4.0, @@ -358,7 +358,7 @@ "model": "Lisa", "name": "Thermostaat SQ", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.5, "setpoint_low": 4.0, @@ -388,7 +388,7 @@ "model": "Lisa", "name": "Thermostaat RB", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 17.0, "setpoint_low": 4.0, @@ -415,7 +415,7 @@ "model": "ThermoTouch", "name": "Thermostaat WK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 21.5, "setpoint_low": 4.0, @@ -444,7 +444,7 @@ "model": "Lisa", "name": "Thermostaat SJ", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, @@ -474,7 +474,7 @@ "model": "Lisa", "name": "Thermostaat KK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "battery": 53, "setpoint_high": 21.5, @@ -505,7 +505,7 @@ "model": "Lisa", "name": "Thermostaat BK1", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, @@ -535,7 +535,7 @@ "model": "Lisa", "name": "Thermostaat BK2", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, diff --git a/fixtures/adam_jip/all_data.json b/fixtures/adam_jip/all_data.json index d64903a0e..177478f0f 100644 --- a/fixtures/adam_jip/all_data.json +++ b/fixtures/adam_jip/all_data.json @@ -14,7 +14,7 @@ "model": "Lisa", "name": "Slaapkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 92, "setpoint": 13.0, @@ -93,7 +93,7 @@ "model": "Lisa", "name": "Kinderkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 79, "setpoint": 13.0, @@ -139,7 +139,7 @@ "model": "Lisa", "name": "Logeerkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 80, "setpoint": 13.0, @@ -165,8 +165,8 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": 24.9 }, @@ -239,7 +239,7 @@ "model": "Jip", "name": "Woonkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 100, "humidity": 56.2, diff --git a/fixtures/adam_multiple_devices_per_zone/all_data.json b/fixtures/adam_multiple_devices_per_zone/all_data.json index ffc2ca8ab..63f0012ea 100644 --- a/fixtures/adam_multiple_devices_per_zone/all_data.json +++ b/fixtures/adam_multiple_devices_per_zone/all_data.json @@ -117,7 +117,7 @@ "model": "Lisa", "name": "Zone Thermostat Jessie", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "CV Jessie", + "select_schedule": "CV Jessie", "sensors": { "battery": 37, "setpoint": 15.0, @@ -239,7 +239,7 @@ "model": "Lisa", "name": "Zone Lisa WK", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "GF7 Woonkamer", + "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, "setpoint": 21.5, @@ -311,7 +311,7 @@ "model": "Lisa", "name": "Zone Lisa Bios", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 67, "setpoint": 13.0, @@ -345,7 +345,7 @@ "model": "Tom/Floor", "name": "CV Kraan Garage", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 68, "setpoint": 5.5, @@ -381,7 +381,7 @@ "model": "Lisa", "name": "Zone Thermostat Badkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Badkamer Schema", + "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, "setpoint": 14.0, @@ -407,7 +407,7 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": 7.81 }, diff --git a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json index eec4a8fee..3f2ba4640 100644 --- a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json +++ b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json @@ -47,7 +47,6 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "cooling", "regulation_modes": [ "heating", "off", @@ -55,6 +54,7 @@ "bleeding_hot", "cooling" ], + "select_regulation_mode": "cooling", "sensors": { "outdoor_temperature": 13.4 }, @@ -72,7 +72,7 @@ "model": "ThermoTouch", "name": "Thermostaat WK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 21.5, "setpoint_low": 4.0, diff --git a/fixtures/adam_plus_anna/all_data.json b/fixtures/adam_plus_anna/all_data.json index 16b8fd321..10ca2af82 100644 --- a/fixtures/adam_plus_anna/all_data.json +++ b/fixtures/adam_plus_anna/all_data.json @@ -56,7 +56,7 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": 11.9 }, @@ -73,7 +73,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Weekschema", + "select_schedule": "Weekschema", "sensors": { "setpoint": 20.5, "temperature": 20.5 diff --git a/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json b/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json index 6b8de79e7..1942a7a54 100644 --- a/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json +++ b/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json @@ -56,7 +56,7 @@ "mac_address": "0123456789AB", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "vendor": "Plugwise", "zigbee_mac_address": "0123456789AB" }, @@ -70,7 +70,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["home", "away", "no_frost", "asleep", "vacation"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint": 20.5, "temperature": 20.5 diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json index 95726bce2..9ed3226b5 100644 --- a/fixtures/adam_plus_anna_new/all_data.json +++ b/fixtures/adam_plus_anna_new/all_data.json @@ -129,7 +129,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Weekschema", + "select_schedule": "Weekschema", "sensors": { "setpoint": 18.5, "temperature": 18.1 @@ -153,8 +153,8 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": -1.25 }, @@ -175,7 +175,7 @@ "model": "Lisa", "name": "Lisa Badkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Badkamer", + "select_schedule": "Badkamer", "sensors": { "battery": 56, "setpoint": 15.0, diff --git a/fixtures/adam_zone_per_device/all_data.json b/fixtures/adam_zone_per_device/all_data.json index 54fe3e388..50b86d292 100644 --- a/fixtures/adam_zone_per_device/all_data.json +++ b/fixtures/adam_zone_per_device/all_data.json @@ -117,7 +117,7 @@ "model": "Lisa", "name": "Zone Thermostat Jessie", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "CV Jessie", + "select_schedule": "CV Jessie", "sensors": { "battery": 37, "setpoint": 16.0, @@ -239,7 +239,7 @@ "model": "Lisa", "name": "Zone Lisa WK", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "GF7 Woonkamer", + "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, "setpoint": 21.5, @@ -311,7 +311,7 @@ "model": "Lisa", "name": "Zone Lisa Bios", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 67, "setpoint": 13.0, @@ -345,7 +345,7 @@ "model": "Tom/Floor", "name": "CV Kraan Garage", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 68, "setpoint": 5.5, @@ -381,7 +381,7 @@ "model": "Lisa", "name": "Zone Thermostat Badkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Badkamer Schema", + "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, "setpoint": 14.0, @@ -407,7 +407,7 @@ "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": 7.69 }, diff --git a/fixtures/anna_elga_2/all_data.json b/fixtures/anna_elga_2/all_data.json index 43a359d9c..fca6d6a49 100644 --- a/fixtures/anna_elga_2/all_data.json +++ b/fixtures/anna_elga_2/all_data.json @@ -46,7 +46,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "sensors": { "cooling_activation_outdoor_temperature": 26.0, "cooling_deactivation_threshold": 3.0, diff --git a/fixtures/anna_elga_2_cooling/all_data.json b/fixtures/anna_elga_2_cooling/all_data.json index 467311628..5046264b1 100644 --- a/fixtures/anna_elga_2_cooling/all_data.json +++ b/fixtures/anna_elga_2_cooling/all_data.json @@ -47,7 +47,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "sensors": { "cooling_activation_outdoor_temperature": 26.0, "cooling_deactivation_threshold": 3.0, diff --git a/fixtures/anna_elga_2_schedule_off/all_data.json b/fixtures/anna_elga_2_schedule_off/all_data.json index 41ed3e56e..3948b8833 100644 --- a/fixtures/anna_elga_2_schedule_off/all_data.json +++ b/fixtures/anna_elga_2_schedule_off/all_data.json @@ -46,7 +46,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "cooling_activation_outdoor_temperature": 26.0, "cooling_deactivation_threshold": 3.0, diff --git a/fixtures/anna_heatpump_cooling/all_data.json b/fixtures/anna_heatpump_cooling/all_data.json index ea2bdaa7e..582899da3 100644 --- a/fixtures/anna_heatpump_cooling/all_data.json +++ b/fixtures/anna_heatpump_cooling/all_data.json @@ -64,7 +64,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "cooling_activation_outdoor_temperature": 21.0, "cooling_deactivation_threshold": 6.0, diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json b/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json index 8c70eb77c..de2e1bb52 100644 --- a/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json +++ b/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json @@ -64,7 +64,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "cooling_activation_outdoor_temperature": 21.0, "cooling_deactivation_threshold": 6.0, diff --git a/fixtures/anna_heatpump_heating/all_data.json b/fixtures/anna_heatpump_heating/all_data.json index 8b044f6e6..49b522123 100644 --- a/fixtures/anna_heatpump_heating/all_data.json +++ b/fixtures/anna_heatpump_heating/all_data.json @@ -68,7 +68,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], - "selected_schedule": "standaard", + "select_schedule": "standaard", "sensors": { "cooling_activation_outdoor_temperature": 21.0, "cooling_deactivation_threshold": 4.0, diff --git a/fixtures/anna_loria_cooling_active/all_data.json b/fixtures/anna_loria_cooling_active/all_data.json index 99445a814..d5bf309b9 100644 --- a/fixtures/anna_loria_cooling_active/all_data.json +++ b/fixtures/anna_loria_cooling_active/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], - "selected_schedule": "Winter", + "select_schedule": "Winter", "sensors": { "illuminance": 45.0, "setpoint_high": 23.5, @@ -53,7 +53,6 @@ "heating_state": false }, "dev_class": "heater_central", - "dhw_mode": "auto", "dhw_modes": ["off", "auto", "boost", "eco", "comfort"], "location": "674b657c138a41a291d315d7471deb06", "max_dhw_temperature": { @@ -70,6 +69,7 @@ }, "model": "173", "name": "OpenTherm", + "select_dhw_mode": "auto", "sensors": { "dhw_temperature": 52.9, "intended_boiler_temperature": 0.0, diff --git a/fixtures/anna_loria_heating_idle/all_data.json b/fixtures/anna_loria_heating_idle/all_data.json index 90a7bd59e..1c2c1391a 100644 --- a/fixtures/anna_loria_heating_idle/all_data.json +++ b/fixtures/anna_loria_heating_idle/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], - "selected_schedule": "Winter", + "select_schedule": "Winter", "sensors": { "illuminance": 45.0, "setpoint_high": 30.0, @@ -53,7 +53,6 @@ "heating_state": false }, "dev_class": "heater_central", - "dhw_mode": "auto", "dhw_modes": ["off", "auto", "boost", "eco", "comfort"], "location": "674b657c138a41a291d315d7471deb06", "max_dhw_temperature": { @@ -70,6 +69,7 @@ }, "model": "173", "name": "OpenTherm", + "select_dhw_mode": "auto", "sensors": { "dhw_temperature": 52.9, "intended_boiler_temperature": 0.0, diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json index eeddef558..c53b248a5 100644 --- a/fixtures/anna_v4/all_data.json +++ b/fixtures/anna_v4/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "illuminance": 40.5, "setpoint": 20.5, diff --git a/fixtures/anna_v4_dhw/all_data.json b/fixtures/anna_v4_dhw/all_data.json index 3505a0aa5..d7c8fccc3 100644 --- a/fixtures/anna_v4_dhw/all_data.json +++ b/fixtures/anna_v4_dhw/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "illuminance": 40.5, "setpoint": 20.5, diff --git a/fixtures/anna_v4_no_tag/all_data.json b/fixtures/anna_v4_no_tag/all_data.json index 05e639d1a..6e16e36d0 100644 --- a/fixtures/anna_v4_no_tag/all_data.json +++ b/fixtures/anna_v4_no_tag/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], - "selected_schedule": "Thuiswerken", + "select_schedule": "Thuiswerken", "sensors": { "illuminance": 40.5, "setpoint": 20.5, diff --git a/fixtures/anna_without_boiler_fw3/all_data.json b/fixtures/anna_without_boiler_fw3/all_data.json index 2e054e1f4..0168bada2 100644 --- a/fixtures/anna_without_boiler_fw3/all_data.json +++ b/fixtures/anna_without_boiler_fw3/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "no_frost", "asleep", "away", "home"], - "selected_schedule": "Normal", + "select_schedule": "Normal", "sensors": { "illuminance": 35.0, "setpoint": 16.0, diff --git a/fixtures/anna_without_boiler_fw4/all_data.json b/fixtures/anna_without_boiler_fw4/all_data.json index cb3d3dd51..ec8a5b7b0 100644 --- a/fixtures/anna_without_boiler_fw4/all_data.json +++ b/fixtures/anna_without_boiler_fw4/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "no_frost", "asleep", "away", "home"], - "selected_schedule": "Normal", + "select_schedule": "Normal", "sensors": { "illuminance": 44.8, "setpoint": 21.0, diff --git a/fixtures/anna_without_boiler_fw42/all_data.json b/fixtures/anna_without_boiler_fw42/all_data.json index 1cb4920e2..4245504ea 100644 --- a/fixtures/anna_without_boiler_fw42/all_data.json +++ b/fixtures/anna_without_boiler_fw42/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "asleep", "away", "home", "vacation"], - "selected_schedule": "Test", + "select_schedule": "Test", "sensors": { "illuminance": 0.25, "setpoint": 21.0, diff --git a/fixtures/legacy_anna/all_data.json b/fixtures/legacy_anna/all_data.json index 29ec60581..51b2e5d5f 100644 --- a/fixtures/legacy_anna/all_data.json +++ b/fixtures/legacy_anna/all_data.json @@ -49,7 +49,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "vacation", "asleep", "home", "no_frost"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "sensors": { "illuminance": 151, "setpoint": 20.5, diff --git a/fixtures/legacy_anna_2/all_data.json b/fixtures/legacy_anna_2/all_data.json index c6dbbf36a..ad28f8b64 100644 --- a/fixtures/legacy_anna_2/all_data.json +++ b/fixtures/legacy_anna_2/all_data.json @@ -12,7 +12,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["vacation", "away", "no_frost", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "illuminance": 19.5, "setpoint": 15.0, diff --git a/fixtures/m_adam_cooling/all_data.json b/fixtures/m_adam_cooling/all_data.json index 4f7de13d9..92618a901 100644 --- a/fixtures/m_adam_cooling/all_data.json +++ b/fixtures/m_adam_cooling/all_data.json @@ -55,6 +55,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "select_schedule": "Weekschema", "selected_schedule": "None", "sensors": { "setpoint_high": 23.5, @@ -89,6 +90,7 @@ "bleeding_hot", "cooling" ], + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": 29.65 }, @@ -109,7 +111,7 @@ "model": "Lisa", "name": "Lisa Badkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Badkamer", + "select_schedule": "Badkamer", "sensors": { "battery": 56, "setpoint_high": 23.5, diff --git a/fixtures/m_adam_heating/all_data.json b/fixtures/m_adam_heating/all_data.json index 3afb112fb..4345cf76a 100644 --- a/fixtures/m_adam_heating/all_data.json +++ b/fixtures/m_adam_heating/all_data.json @@ -60,6 +60,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "select_schedule": "Weekschema", "selected_schedule": "None", "sensors": { "setpoint": 20.0, @@ -86,6 +87,7 @@ "name": "Adam", "regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": -1.25 }, @@ -106,7 +108,7 @@ "model": "Lisa", "name": "Lisa Badkamer", "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "selected_schedule": "Badkamer", + "select_schedule": "Badkamer", "sensors": { "battery": 56, "setpoint": 15.0, diff --git a/fixtures/m_anna_heatpump_cooling/all_data.json b/fixtures/m_anna_heatpump_cooling/all_data.json index 47fd0d9ad..20f2db213 100644 --- a/fixtures/m_anna_heatpump_cooling/all_data.json +++ b/fixtures/m_anna_heatpump_cooling/all_data.json @@ -69,7 +69,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], - "selected_schedule": "standaard", + "select_schedule": "standaard", "sensors": { "cooling_activation_outdoor_temperature": 21.0, "cooling_deactivation_threshold": 4.0, diff --git a/fixtures/m_anna_heatpump_idle/all_data.json b/fixtures/m_anna_heatpump_idle/all_data.json index ca032edf6..3a7bd2dae 100644 --- a/fixtures/m_anna_heatpump_idle/all_data.json +++ b/fixtures/m_anna_heatpump_idle/all_data.json @@ -69,7 +69,7 @@ "model": "ThermoTouch", "name": "Anna", "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], - "selected_schedule": "standaard", + "select_schedule": "standaard", "sensors": { "cooling_activation_outdoor_temperature": 25.0, "cooling_deactivation_threshold": 4.0, diff --git a/plugwise/__init__.py b/plugwise/__init__.py index e6f655209..41ac3e4f3 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -199,7 +199,7 @@ def _device_data_climate( last_active, ) = self._schedules(loc_id) device_data["available_schedules"] = avail_schedules - device_data["selected_schedule"] = sel_schedule + device_data["select_schedule"] = sel_schedule if self._smile_legacy: device_data["last_used"] = "".join(map(str, avail_schedules)) else: diff --git a/plugwise/constants.py b/plugwise/constants.py index c2a0ab2fa..d95e1f71c 100644 --- a/plugwise/constants.py +++ b/plugwise/constants.py @@ -190,7 +190,7 @@ # Heater Central related measurements HEATER_CENTRAL_MEASUREMENTS: Final[dict[str, DATA | UOM]] = { "boiler_temperature": DATA("water_temperature", TEMP_CELSIUS), - "domestic_hot_water_mode": DATA("dhw_mode", NONE), + "domestic_hot_water_mode": DATA("select_dhw_mode", NONE), "domestic_hot_water_setpoint": UOM(TEMP_CELSIUS), "domestic_hot_water_state": DATA("dhw_state", NONE), "domestic_hot_water_temperature": DATA("dhw_temperature", TEMP_CELSIUS), @@ -258,6 +258,23 @@ ] BINARY_SENSORS: Final[tuple[str, ...]] = get_args(BinarySensorType) +NumberType = Literal[ + "maximum_boiler_temperature", + "max_dhw_temperature", +] + +SelectType = Literal[ + "select_dhw_mode", + "select_regulation_mode", + "select_schedule", +] + +SelectOptionsType = Literal[ + "dhw_modes", + "regulation_modes", + "available_schedules", +] + SensorType = Literal[ "battery", "cooling_activation_outdoor_temperature", @@ -469,11 +486,11 @@ class DeviceData( """The Device Data class, covering the collected and ordered output-data per device.""" # Loria - dhw_mode: str + select_dhw_mode: str dhw_modes: list[str] # Gateway - regulation_mode: str + select_regulation_mode: str regulation_modes: list[str] # Master Thermostats @@ -481,7 +498,7 @@ class DeviceData( active_preset: str | None available_schedules: list[str] - selected_schedule: str + select_schedule: str last_used: str | None mode: str diff --git a/plugwise/helper.py b/plugwise/helper.py index 946f41626..999e054d5 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -884,7 +884,7 @@ def _appliance_measurements( data[measurement] = appl_p_loc.text # type: ignore [literal-required] # measurements with states "on" or "off" that need to be passed directly - if measurement not in ("dhw_mode"): + if measurement not in ("select_dhw_mode"): data[measurement] = format_measure( # type: ignore [literal-required] appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT) ) @@ -929,7 +929,7 @@ def _get_regulation_mode(self, appliance: etree, data: DeviceData) -> None: """ locator = "./actuator_functionalities/regulation_mode_control_functionality" if (search := appliance.find(locator)) is not None: - data["regulation_mode"] = search.find("mode").text + data["select_regulation_mode"] = search.find("mode").text self._cooling_enabled = search.find("mode").text == "cooling" def _cleanup_data(self, data: DeviceData) -> None: diff --git a/pyproject.toml b/pyproject.toml index 7f431ec5e..1edfd8692 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "0.31.8" +version = "0.31.9" license = {file = "LICENSE"} description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md" diff --git a/scripts/update_fixtures.sh b/scripts/update_fixtures.sh index 1b773b120..900ba1b5a 100755 --- a/scripts/update_fixtures.sh +++ b/scripts/update_fixtures.sh @@ -2,7 +2,7 @@ set -eu # Fixtures consumed by plugwise-beta -test_fixtures="adam_multiple_devices_per_zone m_adam_cooling m_anna_heatpump_cooling p1v3_full_option stretch_v31 anna_heatpump_heating m_adam_heating m_anna_heatpump_idle p1v4_442_triple" +test_fixtures="adam_multiple_devices_per_zone m_adam_cooling adam_jip m_anna_heatpump_cooling p1v3_full_option stretch_v31 anna_heatpump_heating m_adam_heating m_anna_heatpump_idle p1v4_442_triple" target="../plugwise-beta" if [ $# -eq 1 ]; then diff --git a/tests/test_smile.py b/tests/test_smile.py index f995faef5..ba3ff17d9 100644 --- a/tests/test_smile.py +++ b/tests/test_smile.py @@ -686,7 +686,7 @@ async def test_connect_legacy_anna(self): "preset_modes": ["away", "vacation", "asleep", "home", "no_frost"], "active_preset": "home", "available_schedules": ["Thermostat schedule"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "last_used": "Thermostat schedule", "mode": "auto", "sensors": {"temperature": 20.4, "illuminance": 151, "setpoint": 20.5}, @@ -788,7 +788,7 @@ async def test_connect_legacy_anna_2(self): "preset_modes": ["vacation", "away", "no_frost", "home", "asleep"], "active_preset": None, "available_schedules": ["Thermostat schedule"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Thermostat schedule", "mode": "heat", "sensors": {"temperature": 21.4, "illuminance": 19.5, "setpoint": 15.0}, @@ -1033,7 +1033,7 @@ async def test_connect_anna_v4(self): "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], "active_preset": "home", "available_schedules": ["Standaard", "Thuiswerken"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Standaard", "mode": "heat", "sensors": {"temperature": 20.5, "setpoint": 20.5, "illuminance": 40.5}, @@ -1150,7 +1150,7 @@ async def test_connect_anna_v4_dhw(self): "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], "active_preset": "home", "available_schedules": ["Standaard", "Thuiswerken"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Standaard", "mode": "heat", "sensors": {"temperature": 20.5, "setpoint": 20.5, "illuminance": 40.5}, @@ -1250,7 +1250,7 @@ async def test_connect_anna_without_boiler_fw3(self): "preset_modes": ["vacation", "no_frost", "asleep", "away", "home"], "active_preset": "away", "available_schedules": ["Test", "Normal"], - "selected_schedule": "Normal", + "select_schedule": "Normal", "last_used": "Normal", "mode": "auto", "sensors": {"temperature": 20.6, "setpoint": 16.0, "illuminance": 35.0}, @@ -1333,7 +1333,7 @@ async def test_connect_anna_without_boiler_fw4(self): "preset_modes": ["vacation", "no_frost", "asleep", "away", "home"], "active_preset": "home", "available_schedules": ["Normal"], - "selected_schedule": "Normal", + "select_schedule": "Normal", "last_used": "Normal", "mode": "auto", "sensors": {"temperature": 20.4, "setpoint": 21.0, "illuminance": 44.8}, @@ -1398,7 +1398,7 @@ async def test_connect_anna_without_boiler_fw42(self): "preset_modes": ["no_frost", "asleep", "away", "home", "vacation"], "active_preset": "home", "available_schedules": ["Test", "Normal"], - "selected_schedule": "Test", + "select_schedule": "Test", "last_used": "Test", "mode": "auto", "sensors": {"temperature": 20.6, "setpoint": 21.0, "illuminance": 0.25}, @@ -1506,7 +1506,7 @@ async def test_connect_adam_plus_anna(self): "name": "Adam", "zigbee_mac_address": "ABCD012345670101", "vendor": "Plugwise", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "binary_sensors": {"plugwise_notification": True}, "sensors": {"outdoor_temperature": 11.9}, }, @@ -1525,7 +1525,7 @@ async def test_connect_adam_plus_anna(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "home", "available_schedules": ["Weekschema"], - "selected_schedule": "Weekschema", + "select_schedule": "Weekschema", "last_used": "Weekschema", "mode": "auto", "sensors": {"temperature": 20.5, "setpoint": 20.5}, @@ -1652,7 +1652,7 @@ async def test_connect_adam_plus_anna_new(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "asleep", "available_schedules": ["Weekschema", "Badkamer", "Test"], - "selected_schedule": "Weekschema", + "select_schedule": "Weekschema", "last_used": "Weekschema", "control_state": "heating", "mode": "auto", @@ -1746,7 +1746,7 @@ async def test_connect_adam_plus_anna_new(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "home", "available_schedules": ["Weekschema", "Badkamer", "Test"], - "selected_schedule": "Badkamer", + "select_schedule": "Badkamer", "last_used": "Badkamer", "control_state": "off", "mode": "auto", @@ -1762,7 +1762,7 @@ async def test_connect_adam_plus_anna_new(self): "name": "Adam", "zigbee_mac_address": "ABCD012345670101", "vendor": "Plugwise", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], "binary_sensors": {"plugwise_notification": False}, "sensors": {"outdoor_temperature": -1.25}, @@ -1907,7 +1907,7 @@ async def test_connect_adam_zone_per_device(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Badkamer Schema", "mode": "heat", "sensors": {"temperature": 16.5, "setpoint": 13.0, "battery": 67}, @@ -1972,7 +1972,7 @@ async def test_connect_adam_zone_per_device(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "GF7 Woonkamer", + "select_schedule": "GF7 Woonkamer", "last_used": "GF7 Woonkamer", "mode": "auto", "sensors": {"temperature": 21.1, "setpoint": 21.5, "battery": 34}, @@ -1987,7 +1987,7 @@ async def test_connect_adam_zone_per_device(self): "name": "Adam", "zigbee_mac_address": "ABCD012345670101", "vendor": "Plugwise", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "binary_sensors": {"plugwise_notification": True}, "sensors": {"outdoor_temperature": 7.69}, }, @@ -2148,7 +2148,7 @@ async def test_connect_adam_zone_per_device(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "CV Jessie", + "select_schedule": "CV Jessie", "last_used": "CV Jessie", "mode": "auto", "sensors": {"temperature": 17.1, "setpoint": 16.0, "battery": 37}, @@ -2196,7 +2196,7 @@ async def test_connect_adam_zone_per_device(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "Badkamer Schema", + "select_schedule": "Badkamer Schema", "last_used": "Badkamer Schema", "mode": "auto", "sensors": {"temperature": 18.8, "setpoint": 14.0, "battery": 92}, @@ -2243,7 +2243,7 @@ async def test_connect_adam_zone_per_device(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Badkamer Schema", "mode": "heat", "sensors": { @@ -2345,7 +2345,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Badkamer Schema", "mode": "heat", "sensors": {"temperature": 16.5, "setpoint": 13.0, "battery": 67}, @@ -2410,7 +2410,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "GF7 Woonkamer", + "select_schedule": "GF7 Woonkamer", "last_used": "GF7 Woonkamer", "mode": "auto", "sensors": {"temperature": 20.9, "setpoint": 21.5, "battery": 34}, @@ -2425,7 +2425,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "name": "Adam", "zigbee_mac_address": "ABCD012345670101", "vendor": "Plugwise", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "binary_sensors": {"plugwise_notification": True}, "sensors": {"outdoor_temperature": 7.81}, }, @@ -2586,7 +2586,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "CV Jessie", + "select_schedule": "CV Jessie", "last_used": "CV Jessie", "mode": "auto", "sensors": {"temperature": 17.2, "setpoint": 15.0, "battery": 37}, @@ -2634,7 +2634,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "Badkamer Schema", + "select_schedule": "Badkamer Schema", "last_used": "Badkamer Schema", "mode": "auto", "sensors": {"temperature": 18.9, "setpoint": 14.0, "battery": 92}, @@ -2681,7 +2681,7 @@ async def test_connect_adam_multiple_devices_per_zone(self): "Badkamer Schema", "CV Jessie", ], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Badkamer Schema", "mode": "heat", "sensors": { @@ -2780,7 +2780,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat BK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "battery": 55, "setpoint_high": 18.0, @@ -2879,7 +2879,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat DB", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.0, "setpoint_low": 4.0, @@ -2921,7 +2921,7 @@ async def test_adam_heatpump_cooling(self): "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_mode": "cooling", + "select_regulation_mode": "cooling", "regulation_modes": [ "heating", "off", @@ -2947,7 +2947,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat JM", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.0, "setpoint_low": 4.0, @@ -3062,7 +3062,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat SQ", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 18.5, "setpoint_low": 4.0, @@ -3092,7 +3092,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat RB", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 17.0, "setpoint_low": 4.0, @@ -3119,7 +3119,7 @@ async def test_adam_heatpump_cooling(self): "model": "ThermoTouch", "name": "Thermostaat WK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 21.5, "setpoint_low": 4.0, @@ -3148,7 +3148,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat SJ", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "None", + "select_schedule": "None", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, @@ -3178,7 +3178,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat KK", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "battery": 53, "setpoint_high": 21.5, @@ -3209,7 +3209,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat BK1", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, @@ -3239,7 +3239,7 @@ async def test_adam_heatpump_cooling(self): "model": "Lisa", "name": "Thermostaat BK2", "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], - "selected_schedule": "Werkdag schema", + "select_schedule": "Werkdag schema", "sensors": { "setpoint_high": 20.5, "setpoint_low": 4.0, @@ -3322,7 +3322,7 @@ async def test_adam_plus_jip(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "home", "available_schedules": ["None"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": None, "control_state": "off", "mode": "heat", @@ -3347,7 +3347,7 @@ async def test_adam_plus_jip(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "no_frost", "available_schedules": ["None"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": None, "control_state": "off", "mode": "heat", @@ -3389,7 +3389,7 @@ async def test_adam_plus_jip(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "home", "available_schedules": ["None"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": None, "control_state": "off", "mode": "heat", @@ -3414,7 +3414,7 @@ async def test_adam_plus_jip(self): "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "active_preset": "home", "available_schedules": ["None"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": None, "control_state": "off", "mode": "heat", @@ -3469,7 +3469,7 @@ async def test_adam_plus_jip(self): "name": "Adam", "zigbee_mac_address": "ABCD012345670101", "vendor": "Plugwise", - "regulation_mode": "heating", + "select_regulation_mode": "heating", "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], "binary_sensors": {"plugwise_notification": False}, "sensors": {"outdoor_temperature": 24.9}, @@ -3781,7 +3781,7 @@ async def test_connect_anna_heatpump_heating(self): "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], "active_preset": "home", "available_schedules": ["standaard"], - "selected_schedule": "standaard", + "select_schedule": "standaard", "last_used": "standaard", "mode": "auto", "sensors": { @@ -3899,7 +3899,7 @@ async def test_connect_anna_heatpump_cooling(self): "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], "active_preset": "home", "available_schedules": ["standaard"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "standaard", "mode": "heat_cool", "sensors": { @@ -4048,7 +4048,7 @@ async def test_connect_anna_elga_2(self): "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], "active_preset": "home", "available_schedules": ["Thermostat schedule"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "last_used": "Thermostat schedule", "mode": "auto", "sensors": { @@ -4147,7 +4147,7 @@ async def test_connect_anna_elga_2_schedule_off(self): "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], "active_preset": "home", "available_schedules": ["Thermostat schedule"], - "selected_schedule": "None", + "select_schedule": "None", "last_used": "Thermostat schedule", "mode": "heat", "sensors": { @@ -4224,7 +4224,7 @@ async def test_connect_anna_elga_2_cooling(self): "model": "ThermoTouch", "name": "Anna", "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], - "selected_schedule": "Thermostat schedule", + "select_schedule": "Thermostat schedule", "sensors": { "cooling_activation_outdoor_temperature": 26.0, "cooling_deactivation_threshold": 3.0, @@ -4301,7 +4301,7 @@ async def test_connect_anna_loria_heating_idle(self): "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], "active_preset": "home", "available_schedules": ["Winter", "Test "], - "selected_schedule": "Winter", + "select_schedule": "Winter", "last_used": "Winter", "mode": "auto", "sensors": { @@ -4317,7 +4317,7 @@ async def test_connect_anna_loria_heating_idle(self): "model": "173", "name": "OpenTherm", "vendor": "Atlantic", - "dhw_mode": "auto", + "select_dhw_mode": "auto", "maximum_boiler_temperature": { "setpoint": 40.0, "lower_bound": 25.0, @@ -4427,7 +4427,7 @@ async def test_connect_anna_loria_cooling_active(self): "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], "active_preset": "home", "available_schedules": ["Winter", "Test "], - "selected_schedule": "Winter", + "select_schedule": "Winter", "last_used": "Winter", "mode": "auto", "sensors": { @@ -4443,7 +4443,7 @@ async def test_connect_anna_loria_cooling_active(self): "model": "173", "name": "OpenTherm", "vendor": "Atlantic", - "dhw_mode": "auto", + "select_dhw_mode": "auto", "maximum_boiler_temperature": { "setpoint": 40.0, "lower_bound": 25.0,