From 336bde32a38a5e041f7c4fd6f6dec61d52ec3599 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 13:57:52 +0100 Subject: [PATCH 01/11] Type all P1 sensor values as float --- plugwise/constants.py | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/plugwise/constants.py b/plugwise/constants.py index 2b9a8f2a4..56330facc 100644 --- a/plugwise/constants.py +++ b/plugwise/constants.py @@ -431,30 +431,30 @@ class SmileSensors(TypedDict, total=False): dhw_temperature: float domestic_hot_water_setpoint: float temperature: float - electricity_consumed: int - electricity_consumed_interval:int + electricity_consumed: float + electricity_consumed_interval: float electricity_consumed_off_peak_cumulative: float - electricity_consumed_off_peak_interval: int - electricity_consumed_off_peak_point: int + electricity_consumed_off_peak_interval: float + electricity_consumed_off_peak_point: float electricity_consumed_peak_cumulative: float - electricity_consumed_peak_interval: int - electricity_consumed_peak_point: int - electricity_consumed_point: int - electricity_phase_one_consumed: int - electricity_phase_two_consumed: int - electricity_phase_three_consumed: int - electricity_phase_one_produced: int - electricity_phase_two_produced: int - electricity_phase_three_produced: int - electricity_produced: int - electricity_produced_interval: int + electricity_consumed_peak_interval: float + electricity_consumed_peak_point: float + electricity_consumed_point: float + electricity_phase_one_consumed: float + electricity_phase_two_consumed: float + electricity_phase_three_consumed: float + electricity_phase_one_produced: float + electricity_phase_two_produced: float + electricity_phase_three_produced: float + electricity_produced: float + electricity_produced_interval: float electricity_produced_off_peak_cumulative: float - electricity_produced_off_peak_interval: int - electricity_produced_off_peak_point: int + electricity_produced_off_peak_interval: float + electricity_produced_off_peak_point: float electricity_produced_peak_cumulative: float - electricity_produced_peak_interval: int - electricity_produced_peak_point: int - electricity_produced_point: int + electricity_produced_peak_interval: float + electricity_produced_peak_point: float + electricity_produced_point: float gas_consumed_cumulative: float gas_consumed_interval: float humidity: float @@ -462,7 +462,7 @@ class SmileSensors(TypedDict, total=False): intended_boiler_temperature: float modulation_level: float net_electricity_cumulative: float - net_electricity_point: int + net_electricity_point: float outdoor_air_temperature: float outdoor_temperature: float return_temperature: float From dba32afec950bc04964e13f8eb38e51b82ca66ba Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 14:02:13 +0100 Subject: [PATCH 02/11] Change float rounding --- plugwise/util.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugwise/util.py b/plugwise/util.py index 665c79a53..1012deee7 100644 --- a/plugwise/util.py +++ b/plugwise/util.py @@ -173,10 +173,8 @@ def format_measure(measure: str, unit: str) -> float | int: result = float(f"{round(float_measure, 1):.1f}") elif abs(float_measure) < 10: result = float(f"{round(float_measure, 2):.2f}") - elif abs(float_measure) >= 10 and abs(float_measure) < 100: + elif abs(float_measure) >= 10: result = float(f"{round(float_measure, 1):.1f}") - elif abs(float_measure) >= 100: - result = int(round(float_measure)) return result From 9710236b95a5f1a157261ba6bb999998fd8fdb16 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 14:03:14 +0100 Subject: [PATCH 03/11] Fix assert --- tests/data/anna/legacy_anna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/legacy_anna.json b/tests/data/anna/legacy_anna.json index c3571df15..23f2dbaa6 100644 --- a/tests/data/anna/legacy_anna.json +++ b/tests/data/anna/legacy_anna.json @@ -27,7 +27,7 @@ "climate_mode": "heat", "sensors": { "temperature": 20.4, - "illuminance": 151, + "illuminance": 150.8, "setpoint": 20.5 } }, From fc51d0e57b20c5c678833e8a6c74b5709dbeeda9 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 14:03:56 +0100 Subject: [PATCH 04/11] Save updated fixture --- fixtures/legacy_anna/all_data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/legacy_anna/all_data.json b/fixtures/legacy_anna/all_data.json index 54e828f1d..2b0a27182 100644 --- a/fixtures/legacy_anna/all_data.json +++ b/fixtures/legacy_anna/all_data.json @@ -51,7 +51,7 @@ "no_frost" ], "sensors": { - "illuminance": 151, + "illuminance": 150.8, "setpoint": 20.5, "temperature": 20.4 }, From cc22705516752e60457dd60feaa9d0d808602d7c Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 14:15:11 +0100 Subject: [PATCH 05/11] Update test-asserts --- tests/data/adam/adam_heatpump_cooling.json | 130 +++++++++--------- tests/data/adam/adam_jip.json | 62 ++++----- .../adam/adam_multiple_devices_per_zone.json | 70 +++++----- tests/data/adam/adam_plus_anna.json | 26 ++-- .../adam/adam_plus_anna_new_UPDATED_DATA.json | 4 +- tests/data/adam/adam_zone_per_device.json | 66 ++++----- tests/data/anna/anna_elga_2.json | 28 ++-- tests/data/anna/anna_elga_2_cooling.json | 32 ++--- tests/data/anna/anna_elga_2_schedule_off.json | 12 +- tests/data/anna/anna_elga_no_cooling.json | 32 ++--- tests/data/anna/anna_heatpump_cooling.json | 32 ++--- .../anna_heatpump_heating_UPDATED_DATA.json | 14 +- .../data/anna/anna_loria_cooling_active.json | 24 ++-- tests/data/anna/anna_loria_driessens.json | 34 ++--- tests/data/anna/anna_loria_heating_idle.json | 24 ++-- tests/data/anna/anna_v4.json | 20 +-- tests/data/anna/anna_v4_UPDATED_DATA.json | 24 ++-- tests/data/anna/anna_v4_dhw.json | 20 +-- .../data/anna/anna_without_boiler_fw441.json | 8 +- tests/data/anna/legacy_anna.json | 14 +- tests/data/anna/legacy_anna_2.json | 24 ++-- tests/data/p1/p1v4.json | 22 +-- tests/data/p1/p1v4_442_single.json | 26 ++-- .../data/p1/p1v4_442_single_UPDATED_DATA.json | 24 ++-- tests/data/p1/p1v4_442_triple.json | 34 ++--- tests/data/p1/smile_p1_v2.json | 14 +- tests/data/p1/smile_p1_v2_2.json | 14 +- tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json | 8 +- tests/data/stretch/stretch_v23.json | 84 +++++------ tests/data/stretch/stretch_v27_no_domain.json | 4 +- tests/data/stretch/stretch_v31.json | 22 +-- .../stretch/stretch_v31_UPDATED_DATA.json | 16 +-- 32 files changed, 484 insertions(+), 484 deletions(-) diff --git a/tests/data/adam/adam_heatpump_cooling.json b/tests/data/adam/adam_heatpump_cooling.json index 34aa3c703..0aabbb8ed 100644 --- a/tests/data/adam/adam_heatpump_cooling.json +++ b/tests/data/adam/adam_heatpump_cooling.json @@ -10,27 +10,27 @@ "dev_class": "heater_central", "location": "eedadcb297564f1483faa509179aebed", "max_dhw_temperature": { - "lower_bound": 40, + "lower_bound": 40.0, "resolution": 0.01, - "setpoint": 60, - "upper_bound": 65 + "setpoint": 60.0, + "upper_bound": 65.0 }, "maximum_boiler_temperature": { - "lower_bound": 7, + "lower_bound": 7.0, "resolution": 0.01, - "setpoint": 35, - "upper_bound": 50 + "setpoint": 35.0, + "upper_bound": 50.0 }, "model": "Generic heater/cooler", "model_id": "17.1", "name": "OpenTherm", "sensors": { "dhw_temperature": 63.5, - "intended_boiler_temperature": 0, - "modulation_level": 0, + "intended_boiler_temperature": 0.0, + "modulation_level": 0.0, "outdoor_air_temperature": 13.5, "return_temperature": 24.9, - "water_pressure": 2, + "water_pressure": 2.0, "water_temperature": 24.5 }, "switches": { @@ -59,13 +59,13 @@ "select_schedule": "off", "sensors": { "battery": 55, - "setpoint": 18, + "setpoint": 18.0, "temperature": 18.8 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, - "setpoint": 18, + "setpoint": 18.0, "upper_bound": 99.9 }, "vendor": "Plugwise", @@ -79,10 +79,10 @@ "model": "Plug", "name": "Smart Plug DB", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -99,9 +99,9 @@ "name": "Smart Plug KK", "sensors": { "electricity_consumed": 2.13, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true @@ -117,10 +117,10 @@ "model": "Plug", "name": "Smart Plug SJ", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -136,10 +136,10 @@ "model": "Plug", "name": "Smart Plug WK", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -171,9 +171,9 @@ "temperature": 22 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, - "setpoint": 18, + "setpoint": 18.0, "upper_bound": 99.9 }, "vendor": "Plugwise", @@ -187,10 +187,10 @@ "model": "Plug", "name": "Smart Plug SQ", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -245,13 +245,13 @@ "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { - "setpoint": 18, - "temperature": 20 + "setpoint": 18.0, + "temperature": 20.0 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, - "setpoint": 18, + "setpoint": 18.0, "upper_bound": 99.9 }, "vendor": "Plugwise", @@ -265,10 +265,10 @@ "model": "Plug", "name": "Smart Plug BK", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -284,10 +284,10 @@ "model": "Plug", "name": "Smart Plug BK2", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -303,10 +303,10 @@ "model": "Plug", "name": "Smart Plug JM", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -324,8 +324,8 @@ "sensors": { "electricity_consumed": 3.13, "electricity_consumed_interval": 0.77, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -341,10 +341,10 @@ "model": "Plug", "name": "Smart Plug BK1", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false @@ -376,7 +376,7 @@ "temperature": 21.4 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 18.5, "upper_bound": 99.9 @@ -404,13 +404,13 @@ "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { - "setpoint": 17, + "setpoint": 17.0, "temperature": 20.7 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, - "setpoint": 17, + "setpoint": 17.0, "upper_bound": 99.9 }, "vendor": "Plugwise", @@ -437,10 +437,10 @@ "temperature": 22.5 }, "thermostat": { - "lower_bound": 1, + "lower_bound": 1.0, "resolution": 0.01, "setpoint": 21.5, - "upper_bound": 35 + "upper_bound": 35.0 }, "vendor": "Plugwise" }, @@ -468,7 +468,7 @@ "temperature": 22.6 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 20.5, "upper_bound": 99.9 @@ -501,7 +501,7 @@ "temperature": 22.5 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 21.5, "upper_bound": 99.9 @@ -533,7 +533,7 @@ "temperature": 21.5 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 20.5, "upper_bound": 99.9 @@ -565,7 +565,7 @@ "temperature": 21.9 }, "thermostat": { - "lower_bound": 0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 20.5, "upper_bound": 99.9 diff --git a/tests/data/adam/adam_jip.json b/tests/data/adam/adam_jip.json index 86f4e1c49..e734e1707 100644 --- a/tests/data/adam/adam_jip.json +++ b/tests/data/adam/adam_jip.json @@ -7,15 +7,15 @@ "name": "OpenTherm", "vendor": "Remeha B.V.", "maximum_boiler_temperature": { - "setpoint": 90, - "lower_bound": 20, - "upper_bound": 90, + "setpoint": 90.0, + "lower_bound": 20.0, + "upper_bound": 90.0, "resolution": 0.01 }, "max_dhw_temperature": { - "setpoint": 60, - "lower_bound": 40, - "upper_bound": 60, + "setpoint": 60.0, + "lower_bound": 40.0, + "upper_bound": 60.0, "resolution": 0.01 }, "available": true, @@ -26,7 +26,7 @@ }, "sensors": { "water_temperature": 37.3, - "intended_boiler_temperature": 0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, "return_temperature": 37.1, "water_pressure": 1.4 @@ -45,10 +45,10 @@ "zigbee_mac_address": "ABCD012345670A01", "vendor": "Plugwise", "thermostat": { - "setpoint": 13, - "lower_bound": 0, - "upper_bound": 99.9, - "resolution": 0.01 + "lower_bound": 0.0, + "setpoint": 13.0, + "resolution": 0.01, + "upper_bound": 99.9 }, "available": true, "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], @@ -56,8 +56,8 @@ "control_state": "off", "climate_mode": "heat", "sensors": { - "temperature": 30, - "setpoint": 13, + "temperature": 30.0, + "setpoint": 13.0, "battery": 80 } }, @@ -71,8 +71,8 @@ "zigbee_mac_address": "ABCD012345670A03", "vendor": "Plugwise", "thermostat": { - "setpoint": 13, - "lower_bound": 0, + "setpoint": 13.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -83,7 +83,7 @@ "climate_mode": "heat", "sensors": { "temperature": 24.2, - "setpoint": 13, + "setpoint": 13.0, "battery": 92 } }, @@ -98,8 +98,8 @@ "vendor": "Plugwise", "available": true, "sensors": { - "temperature": 24, - "setpoint": 9, + "temperature": 24.0, + "setpoint": 9.0, "temperature_difference": 1.8, "valve_position": 100 } @@ -114,8 +114,8 @@ "zigbee_mac_address": "ABCD012345670A02", "vendor": "Plugwise", "thermostat": { - "setpoint": 13, - "lower_bound": 0, + "setpoint": 13.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -125,8 +125,8 @@ "control_state": "off", "climate_mode": "heat", "sensors": { - "temperature": 30, - "setpoint": 13, + "temperature": 30.0, + "setpoint": 13.0, "battery": 79 } }, @@ -140,9 +140,9 @@ "zigbee_mac_address": "ABCD012345670A08", "vendor": "Plugwise", "thermostat": { - "setpoint": 9, - "lower_bound": 4, - "upper_bound": 30, + "setpoint": 9.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.01 }, "available": true, @@ -152,7 +152,7 @@ "climate_mode": "heat", "sensors": { "temperature": 27.4, - "setpoint": 9, + "setpoint": 9.0, "battery": 100, "humidity": 56.2 } @@ -169,7 +169,7 @@ "available": true, "sensors": { "temperature": 28.7, - "setpoint": 13, + "setpoint": 13.0, "temperature_difference": 1.9, "valve_position": 0 } @@ -186,7 +186,7 @@ "available": true, "sensors": { "temperature": 24.2, - "setpoint": 13, + "setpoint": 13.0, "temperature_difference": 1.7, "valve_position": 0 } @@ -224,8 +224,8 @@ "available": true, "sensors": { "temperature": 28.8, - "setpoint": 13, - "temperature_difference": 2, + "setpoint": 13.0, + "temperature_difference": 2.0, "valve_position": 0 } }, @@ -239,7 +239,7 @@ "vendor": "LUMI", "available": true, "sensors": { - "electricity_consumed_interval": 0 + "electricity_consumed_interval": 0.0 }, "switches": { "relay": false, diff --git a/tests/data/adam/adam_multiple_devices_per_zone.json b/tests/data/adam/adam_multiple_devices_per_zone.json index f4c026a3c..51a8f3378 100644 --- a/tests/data/adam/adam_multiple_devices_per_zone.json +++ b/tests/data/adam/adam_multiple_devices_per_zone.json @@ -9,8 +9,8 @@ "zigbee_mac_address": "ABCD012345670A06", "vendor": "Plugwise", "thermostat": { - "setpoint": 13, - "lower_bound": 0, + "setpoint": 13.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -29,7 +29,7 @@ "climate_mode": "heat", "sensors": { "temperature": 16.5, - "setpoint": 13, + "setpoint": 13.0, "battery": 67 } }, @@ -44,7 +44,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "temperature": 26, + "temperature": 26.0, "setpoint": 21.5, "temperature_difference": 3.5, "valve_position": 100 @@ -62,7 +62,7 @@ "available": true, "sensors": { "temperature": 17.2, - "setpoint": 13, + "setpoint": 13.0, "battery": 62, "temperature_difference": -0.2, "valve_position": 0 @@ -79,7 +79,7 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 21.5, - "lower_bound": 0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -132,7 +132,7 @@ "available": true, "sensors": { "temperature": 17.1, - "setpoint": 15, + "setpoint": 15.0, "battery": 62, "temperature_difference": 0.1, "valve_position": 0 @@ -150,8 +150,8 @@ "sensors": { "electricity_consumed": 84.1, "electricity_consumed_interval": 8.6, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -170,8 +170,8 @@ "sensors": { "electricity_consumed": 35.6, "electricity_consumed_interval": 7.37, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true @@ -186,8 +186,8 @@ "heating_state": true }, "sensors": { - "water_temperature": 70, - "intended_boiler_temperature": 70, + "water_temperature": 70.0, + "intended_boiler_temperature": 70.0, "modulation_level": 1 } }, @@ -203,8 +203,8 @@ "sensors": { "electricity_consumed": 16.5, "electricity_consumed_interval": 0.5, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -222,9 +222,9 @@ "available": true, "sensors": { "electricity_consumed": 8.5, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -241,10 +241,10 @@ "vendor": "Plugwise", "available": true, "sensors": { - "electricity_consumed": 34, + "electricity_consumed": 34.0, "electricity_consumed_interval": 9.15, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -263,8 +263,8 @@ "sensors": { "electricity_consumed": 12.5, "electricity_consumed_interval": 3.8, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -281,8 +281,8 @@ "zigbee_mac_address": "ABCD012345670A03", "vendor": "Plugwise", "thermostat": { - "setpoint": 15, - "lower_bound": 0, + "setpoint": 15.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -301,7 +301,7 @@ "climate_mode": "auto", "sensors": { "temperature": 17.2, - "setpoint": 15, + "setpoint": 15.0, "battery": 37 } }, @@ -317,7 +317,7 @@ "available": true, "sensors": { "temperature": 19.1, - "setpoint": 14, + "setpoint": 14.0, "battery": 51, "temperature_difference": -0.4, "valve_position": 0 @@ -333,8 +333,8 @@ "zigbee_mac_address": "ABCD012345670A08", "vendor": "Plugwise", "thermostat": { - "setpoint": 14, - "lower_bound": 0, + "setpoint": 14.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -353,7 +353,7 @@ "climate_mode": "auto", "sensors": { "temperature": 18.9, - "setpoint": 14, + "setpoint": 14.0, "battery": 92 } }, @@ -369,8 +369,8 @@ "sensors": { "electricity_consumed": 12.2, "electricity_consumed_interval": 2.97, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -388,8 +388,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 5.5, - "lower_bound": 0, - "upper_bound": 100, + "lower_bound": 0.0, + "upper_bound": 100.0, "resolution": 0.01 }, "available": true, @@ -409,7 +409,7 @@ "temperature": 15.6, "setpoint": 5.5, "battery": 68, - "temperature_difference": 0, + "temperature_difference": 0.0, "valve_position": 0 } } diff --git a/tests/data/adam/adam_plus_anna.json b/tests/data/adam/adam_plus_anna.json index bb5f2a80e..be742da7b 100644 --- a/tests/data/adam/adam_plus_anna.json +++ b/tests/data/adam/adam_plus_anna.json @@ -5,10 +5,10 @@ "model": "Generic heater", "name": "OpenTherm", "maximum_boiler_temperature": { - "setpoint": 80, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 80.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "available": false, "binary_sensors": { @@ -17,8 +17,8 @@ "flame_state": false }, "sensors": { - "water_temperature": 48, - "intended_boiler_temperature": 0 + "water_temperature": 48.0, + "intended_boiler_temperature": 0.0 }, "switches": { "dhw_cm_switch": false @@ -35,9 +35,9 @@ "available": true, "sensors": { "electricity_consumed": 10.3, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -70,8 +70,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 20.5, - "lower_bound": 1, - "upper_bound": 35, + "lower_bound": 1.0, + "upper_bound": 35.0, "resolution": 0.01 }, "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], @@ -95,8 +95,8 @@ "sensors": { "electricity_consumed": 80.5, "electricity_consumed_interval": 7.03, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, diff --git a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json index 17fa397cb..1ff5bd24f 100644 --- a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json +++ b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json @@ -15,8 +15,8 @@ }, "2568cc4b9c1e401495d4741a5f89bee1": { "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0 }, "switches": { "relay": false, diff --git a/tests/data/adam/adam_zone_per_device.json b/tests/data/adam/adam_zone_per_device.json index 0e10d6b41..1789dd167 100644 --- a/tests/data/adam/adam_zone_per_device.json +++ b/tests/data/adam/adam_zone_per_device.json @@ -9,8 +9,8 @@ "zigbee_mac_address": "ABCD012345670A06", "vendor": "Plugwise", "thermostat": { - "setpoint": 13, - "lower_bound": 0, + "setpoint": 13.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -29,7 +29,7 @@ "climate_mode": "heat", "sensors": { "temperature": 16.5, - "setpoint": 13, + "setpoint": 13.0, "battery": 67 } }, @@ -62,7 +62,7 @@ "available": true, "sensors": { "temperature": 17.1, - "setpoint": 13, + "setpoint": 13.0, "battery": 62, "temperature_difference": -0.1, "valve_position": 0 @@ -79,7 +79,7 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 21.5, - "lower_bound": 0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -132,7 +132,7 @@ "available": true, "sensors": { "temperature": 16.9, - "setpoint": 16, + "setpoint": 16.0, "battery": 62, "temperature_difference": 0.1, "valve_position": 0 @@ -150,8 +150,8 @@ "sensors": { "electricity_consumed": 80.1, "electricity_consumed_interval": 12.7, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -170,8 +170,8 @@ "sensors": { "electricity_consumed": 35.8, "electricity_consumed_interval": 5.85, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true @@ -186,8 +186,8 @@ "heating_state": true }, "sensors": { - "water_temperature": 70, - "intended_boiler_temperature": 70, + "water_temperature": 70.0, + "intended_boiler_temperature": 70.0, "modulation_level": 1 } }, @@ -203,8 +203,8 @@ "sensors": { "electricity_consumed": 16.5, "electricity_consumed_interval": 0.29, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -222,9 +222,9 @@ "available": true, "sensors": { "electricity_consumed": 8.5, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -243,8 +243,8 @@ "sensors": { "electricity_consumed": 34, "electricity_consumed_interval": 8.65, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -262,9 +262,9 @@ "available": true, "sensors": { "electricity_consumed": 12.5, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -281,8 +281,8 @@ "zigbee_mac_address": "ABCD012345670A03", "vendor": "Plugwise", "thermostat": { - "setpoint": 16, - "lower_bound": 0, + "setpoint": 16.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -301,7 +301,7 @@ "climate_mode": "auto", "sensors": { "temperature": 17.1, - "setpoint": 16, + "setpoint": 16.0, "battery": 37 } }, @@ -317,7 +317,7 @@ "available": true, "sensors": { "temperature": 19.1, - "setpoint": 14, + "setpoint": 14.0, "battery": 51, "temperature_difference": -0.3, "valve_position": 0 @@ -333,8 +333,8 @@ "zigbee_mac_address": "ABCD012345670A08", "vendor": "Plugwise", "thermostat": { - "setpoint": 14, - "lower_bound": 0, + "setpoint": 14.0, + "lower_bound": 0.0, "upper_bound": 99.9, "resolution": 0.01 }, @@ -353,7 +353,7 @@ "climate_mode": "auto", "sensors": { "temperature": 18.8, - "setpoint": 14, + "setpoint": 14.0, "battery": 92 } }, @@ -369,8 +369,8 @@ "sensors": { "electricity_consumed": 12.2, "electricity_consumed_interval": 2.8, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -388,8 +388,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 5.5, - "lower_bound": 0, - "upper_bound": 100, + "lower_bound": 0.0, + "upper_bound": 100.0, "resolution": 0.01 }, "available": true, diff --git a/tests/data/anna/anna_elga_2.json b/tests/data/anna/anna_elga_2.json index e3e750bb1..1530cb866 100644 --- a/tests/data/anna/anna_elga_2.json +++ b/tests/data/anna/anna_elga_2.json @@ -12,7 +12,7 @@ "plugwise_notification": false }, "sensors": { - "outdoor_temperature": 13 + "outdoor_temperature": 13.0 } }, "573c152e7d4f4720878222bd75638f5b": { @@ -22,10 +22,10 @@ "name": "OpenTherm", "vendor": "Techneco", "maximum_boiler_temperature": { - "setpoint": 60, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 60.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "available": true, "binary_sensors": { @@ -39,12 +39,12 @@ }, "sensors": { "water_temperature": 22.8, - "domestic_hot_water_setpoint": 60, - "intended_boiler_temperature": 0, + "domestic_hot_water_setpoint": 60.0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, "return_temperature": 23.4, "water_pressure": 0.5, - "outdoor_air_temperature": 14 + "outdoor_air_temperature": 14.0 }, "switches": { "dhw_cm_switch": true @@ -60,9 +60,9 @@ "vendor": "Plugwise", "thermostat": { "setpoint_low": 19.5, - "setpoint_high": 30, - "lower_bound": 4, - "upper_bound": 30, + "setpoint_high": 30.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], @@ -73,10 +73,10 @@ "sensors": { "temperature": 20.9, "illuminance": 0.5, - "cooling_activation_outdoor_temperature": 26, - "cooling_deactivation_threshold": 3, + "cooling_activation_outdoor_temperature": 26.0, + "cooling_deactivation_threshold": 3.0, "setpoint_low": 19.5, - "setpoint_high": 30 + "setpoint_high": 30.0 } } } diff --git a/tests/data/anna/anna_elga_2_cooling.json b/tests/data/anna/anna_elga_2_cooling.json index e87000080..d74c77fbf 100644 --- a/tests/data/anna/anna_elga_2_cooling.json +++ b/tests/data/anna/anna_elga_2_cooling.json @@ -13,18 +13,18 @@ "dev_class": "heater_central", "location": "d34dfe6ab90b410c98068e75de3eb631", "maximum_boiler_temperature": { - "lower_bound": 0, - "resolution": 1, - "setpoint": 60, - "upper_bound": 100 + "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, - "intended_boiler_temperature": 0, + "domestic_hot_water_setpoint": 60.0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, - "outdoor_air_temperature": 30, + "outdoor_air_temperature": 30.0, "return_temperature": 23.4, "water_pressure": 0.5, "water_temperature": 22.8 @@ -47,19 +47,19 @@ "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], "select_schedule": "Thermostat schedule", "sensors": { - "cooling_activation_outdoor_temperature": 26, - "cooling_deactivation_threshold": 3, + "cooling_activation_outdoor_temperature": 26.0, + "cooling_deactivation_threshold": 3.0, "illuminance": 0.5, - "setpoint_high": 23, - "setpoint_low": 4, + "setpoint_high": 23.0, + "setpoint_low": 4.0, "temperature": 24.9 }, "thermostat": { - "lower_bound": 4, + "lower_bound": 4.0, "resolution": 0.1, - "setpoint_high": 23, - "setpoint_low": 4, - "upper_bound": 30 + "setpoint_high": 23.0, + "setpoint_low": 4.0, + "upper_bound": 30.0 }, "vendor": "Plugwise" }, @@ -75,7 +75,7 @@ "model": "Gateway", "name": "Smile Anna", "sensors": { - "outdoor_temperature": 31 + "outdoor_temperature": 31.0 }, "vendor": "Plugwise" } diff --git a/tests/data/anna/anna_elga_2_schedule_off.json b/tests/data/anna/anna_elga_2_schedule_off.json index 3d6960806..714c68de8 100644 --- a/tests/data/anna/anna_elga_2_schedule_off.json +++ b/tests/data/anna/anna_elga_2_schedule_off.json @@ -9,9 +9,9 @@ "vendor": "Plugwise", "thermostat": { "setpoint_low": 19.5, - "setpoint_high": 30, - "lower_bound": 4, - "upper_bound": 30, + "setpoint_high": 30.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["away", "no_frost", "vacation", "home", "asleep"], @@ -22,10 +22,10 @@ "sensors": { "temperature": 20.9, "illuminance": 0.5, - "cooling_activation_outdoor_temperature": 26, - "cooling_deactivation_threshold": 3, + "cooling_activation_outdoor_temperature": 26.0, + "cooling_deactivation_threshold": 3.0, "setpoint_low": 19.5, - "setpoint_high": 30 + "setpoint_high": 30.0 } } } diff --git a/tests/data/anna/anna_elga_no_cooling.json b/tests/data/anna/anna_elga_no_cooling.json index 9159bfbb3..320e43349 100644 --- a/tests/data/anna/anna_elga_no_cooling.json +++ b/tests/data/anna/anna_elga_no_cooling.json @@ -22,15 +22,15 @@ "name": "OpenTherm", "vendor": "Techneco", "maximum_boiler_temperature": { - "setpoint": 60, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 60.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "max_dhw_temperature": { - "setpoint": 53, - "lower_bound": 35, - "upper_bound": 60, + "setpoint": 53.0, + "lower_bound": 35.0, + "upper_bound": 60.0, "resolution": 0.01 }, "available": true, @@ -44,11 +44,11 @@ "sensors": { "water_temperature": 29.1, "dhw_temperature": 46.3, - "intended_boiler_temperature": 35, + "intended_boiler_temperature": 35.0, "modulation_level": 52, "return_temperature": 25.1, "water_pressure": 1.57, - "outdoor_air_temperature": 3 + "outdoor_air_temperature": 3.0 }, "switches": { "dhw_cm_switch": false @@ -63,15 +63,15 @@ "name": "Anna", "vendor": "Plugwise", "temperature_offset": { - "lower_bound": -2, + "lower_bound": -2.0, "resolution": 0.1, - "upper_bound": 2, + "upper_bound": 2.0, "setpoint": -0.5 }, "thermostat": { "setpoint": 20.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], @@ -82,9 +82,9 @@ "sensors": { "setpoint": 20.5, "temperature": 19.3, - "illuminance": 86, - "cooling_activation_outdoor_temperature": 21, - "cooling_deactivation_threshold": 4 + "illuminance": 86.0, + "cooling_activation_outdoor_temperature": 21.0, + "cooling_deactivation_threshold": 4.0 } } } diff --git a/tests/data/anna/anna_heatpump_cooling.json b/tests/data/anna/anna_heatpump_cooling.json index 1f1c12bec..b69c6fff0 100644 --- a/tests/data/anna/anna_heatpump_cooling.json +++ b/tests/data/anna/anna_heatpump_cooling.json @@ -12,7 +12,7 @@ "plugwise_notification": false }, "sensors": { - "outdoor_temperature": 22 + "outdoor_temperature": 22.0 } }, "1cbf783bb11e4a7c8a6843dee3a86927": { @@ -22,10 +22,10 @@ "name": "OpenTherm", "vendor": "Techneco", "maximum_boiler_temperature": { - "setpoint": 60, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 60.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "available": true, "binary_sensors": { @@ -39,12 +39,12 @@ }, "sensors": { "water_temperature": 24.7, - "domestic_hot_water_setpoint": 60, - "intended_boiler_temperature": 0, + "domestic_hot_water_setpoint": 60.0, + "intended_boiler_temperature": 0.0, "modulation_level": 40, "return_temperature": 23.8, "water_pressure": 1.61, - "outdoor_air_temperature": 22 + "outdoor_air_temperature": 22.0 }, "switches": { "dhw_cm_switch": false @@ -59,10 +59,10 @@ "name": "Anna", "vendor": "Plugwise", "thermostat": { - "setpoint_low": 4, - "setpoint_high": 22, - "lower_bound": 4, - "upper_bound": 30, + "setpoint_low": 4.0, + "setpoint_high": 22.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"], @@ -73,10 +73,10 @@ "sensors": { "temperature": 22.3, "illuminance": 24.5, - "cooling_activation_outdoor_temperature": 21, - "cooling_deactivation_threshold": 6, - "setpoint_low": 4, - "setpoint_high": 22 + "cooling_activation_outdoor_temperature": 21.0, + "cooling_deactivation_threshold": 6.0, + "setpoint_low": 4.0, + "setpoint_high": 22.0 } } } diff --git a/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json b/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json index e5ad81261..a36012587 100644 --- a/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json +++ b/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json @@ -6,10 +6,10 @@ "name": "OpenTherm", "vendor": "Techneco", "maximum_boiler_temperature": { - "setpoint": 60, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 60.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "available": true, "binary_sensors": { @@ -23,13 +23,13 @@ }, "sensors": { "water_temperature": 29.1, - "domestic_hot_water_setpoint": 60, + "domestic_hot_water_setpoint": 60.0, "dhw_temperature": 46.3, - "intended_boiler_temperature": 35, + "intended_boiler_temperature": 35.0, "modulation_level": 52, "return_temperature": 25.1, "water_pressure": 1.57, - "outdoor_air_temperature": 3 + "outdoor_air_temperature": 3.0 }, "switches": { "dhw_cm_switch": false diff --git a/tests/data/anna/anna_loria_cooling_active.json b/tests/data/anna/anna_loria_cooling_active.json index f19b38537..5902980e8 100644 --- a/tests/data/anna/anna_loria_cooling_active.json +++ b/tests/data/anna/anna_loria_cooling_active.json @@ -8,10 +8,10 @@ "name": "Anna", "vendor": "Plugwise", "thermostat": { - "setpoint_low": 4, + "setpoint_low": 4.0, "setpoint_high": 23.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], @@ -21,8 +21,8 @@ "climate_mode": "auto", "sensors": { "temperature": 24.1, - "illuminance": 45, - "setpoint_low": 4, + "illuminance": 45.0, + "setpoint_low": 4.0, "setpoint_high": 23.5 } }, @@ -35,15 +35,15 @@ "vendor": "Atlantic", "select_dhw_mode": "auto", "maximum_boiler_temperature": { - "setpoint": 40, - "lower_bound": 25, - "upper_bound": 45, + "setpoint": 40.0, + "lower_bound": 25.0, + "upper_bound": 45.0, "resolution": 0.01 }, "max_dhw_temperature": { - "setpoint": 53, - "lower_bound": 35, - "upper_bound": 60, + "setpoint": 53.0, + "lower_bound": 35.0, + "upper_bound": 60.0, "resolution": 0.01 }, "dhw_modes": ["off", "auto", "boost", "eco", "comfort"], @@ -58,7 +58,7 @@ "sensors": { "water_temperature": 25.3, "dhw_temperature": 52.9, - "intended_boiler_temperature": 0, + "intended_boiler_temperature": 0.0, "modulation_level": 100, "return_temperature": 26.3, "outdoor_air_temperature": 17.2 diff --git a/tests/data/anna/anna_loria_driessens.json b/tests/data/anna/anna_loria_driessens.json index 2a3df9a95..0c1b5689e 100644 --- a/tests/data/anna/anna_loria_driessens.json +++ b/tests/data/anna/anna_loria_driessens.json @@ -35,22 +35,22 @@ "select_schedule": "Verwarmen@9-23u", "sensors": { "illuminance": 5.5, - "setpoint_high": 30, - "setpoint_low": 20, + "setpoint_high": 30.0, + "setpoint_low": 20.0, "temperature": 21.2 }, "temperature_offset": { - "lower_bound": -2, + "lower_bound": -2.0, "resolution": 0.1, - "setpoint": 0, - "upper_bound": 2 + "setpoint": 0.0, + "upper_bound": 2.0 }, "thermostat": { - "lower_bound": 4, + "lower_bound": 4.0, "resolution": 0.1, - "setpoint_high": 30, - "setpoint_low": 20, - "upper_bound": 30 + "setpoint_high": 30.0, + "setpoint_low": 20.0, + "upper_bound": 30.0 }, "vendor": "Plugwise" }, @@ -67,16 +67,16 @@ "dhw_modes": ["comfort", "eco", "off", "boost", "auto"], "location": "82c15f65c9bf44c592d69e16139355e3", "max_dhw_temperature": { - "lower_bound": 35, + "lower_bound": 35.0, "resolution": 0.01, - "setpoint": 53, - "upper_bound": 60 + "setpoint": 53.0, + "upper_bound": 60.0 }, "maximum_boiler_temperature": { - "lower_bound": 25, + "lower_bound": 25.0, "resolution": 0.01, - "setpoint": 45, - "upper_bound": 45 + "setpoint": 45.0, + "upper_bound": 45.0 }, "model": "Generic heater/cooler", "model_id": "173", @@ -84,10 +84,10 @@ "select_dhw_mode": "auto", "sensors": { "dhw_temperature": 49.5, - "intended_boiler_temperature": 0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, "outdoor_air_temperature": 7.5, - "return_temperature": 23, + "return_temperature": 23.0, "water_temperature": 23.3 }, "switches": { diff --git a/tests/data/anna/anna_loria_heating_idle.json b/tests/data/anna/anna_loria_heating_idle.json index 31d93c54a..2ac87d7fd 100644 --- a/tests/data/anna/anna_loria_heating_idle.json +++ b/tests/data/anna/anna_loria_heating_idle.json @@ -9,9 +9,9 @@ "vendor": "Plugwise", "thermostat": { "setpoint_low": 20.5, - "setpoint_high": 30, - "lower_bound": 4, - "upper_bound": 30, + "setpoint_high": 30.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["away", "vacation", "no_frost", "home", "asleep"], @@ -21,9 +21,9 @@ "climate_mode": "auto", "sensors": { "temperature": 22.1, - "illuminance": 45, + "illuminance": 45.0, "setpoint_low": 20.5, - "setpoint_high": 30 + "setpoint_high": 30.0 } }, "bfb5ee0a88e14e5f97bfa725a760cc49": { @@ -35,15 +35,15 @@ "vendor": "Atlantic", "select_dhw_mode": "auto", "maximum_boiler_temperature": { - "setpoint": 40, - "lower_bound": 25, - "upper_bound": 45, + "setpoint": 40.0, + "lower_bound": 25.0, + "upper_bound": 45.0, "resolution": 0.01 }, "max_dhw_temperature": { - "setpoint": 53, - "lower_bound": 35, - "upper_bound": 60, + "setpoint": 53.0, + "lower_bound": 35.0, + "upper_bound": 60.0, "resolution": 0.01 }, "dhw_modes": ["off", "auto", "boost", "eco", "comfort"], @@ -58,7 +58,7 @@ "sensors": { "water_temperature": 25.3, "dhw_temperature": 52.9, - "intended_boiler_temperature": 0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, "return_temperature": 26.3, "outdoor_air_temperature": 17.2 diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index ae3dbace1..dbd089643 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -7,15 +7,15 @@ "name": "OpenTherm", "vendor": "Bosch Thermotechniek B.V.", "maximum_boiler_temperature": { - "setpoint": 70, - "lower_bound": 0, - "upper_bound": 100, + "setpoint": 70.0, + "lower_bound": 0.0, + "upper_bound": 100.0, "resolution": 1 }, "max_dhw_temperature": { - "setpoint": 60, - "lower_bound": 30, - "upper_bound": 60, + "setpoint": 60.0, + "lower_bound": 30.0, + "upper_bound": 60.0, "resolution": 0.01 }, "available": true, @@ -25,10 +25,10 @@ "flame_state": false }, "sensors": { - "water_temperature": 45, + "water_temperature": 45.0, "intended_boiler_temperature": 39.9, "modulation_level": 0, - "return_temperature": 32, + "return_temperature": 32.0, "water_pressure": 2.2 }, "switches": { @@ -45,8 +45,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 20.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], diff --git a/tests/data/anna/anna_v4_UPDATED_DATA.json b/tests/data/anna/anna_v4_UPDATED_DATA.json index 46d4876cc..a80745221 100644 --- a/tests/data/anna/anna_v4_UPDATED_DATA.json +++ b/tests/data/anna/anna_v4_UPDATED_DATA.json @@ -1,15 +1,15 @@ { "cd0e6156b1f04d5f952349ffbe397481": { "maximum_boiler_temperature": { - "setpoint": 69, - "lower_bound": 0, - "upper_bound": 100, - "resolution": 1 + "setpoint": 69.0, + "lower_bound": 0.0, + "upper_bound": 100.0, + "resolution": 1.0 }, "max_dhw_temperature": { - "setpoint": 59, - "lower_bound": 30, - "upper_bound": 60, + "setpoint": 59.0, + "lower_bound": 30.0, + "upper_bound": 60.0, "resolution": 0.01 }, "binary_sensors": { @@ -18,10 +18,10 @@ "flame_state": false }, "sensors": { - "water_temperature": 51, - "intended_boiler_temperature": 0, + "water_temperature": 51.0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, - "return_temperature": 41, + "return_temperature": 41.0, "water_pressure": 2.1 }, "switches": { @@ -31,8 +31,8 @@ "01b85360fdd243d0aaad4d6ac2a5ba7e": { "thermostat": { "setpoint": 19.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "active_preset": "away", diff --git a/tests/data/anna/anna_v4_dhw.json b/tests/data/anna/anna_v4_dhw.json index 26983ad4f..2b3252a82 100644 --- a/tests/data/anna/anna_v4_dhw.json +++ b/tests/data/anna/anna_v4_dhw.json @@ -7,15 +7,15 @@ "name": "OpenTherm", "vendor": "Bosch Thermotechniek B.V.", "maximum_boiler_temperature": { - "setpoint": 70, - "lower_bound": 0, - "upper_bound": 100, + "setpoint": 70.0, + "lower_bound": 0.0, + "upper_bound": 100.0, "resolution": 1 }, "max_dhw_temperature": { - "setpoint": 60, - "lower_bound": 30, - "upper_bound": 60, + "setpoint": 60.0, + "lower_bound": 30.0, + "upper_bound": 60.0, "resolution": 0.01 }, "available": true, @@ -25,10 +25,10 @@ "flame_state": true }, "sensors": { - "water_temperature": 45, + "water_temperature": 45.0, "intended_boiler_temperature": 39.9, "modulation_level": 0, - "return_temperature": 32, + "return_temperature": 32.0, "water_pressure": 2.2 }, "switches": { @@ -45,8 +45,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 20.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], diff --git a/tests/data/anna/anna_without_boiler_fw441.json b/tests/data/anna/anna_without_boiler_fw441.json index 07b7a815a..c175ef90e 100644 --- a/tests/data/anna/anna_without_boiler_fw441.json +++ b/tests/data/anna/anna_without_boiler_fw441.json @@ -24,9 +24,9 @@ "name": "Anna", "vendor": "Plugwise", "thermostat": { - "setpoint": 19, - "lower_bound": 4, - "upper_bound": 30, + "setpoint": 19.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["no_frost", "asleep", "away", "vacation", "home"], @@ -36,7 +36,7 @@ "climate_mode": "auto", "sensors": { "temperature": 19.1, - "setpoint": 19, + "setpoint": 19.0, "illuminance": 0.25 } }, diff --git a/tests/data/anna/legacy_anna.json b/tests/data/anna/legacy_anna.json index 23f2dbaa6..8e0a058ed 100644 --- a/tests/data/anna/legacy_anna.json +++ b/tests/data/anna/legacy_anna.json @@ -18,8 +18,8 @@ "vendor": "Plugwise", "thermostat": { "setpoint": 20.5, - "lower_bound": 4, - "upper_bound": 30, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["away", "vacation", "asleep", "home", "no_frost"], @@ -38,10 +38,10 @@ "name": "OpenTherm", "vendor": "Bosch Thermotechniek B.V.", "maximum_boiler_temperature": { - "setpoint": 50, - "lower_bound": 50, - "upper_bound": 90, - "resolution": 1 + "setpoint": 50.0, + "lower_bound": 50.0, + "upper_bound": 90.0, + "resolution": 1.0 }, "binary_sensors": { "flame_state": true, @@ -50,7 +50,7 @@ "sensors": { "water_temperature": 23.6, "dhw_temperature": 51.2, - "intended_boiler_temperature": 17, + "intended_boiler_temperature": 17.0, "modulation_level": 0, "return_temperature": 21.7, "water_pressure": 1.2 diff --git a/tests/data/anna/legacy_anna_2.json b/tests/data/anna/legacy_anna_2.json index 128479eb8..4721af5b6 100644 --- a/tests/data/anna/legacy_anna_2.json +++ b/tests/data/anna/legacy_anna_2.json @@ -8,7 +8,7 @@ "name": "Smile Anna", "vendor": "Plugwise", "sensors": { - "outdoor_temperature": 21 + "outdoor_temperature": 21.0 } }, "9e7377867dc24e51b8098a5ba02bd89d": { @@ -20,9 +20,9 @@ "name": "Anna", "vendor": "Plugwise", "thermostat": { - "setpoint": 15, - "lower_bound": 4, - "upper_bound": 30, + "setpoint": 15.0, + "lower_bound": 4.0, + "upper_bound": 30.0, "resolution": 0.1 }, "preset_modes": ["vacation", "away", "no_frost", "home", "asleep"], @@ -33,7 +33,7 @@ "sensors": { "temperature": 21.4, "illuminance": 19.5, - "setpoint": 15 + "setpoint": 15.0 } }, "ea5d8a7177e541b0a4b52da815166de4": { @@ -42,21 +42,21 @@ "model": "Generic heater", "name": "OpenTherm", "maximum_boiler_temperature": { - "setpoint": 70, - "lower_bound": 50, - "upper_bound": 90, - "resolution": 1 + "setpoint": 70.0, + "lower_bound": 50.0, + "upper_bound": 90.0, + "resolution": 1.0 }, "binary_sensors": { "flame_state": false, "heating_state": false }, "sensors": { - "water_temperature": 54, + "water_temperature": 54.0, "dhw_temperature": 0.0, - "intended_boiler_temperature": 0, + "intended_boiler_temperature": 0.0, "modulation_level": 0, - "return_temperature": 0, + "return_temperature": 0.0, "water_pressure": 1.7 } } diff --git a/tests/data/p1/p1v4.json b/tests/data/p1/p1v4.json index 1ec9235f3..79010398d 100644 --- a/tests/data/p1/p1v4.json +++ b/tests/data/p1/p1v4.json @@ -21,20 +21,20 @@ "vendor": "SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.", "available": false, "sensors": { - "net_electricity_point": 571, - "electricity_consumed_peak_point": 571, - "electricity_consumed_off_peak_point": 0, + "net_electricity_point": 571.0, + "electricity_consumed_peak_point": 571.0, + "electricity_consumed_off_peak_point": 0.0, "net_electricity_cumulative": 20983.453, "electricity_consumed_peak_cumulative": 9067.554, "electricity_consumed_off_peak_cumulative": 11915.899, - "electricity_consumed_peak_interval": 335, - "electricity_consumed_off_peak_interval": 0, - "electricity_produced_peak_point": 0, - "electricity_produced_off_peak_point": 0, - "electricity_produced_peak_cumulative": 0, - "electricity_produced_off_peak_cumulative": 0, - "electricity_produced_peak_interval": 0, - "electricity_produced_off_peak_interval": 0 + "electricity_consumed_peak_interval": 335.0, + "electricity_consumed_off_peak_interval": 0.0, + "electricity_produced_peak_point": 0.0, + "electricity_produced_off_peak_point": 0.0, + "electricity_produced_peak_cumulative": 0.0, + "electricity_produced_off_peak_cumulative": 0.0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0 } } } diff --git a/tests/data/p1/p1v4_442_single.json b/tests/data/p1/p1v4_442_single.json index 31e74022d..92c645776 100644 --- a/tests/data/p1/p1v4_442_single.json +++ b/tests/data/p1/p1v4_442_single.json @@ -21,22 +21,22 @@ "vendor": "SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD.", "available": true, "sensors": { - "net_electricity_point": 486, - "electricity_consumed_peak_point": 0, - "electricity_consumed_off_peak_point": 486, + "net_electricity_point": 486.0, + "electricity_consumed_peak_point": 0.0, + "electricity_consumed_off_peak_point": 486.0, "net_electricity_cumulative": 31610.031, "electricity_consumed_peak_cumulative": 13966.608, "electricity_consumed_off_peak_cumulative": 17643.423, - "electricity_consumed_peak_interval": 0, - "electricity_consumed_off_peak_interval": 15, - "electricity_produced_peak_point": 0, - "electricity_produced_off_peak_point": 0, - "electricity_produced_peak_cumulative": 0, - "electricity_produced_off_peak_cumulative": 0, - "electricity_produced_peak_interval": 0, - "electricity_produced_off_peak_interval": 0, - "electricity_phase_one_consumed": 486, - "electricity_phase_one_produced": 0 + "electricity_consumed_peak_interval": 0.0, + "electricity_consumed_off_peak_interval": 15.0, + "electricity_produced_peak_point": 0.0, + "electricity_produced_off_peak_point": 0.0, + "electricity_produced_peak_cumulative": 0.0, + "electricity_produced_off_peak_cumulative": 0.0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0, + "electricity_phase_one_consumed": 486.0, + "electricity_phase_one_produced": 0.0 } } } diff --git a/tests/data/p1/p1v4_442_single_UPDATED_DATA.json b/tests/data/p1/p1v4_442_single_UPDATED_DATA.json index c8df13efe..1033342ef 100644 --- a/tests/data/p1/p1v4_442_single_UPDATED_DATA.json +++ b/tests/data/p1/p1v4_442_single_UPDATED_DATA.json @@ -1,19 +1,19 @@ { "ba4de7613517478da82dd9b6abea36af": { "sensors": { - "net_electricity_point": -2248, - "electricity_consumed_peak_point": 0, - "electricity_consumed_off_peak_point": 0, - "electricity_consumed_peak_interval": 0, - "electricity_consumed_off_peak_interval": 0, - "electricity_produced_peak_point": 2248, - "electricity_produced_off_peak_point": 0, + "net_electricity_point": -2248.0, + "electricity_consumed_peak_point": 0.0, + "electricity_consumed_off_peak_point": 0.0, + "electricity_consumed_peak_interval": 0.0, + "electricity_consumed_off_peak_interval": 0.0, + "electricity_produced_peak_point": 2248.0, + "electricity_produced_off_peak_point": 0.0, "electricity_produced_peak_cumulative": 6.543, - "electricity_produced_off_peak_cumulative": 0, - "electricity_produced_peak_interval": 1345, - "electricity_produced_off_peak_interval": 0, - "electricity_phase_one_consumed": 0, - "electricity_phase_one_produced": 1998 + "electricity_produced_off_peak_cumulative": 0.0, + "electricity_produced_peak_interval": 1345.0, + "electricity_produced_off_peak_interval": 0.0, + "electricity_phase_one_consumed": 0.0, + "electricity_phase_one_produced": 1998.0 } } } diff --git a/tests/data/p1/p1v4_442_triple.json b/tests/data/p1/p1v4_442_triple.json index 3985ee140..84780b497 100644 --- a/tests/data/p1/p1v4_442_triple.json +++ b/tests/data/p1/p1v4_442_triple.json @@ -21,26 +21,26 @@ "vendor": "XEMEX NV", "available": true, "sensors": { - "net_electricity_point": 5553, - "electricity_consumed_peak_point": 0, - "electricity_consumed_off_peak_point": 5553, + "net_electricity_point": 5553.0, + "electricity_consumed_peak_point": 0.0, + "electricity_consumed_off_peak_point": 5553.0, "net_electricity_cumulative": 231866.539, "electricity_consumed_peak_cumulative": 161328.641, "electricity_consumed_off_peak_cumulative": 70537.898, - "electricity_consumed_peak_interval": 0, - "electricity_consumed_off_peak_interval": 314, - "electricity_produced_peak_point": 0, - "electricity_produced_off_peak_point": 0, - "electricity_produced_peak_cumulative": 0, - "electricity_produced_off_peak_cumulative": 0, - "electricity_produced_peak_interval": 0, - "electricity_produced_off_peak_interval": 0, - "electricity_phase_one_consumed": 1763, - "electricity_phase_two_consumed": 1703, - "electricity_phase_three_consumed": 2080, - "electricity_phase_one_produced": 0, - "electricity_phase_two_produced": 0, - "electricity_phase_three_produced": 0, + "electricity_consumed_peak_interval": 0.0, + "electricity_consumed_off_peak_interval": 314.0, + "electricity_produced_peak_point": 0.0, + "electricity_produced_off_peak_point": 0.0, + "electricity_produced_peak_cumulative": 0.0, + "electricity_produced_off_peak_cumulative": 0.0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0, + "electricity_phase_one_consumed": 1763.0, + "electricity_phase_two_consumed": 1703.0, + "electricity_phase_three_consumed": 2080.0, + "electricity_phase_one_produced": 0.0, + "electricity_phase_two_produced": 0.0, + "electricity_phase_three_produced": 0.0, "gas_consumed_cumulative": 16811.37, "gas_consumed_interval": 0.06, "voltage_phase_one": 233.2, diff --git a/tests/data/p1/smile_p1_v2.json b/tests/data/p1/smile_p1_v2.json index 163114972..298fcfc1c 100644 --- a/tests/data/p1/smile_p1_v2.json +++ b/tests/data/p1/smile_p1_v2.json @@ -15,18 +15,18 @@ "name": "P1", "vendor": "Ene5\\T210-DESMR5.0", "sensors": { - "net_electricity_point": 458, - "electricity_consumed_point": 458, + "net_electricity_point": 458.0, + "electricity_consumed_point": 458.0, "net_electricity_cumulative": 1019.201, "electricity_consumed_peak_cumulative": 1155.195, "electricity_consumed_off_peak_cumulative": 1642.74, - "electricity_consumed_peak_interval": 250, - "electricity_consumed_off_peak_interval": 0, - "electricity_produced_point": 0, + "electricity_consumed_peak_interval": 250.0, + "electricity_consumed_off_peak_interval": 0.0, + "electricity_produced_point": 0.0, "electricity_produced_peak_cumulative": 1296.136, "electricity_produced_off_peak_cumulative": 482.598, - "electricity_produced_peak_interval": 0, - "electricity_produced_off_peak_interval": 0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0, "gas_consumed_cumulative": 584.433, "gas_consumed_interval": 0.016 } diff --git a/tests/data/p1/smile_p1_v2_2.json b/tests/data/p1/smile_p1_v2_2.json index 44827f1ef..bb59a0476 100644 --- a/tests/data/p1/smile_p1_v2_2.json +++ b/tests/data/p1/smile_p1_v2_2.json @@ -15,18 +15,18 @@ "name": "P1", "vendor": "Ene5\\T210-DESMR5.0", "sensors": { - "net_electricity_point": 458, - "electricity_consumed_point": 458, + "net_electricity_point": 458.0, + "electricity_consumed_point": 458.0, "net_electricity_cumulative": 1019.201, "electricity_consumed_peak_cumulative": 1155.195, "electricity_consumed_off_peak_cumulative": 1642.74, - "electricity_consumed_peak_interval": 250, - "electricity_consumed_off_peak_interval": 0, - "electricity_produced_point": 0, + "electricity_consumed_peak_interval": 250.0, + "electricity_consumed_off_peak_interval": 0.0, + "electricity_produced_point": 0.0, "electricity_produced_peak_cumulative": 1296.136, "electricity_produced_off_peak_cumulative": 482.598, - "electricity_produced_peak_interval": 0, - "electricity_produced_off_peak_interval": 0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0, "gas_consumed_cumulative": 584.433, "gas_consumed_interval": 0.016 } diff --git a/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json b/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json index ad3cd8c35..088a6a609 100644 --- a/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json +++ b/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json @@ -1,16 +1,16 @@ { "199aa40f126840f392983d171374ab0b": { "sensors": { - "net_electricity_point": -2248, - "electricity_consumed_point": 0, + "net_electricity_point": -2248.0, + "electricity_consumed_point": 0.0, "net_electricity_cumulative": 1019.101, "electricity_consumed_peak_cumulative": 1155.295, "electricity_consumed_off_peak_cumulative": 1642.84, - "electricity_produced_point": 2248, + "electricity_produced_point": 2248.0, "electricity_produced_peak_cumulative": 1296.336, "electricity_produced_off_peak_cumulative": 482.698, "gas_consumed_cumulative": 585.433, - "gas_consumed_interval": 0 + "gas_consumed_interval": 0.0 } } } diff --git a/tests/data/stretch/stretch_v23.json b/tests/data/stretch/stretch_v23.json index 854ea55ba..fcea8cd82 100644 --- a/tests/data/stretch/stretch_v23.json +++ b/tests/data/stretch/stretch_v23.json @@ -19,9 +19,9 @@ "zigbee_mac_address": "ABCD012345670A01", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, @@ -38,10 +38,10 @@ "zigbee_mac_address": "ABCD012345670A13", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": false, @@ -60,8 +60,8 @@ "sensors": { "electricity_consumed": 2.06, "electricity_consumed_interval": 1.62, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -78,9 +78,9 @@ "zigbee_mac_address": "ABCD012345670A12", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, @@ -99,7 +99,7 @@ "sensors": { "electricity_consumed": 1.31, "electricity_consumed_interval": 0.21, - "electricity_produced": 0 + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -118,8 +118,8 @@ "sensors": { "electricity_consumed": 33.3, "electricity_consumed_interval": 4.93, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -136,10 +136,10 @@ "zigbee_mac_address": "ABCD012345670A15", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 4, + "electricity_consumed": 4.0, "electricity_consumed_interval": 0.58, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -156,10 +156,10 @@ "zigbee_mac_address": "ABCD012345670A14", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -178,7 +178,7 @@ "sensors": { "electricity_consumed": 3.5, "electricity_consumed_interval": 0.5, - "electricity_produced": 0 + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -195,9 +195,9 @@ "zigbee_mac_address": "ABCD012345670A08", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, @@ -214,10 +214,10 @@ "zigbee_mac_address": "ABCD012345670A05", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced_interval": 0.0 }, "switches": { "relay": false, @@ -234,9 +234,9 @@ "zigbee_mac_address": "ABCD012345670A07", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -253,9 +253,9 @@ "zigbee_mac_address": "ABCD012345670A09", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, @@ -272,9 +272,9 @@ "zigbee_mac_address": "ABCD012345670A16", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -293,8 +293,8 @@ "sensors": { "electricity_consumed": 4.19, "electricity_consumed_interval": 0.62, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, @@ -313,8 +313,8 @@ "sensors": { "electricity_consumed": 4.63, "electricity_consumed_interval": 0.65, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, diff --git a/tests/data/stretch/stretch_v27_no_domain.json b/tests/data/stretch/stretch_v27_no_domain.json index f8d9e1aa4..55a64d2c8 100644 --- a/tests/data/stretch/stretch_v27_no_domain.json +++ b/tests/data/stretch/stretch_v27_no_domain.json @@ -11,8 +11,8 @@ "sensors": { "electricity_consumed": 13.3, "electricity_consumed_interval": 7.77, - "electricity_produced": 0, - "electricity_produced_interval": 0 + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0 }, "switches": { "relay": true, diff --git a/tests/data/stretch/stretch_v31.json b/tests/data/stretch/stretch_v31.json index 12df0df7e..369300146 100644 --- a/tests/data/stretch/stretch_v31.json +++ b/tests/data/stretch/stretch_v31.json @@ -20,8 +20,8 @@ "vendor": "Plugwise", "sensors": { "electricity_consumed": 1.19, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -40,7 +40,7 @@ "sensors": { "electricity_consumed": 50.5, "electricity_consumed_interval": 0.08, - "electricity_produced": 0 + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -57,9 +57,9 @@ "zigbee_mac_address": "ABCD012345670A02", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, + "electricity_consumed": 0.0, "electricity_consumed_interval": 0.71, - "electricity_produced": 0 + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -76,9 +76,9 @@ "zigbee_mac_address": "ABCD012345670A04", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -95,9 +95,9 @@ "zigbee_mac_address": "ABCD012345670A01", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": true, diff --git a/tests/data/stretch/stretch_v31_UPDATED_DATA.json b/tests/data/stretch/stretch_v31_UPDATED_DATA.json index 3b37765c1..44a1049ef 100644 --- a/tests/data/stretch/stretch_v31_UPDATED_DATA.json +++ b/tests/data/stretch/stretch_v31_UPDATED_DATA.json @@ -1,9 +1,9 @@ { "aac7b735042c4832ac9ff33aae4f453b": { "sensors": { - "electricity_consumed": 1000, + "electricity_consumed": 1000.0, "electricity_consumed_interval": 20.7, - "electricity_produced": 0 + "electricity_produced": 0.0 }, "switches": { "relay": true, @@ -12,9 +12,9 @@ }, "cfe95cf3de1948c0b8955125bf754614": { "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, @@ -23,9 +23,9 @@ }, "059e4d03c7a34d278add5c7a4a781d19": { "sensors": { - "electricity_consumed": 0, - "electricity_consumed_interval": 0, - "electricity_produced": 0 + "electricity_consumed": 0.0, + "electricity_consumed_interval": 0.0, + "electricity_produced": 0.0 }, "switches": { "relay": false, From 16f1e098f7a9a59ce48e68ca3487612d405aaa25 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sun, 10 Nov 2024 19:55:32 +0100 Subject: [PATCH 06/11] Fix --- tests/data/adam/adam_heatpump_cooling.json | 4 ++-- tests/data/adam/adam_zone_per_device.json | 2 +- tests/data/stretch/stretch_v23.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/data/adam/adam_heatpump_cooling.json b/tests/data/adam/adam_heatpump_cooling.json index 0aabbb8ed..2790e3ea2 100644 --- a/tests/data/adam/adam_heatpump_cooling.json +++ b/tests/data/adam/adam_heatpump_cooling.json @@ -167,8 +167,8 @@ "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { - "setpoint": 18, - "temperature": 22 + "setpoint": 18.0, + "temperature": 22.0 }, "thermostat": { "lower_bound": 0.0, diff --git a/tests/data/adam/adam_zone_per_device.json b/tests/data/adam/adam_zone_per_device.json index 1789dd167..d9969d045 100644 --- a/tests/data/adam/adam_zone_per_device.json +++ b/tests/data/adam/adam_zone_per_device.json @@ -241,7 +241,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "electricity_consumed": 34, + "electricity_consumed": 34.0, "electricity_consumed_interval": 8.65, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 diff --git a/tests/data/stretch/stretch_v23.json b/tests/data/stretch/stretch_v23.json index fcea8cd82..1c3c8cbb2 100644 --- a/tests/data/stretch/stretch_v23.json +++ b/tests/data/stretch/stretch_v23.json @@ -216,7 +216,7 @@ "sensors": { "electricity_consumed": 0.0, "electricity_consumed_interval": 0.0, - "electricity_produced": 0, + "electricity_produced": 0.0, "electricity_produced_interval": 0.0 }, "switches": { From 96699d670c1c907e1a25a2e267658f8f8ee2d71b Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 12 Nov 2024 19:13:04 +0100 Subject: [PATCH 07/11] Type percentage-sensors as int --- plugwise/constants.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugwise/constants.py b/plugwise/constants.py index 56330facc..86c85b1cc 100644 --- a/plugwise/constants.py +++ b/plugwise/constants.py @@ -425,7 +425,7 @@ class SmileBinarySensors(TypedDict, total=False): class SmileSensors(TypedDict, total=False): """Smile Sensors class.""" - battery: float + battery: int cooling_activation_outdoor_temperature: float cooling_deactivation_threshold: float dhw_temperature: float @@ -457,10 +457,10 @@ class SmileSensors(TypedDict, total=False): electricity_produced_point: float gas_consumed_cumulative: float gas_consumed_interval: float - humidity: float + humidity: int illuminance: float intended_boiler_temperature: float - modulation_level: float + modulation_level: int net_electricity_cumulative: float net_electricity_point: float outdoor_air_temperature: float @@ -470,7 +470,7 @@ class SmileSensors(TypedDict, total=False): setpoint_high: float setpoint_low: float temperature_difference: float - valve_position: float + valve_position: int voltage_phase_one: float voltage_phase_two: float voltage_phase_three: float From 811c532626da2a09ba86b9181d7b8a996c2c7fa6 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 12 Nov 2024 19:20:53 +0100 Subject: [PATCH 08/11] Except humidity --- plugwise/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugwise/constants.py b/plugwise/constants.py index 86c85b1cc..da9cfe6e0 100644 --- a/plugwise/constants.py +++ b/plugwise/constants.py @@ -123,7 +123,7 @@ # radiator_valve: 'uncorrected_temperature', 'temperature_offset' DEVICE_MEASUREMENTS: Final[dict[str, DATA | UOM]] = { - "humidity": UOM(PERCENTAGE), # Specific for a Jip + "humidity": UOM(NONE), # Specific for a Jip "illuminance": UOM(UNIT_LUMEN), # Specific for an Anna "temperature": UOM(TEMP_CELSIUS), # HA Core thermostat current_temperature "thermostat": DATA("setpoint", TEMP_CELSIUS), # HA Core thermostat setpoint @@ -457,7 +457,7 @@ class SmileSensors(TypedDict, total=False): electricity_produced_point: float gas_consumed_cumulative: float gas_consumed_interval: float - humidity: int + humidity: float illuminance: float intended_boiler_temperature: float modulation_level: int From f9bdee9e3a530cb0e2d064440f58e7e7c0d8ad4e Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 12 Nov 2024 20:08:57 +0100 Subject: [PATCH 09/11] Update CHANGELOG --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4081ccbaf..2e0c55cfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## Ongoing +## v1.5.1 -- Fix typing of P1 sensors, energy-device-related improvements. +- Fix typing and rounding of P1 and thermostat sensors, energy-device-related code improvements. - Rename mode to climate_mode. ## v1.5.0 From 7095e9afc4284bff36650aa423e6e5b2f8700f42 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 12 Nov 2024 20:09:30 +0100 Subject: [PATCH 10/11] Bump to v1.5.1a4 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5db5faff2..73134f725 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "1.5.1a3" +version = "1.5.1a4" license = {file = "LICENSE"} description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md" From 46c74d7bfd1d6c59edfc6225e5681165e760b994 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Wed, 13 Nov 2024 18:58:33 +0100 Subject: [PATCH 11/11] Bump to release-version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 73134f725..c726b8ca9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "1.5.1a4" +version = "1.5.1" license = {file = "LICENSE"} description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md"