From a1691e5efd961252ba2e92366096eb3afb9e9a66 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sat, 11 Oct 2025 16:39:33 +0200 Subject: [PATCH 1/4] Update emma-related userdata --- .../adam_anna_new_2/core.domain_objects.xml | 689 +++++++++--------- 1 file changed, 354 insertions(+), 335 deletions(-) diff --git a/userdata/adam_anna_new_2/core.domain_objects.xml b/userdata/adam_anna_new_2/core.domain_objects.xml index 798be0f7c..7eaf948fd 100644 --- a/userdata/adam_anna_new_2/core.domain_objects.xml +++ b/userdata/adam_anna_new_2/core.domain_objects.xml @@ -49,34 +49,39 @@ - 000D6F000D13CB6F + 000D6F000D13CBA0 router true mains - + 255 2 child - - 250 - 15 + + 255 + 0 neighbor - + 254 15 neighbor - + 255 - 0 + 15 neighbor + + 255 + 2 + child + - 2025-10-11T10:06:15+02:00 + 2025-10-11T16:37:46+02:00 true @@ -86,7 +91,7 @@ A zone thermostat regulates the temperature in a heating zone (generally a room). zone_thermostat 2021-12-16T19:31:01.653+01:00 - 2025-10-11T10:05:40.227+02:00 + 2025-10-11T16:35:47.479+02:00 @@ -94,12 +99,12 @@ temperature C - 2025-10-11T10:05:40.221+02:00 - 2025-10-11T10:05:40.221+02:00 + 2025-10-11T16:35:47.475+02:00 + 2025-10-11T16:35:47.475+02:00 PT3H - - 18.80 + + 18.70 @@ -127,18 +132,18 @@ thermostat C - 2025-10-11T01:11:18.575+02:00 - 2025-10-11T01:11:18.575+02:00 + 2025-10-11T13:08:46.711+02:00 + 2025-10-11T13:08:46.711+02:00 - - 12.00 + + 12.00 - 2025-10-11T01:11:18.576+02:00 + 2025-10-11T13:08:46.712+02:00 thermostat 0 99.9 @@ -160,7 +165,7 @@ storageroom 2024-06-30T11:44:43.936+02:00 - 2025-10-11T10:00:15.670+02:00 + 2025-10-11T16:32:50.904+02:00 home @@ -178,21 +183,21 @@ electricity_produced W - 2025-10-11T10:00:15.621+02:00 + 2025-10-11T16:32:50.870+02:00 2025-10-08T17:54:28.840+02:00 - - 0.00 + + 0.00 electricity_consumed W - 2025-10-11T10:00:15.621+02:00 + 2025-10-11T16:32:50.870+02:00 2025-10-08T17:54:28.840+02:00 - - 0.69 + + 0.69 @@ -232,9 +237,12 @@ 2025-10-11T10:08:20.450+02:00 - 2025-10-11T10:08:46.472+02:00 + 2025-10-11T10:38:56.730+02:00 + + + @@ -250,20 +258,20 @@ - 60EFABFFFE89965C + 60EFABFFFE89CBA0 end_device true - unknown + battery - - 196 + + 14 0 - parent + sibling - 2025-10-11T10:08:20+02:00 + 2025-10-11T16:24:50+02:00 true @@ -273,7 +281,7 @@ building 2021-12-16T19:30:17.225+01:00 - 2025-10-11T10:04:00.727+02:00 + 2025-10-11T16:33:55.147+02:00 home @@ -282,56 +290,56 @@ weather_description - 2025-10-11T10:03:59+02:00 - 2025-10-11T10:03:59+02:00 + 2025-10-11T16:33:54+02:00 + 2025-10-11T16:33:54+02:00 - - overcast + + overcast humidity RH - 2025-10-11T10:03:59+02:00 - 2025-10-11T10:03:59+02:00 + 2025-10-11T16:33:54+02:00 + 2025-10-11T16:33:54+02:00 PT3H - - 88.00 + + 85.00 solar_irradiance W_m2 - 2025-10-11T10:03:59+02:00 - 2025-10-11T10:03:59+02:00 + 2025-10-11T16:33:54+02:00 + 2025-10-11T16:33:54+02:00 - - 61.38 + + 63.19 wind_vector m_s - 2025-10-11T10:03:59+02:00 - 2025-10-11T10:03:59+02:00 + 2025-10-11T16:33:54+02:00 + 2025-10-11T16:33:54+02:00 - - (0.45,259.00) + + (0.45,215.00) outdoor_temperature C - 2025-10-11T10:03:59+02:00 - 2025-10-11T10:03:59+02:00 + 2025-10-11T16:33:54+02:00 + 2025-10-11T16:33:54+02:00 PT3H - - 13.88 + + 15.56 @@ -419,34 +427,34 @@ - 000D6F000D13CCFD + 000D6F000D13CBA0 router true mains - + 255 2 child - - 254 + + 248 15 neighbor - + 254 15 neighbor - + 255 0 neighbor - 2025-10-11T10:04:31+02:00 + 2025-10-11T16:36:35+02:00 true @@ -475,7 +483,7 @@ A smart plug that can be switched on/off and measure power usage. hometheater 2021-12-16T19:30:45.677+01:00 - 2025-10-11T10:11:28.362+02:00 + 2025-10-11T16:36:23.875+02:00 @@ -485,62 +493,62 @@ electricity_consumed W - 2025-10-11T10:08:19.020+02:00 - 2025-10-11T10:08:19.020+02:00 + 2025-10-11T16:25:22.962+02:00 + 2025-10-11T16:25:22.962+02:00 - - 15.63 + + 15.81 electricity_produced W - 2025-10-11T10:08:19.020+02:00 - 2025-10-11T10:08:19.020+02:00 + 2025-10-11T16:25:22.962+02:00 + 2025-10-11T16:25:22.962+02:00 - - 0.00 + + 0.00 electricity_consumed Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:15:00+02:00 + 2025-10-11T16:00:00+02:00 PT15M - - 4.00 + + 3.00 relay - 2025-10-11T10:03:31.910+02:00 - 2025-10-11T10:03:31.910+02:00 + 2025-10-11T16:35:06.291+02:00 + 2025-10-11T16:35:06.291+02:00 - - on + + on electricity_produced Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:30:00+02:00 + 2025-10-11T16:15:00+02:00 PT15M - - 0.00 + + 0.00 - 2025-10-11T10:03:31.910+02:00 + 2025-10-11T16:35:06.291+02:00 false on @@ -572,7 +580,7 @@ A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint. thermostatic_radiator_valve 2021-12-16T19:32:25.043+01:00 - 2025-10-11T09:46:49.751+02:00 + 2025-10-11T15:42:55.143+02:00 @@ -591,34 +599,34 @@ temperature_difference C - 2025-10-11T09:16:06.414+02:00 - 2025-10-11T09:16:06.414+02:00 + 2025-10-11T14:15:20.692+02:00 + 2025-10-11T14:15:20.692+02:00 - - -0.40 + + -0.40 temperature C - 2025-10-11T09:46:49.745+02:00 - 2025-10-11T09:46:49.745+02:00 + 2025-10-11T15:42:55.138+02:00 + 2025-10-11T15:42:55.138+02:00 PT3H - - 19.07 + + 18.96 battery - 2025-10-11T02:49:08.924+02:00 - 2025-10-11T02:49:08.924+02:00 + 2025-10-11T14:47:18.554+02:00 + 2025-10-11T14:47:18.554+02:00 - - 0.60 + + 0.60 @@ -635,23 +643,23 @@ valve_position - 2025-10-11T02:47:29.187+02:00 - 2025-10-11T02:47:29.187+02:00 + 2025-10-11T14:45:38.819+02:00 + 2025-10-11T14:45:38.819+02:00 - - 0.00 + + 0.00 uncorrected_temperature C - 2025-10-11T09:46:49.745+02:00 - 2025-10-11T09:46:49.745+02:00 + 2025-10-11T15:42:55.138+02:00 + 2025-10-11T15:42:55.138+02:00 - - 19.07 + + 18.96 @@ -695,7 +703,7 @@ 2021-12-16T19:30:15.976+01:00 - 2025-10-11T10:11:26.714+02:00 + 2025-10-11T16:36:39.393+02:00 @@ -721,9 +729,9 @@ The room containing the (central) home thermostat. livingroom 2021-12-16T19:30:56.643+01:00 - 2025-10-11T10:13:01.603+02:00 + 2025-10-11T16:37:40.830+02:00 - vacation + home @@ -736,41 +744,41 @@ humidity RH - 2025-10-11T10:09:05.660+02:00 + 2025-10-11T13:39:00.750+02:00 PT3H - - 61.75 + + 63.88 temperature C - 2025-10-11T10:02:38.587+02:00 + 2025-10-11T16:31:59.769+02:00 2025-10-08T17:54:05.739+02:00 PT3H - - 18.81 + + 19.30 thermostat - 2025-10-11T10:13:01.153+02:00 + 2025-10-11T16:37:40.823+02:00 2025-10-08T17:54:24.750+02:00 - - 15.00 + + 21.00 electricity_consumed W - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 2025-10-08T17:53:08.019+02:00 - - 15.63 + + 64.81 @@ -783,11 +791,11 @@ electricity_produced W - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 2025-10-08T17:53:08.019+02:00 - - 0.00 + + 0.00 @@ -798,16 +806,16 @@ single - 2025-10-11T10:13:01.154+02:00 + 2025-10-11T16:37:35.547+02:00 thermostat 1 35 0.01 - 15 + 21 true true - off + heating active @@ -848,7 +856,7 @@ 2021-12-16T19:30:15.659+01:00 - 2025-10-11T10:08:21.061+02:00 + 2025-10-11T16:00:21.969+02:00 @@ -861,15 +869,15 @@ smile_open_therm AME Smile 2.0 board 3.9.0 - D40FB2019891 - D40FB2019892 + D40FB201CBA0 + D40FB201CBA0 abcdefgh true false 127.0.0.1 smile000000 - + Europe/Amsterdam enabled @@ -961,19 +969,19 @@ An OpenTherm Gateway open_therm_gateway 2021-12-16T19:30:28.533+01:00 - 2025-10-08T18:10:41.908+02:00 + 2025-10-11T11:33:44.931+02:00 override_mode - 2025-10-08T18:10:41.899+02:00 - 2025-10-08T18:10:41.899+02:00 + 2025-10-11T11:33:44.929+02:00 + 2025-10-11T11:33:44.929+02:00 - - on + + on @@ -1016,7 +1024,7 @@ A smart plug that can be switched on/off and measure power usage. water_heater_vessel 2021-12-16T19:30:42.936+01:00 - 2025-10-11T10:12:38.327+02:00 + 2025-10-11T16:33:10.667+02:00 @@ -1026,62 +1034,62 @@ electricity_produced Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:30:00+02:00 + 2025-10-11T16:15:00+02:00 PT15M - - 0.00 + + 0.00 electricity_produced W - 2025-10-11T10:00:15.621+02:00 - 2025-10-11T10:00:15.621+02:00 + 2025-10-11T16:32:50.870+02:00 + 2025-10-11T16:32:50.870+02:00 - - 0.00 + + 0.00 relay - 2025-10-11T10:12:38.311+02:00 - 2025-10-11T10:12:38.311+02:00 + 2025-10-11T16:30:41.189+02:00 + 2025-10-11T16:30:41.189+02:00 - - on + + on electricity_consumed Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:30:00+02:00 + 2025-10-11T16:15:00+02:00 PT15M - - 0.00 + + 0.00 electricity_consumed W - 2025-10-11T10:00:15.621+02:00 - 2025-10-11T10:00:15.621+02:00 + 2025-10-11T16:32:50.870+02:00 + 2025-10-11T16:32:50.870+02:00 - - 0.69 + + 0.69 - 2025-10-11T10:12:38.311+02:00 + 2025-10-11T16:30:41.189+02:00 true on @@ -1113,7 +1121,7 @@ - 000D6F000C869B61 + 000D6F000C86CBA0 end_device true battery @@ -1156,7 +1164,7 @@ pumping 2021-12-16T19:40:11.491+01:00 - 2025-10-11T10:13:03.016+02:00 + 2025-10-11T16:37:39.549+02:00 @@ -1173,31 +1181,31 @@ temperature C - 2025-10-11T10:13:02.981+02:00 + 2025-10-11T16:37:39.513+02:00 2025-10-08T17:54:29.731+02:00 PT3H - - 19.51 + + 19.93 electricity_consumed W - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 2025-10-08T17:42:01.640+02:00 - - 0.00 + + 49.00 electricity_produced W - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 2025-10-08T17:42:01.640+02:00 - - 0.00 + + 0.00 @@ -1214,7 +1222,7 @@ switching 2021-12-23T08:25:07.571+01:00 - 2025-10-11T10:08:19.097+02:00 + 2025-10-11T16:32:50.912+02:00 @@ -1231,21 +1239,21 @@ electricity_produced W - 2025-10-11T10:08:19.020+02:00 + 2025-10-11T16:32:50.870+02:00 2025-10-08T17:54:28.840+02:00 - - 0.00 + + 0.00 electricity_consumed W - 2025-10-11T10:08:19.020+02:00 + 2025-10-11T16:32:50.870+02:00 2025-10-08T17:54:28.840+02:00 - - 16.31 + + 16.50 @@ -1305,19 +1313,19 @@ - 70AC08FFFEE16437 + 70AC08FFFEE1CBA0 end_device true battery - + 43 0 sibling - 2025-10-11T10:02:41+02:00 + 2025-10-11T16:32:02+02:00 true @@ -1327,7 +1335,7 @@ heater_central 2021-12-16T19:30:21.331+01:00 - 2025-10-11T10:12:50.845+02:00 + 2025-10-11T16:37:38.138+02:00 @@ -1378,23 +1386,23 @@ central_heating_state - 2025-10-11T10:12:44.471+02:00 - 2025-10-11T10:12:44.471+02:00 + 2025-10-11T16:36:56.431+02:00 + 2025-10-11T16:36:56.431+02:00 - - off + + on intended_central_heating_state - 2025-10-11T10:11:26.707+02:00 - 2025-10-11T10:11:26.707+02:00 + 2025-10-11T16:36:39.384+02:00 + 2025-10-11T16:36:39.384+02:00 - - off + + on @@ -1411,12 +1419,12 @@ burner_starts - 2025-10-11T10:10:03+02:00 - 2025-10-11T10:10:03+02:00 + 2025-10-11T16:36:56+02:00 + 2025-10-11T16:36:56+02:00 - - 50212 + + 50220 @@ -1433,23 +1441,23 @@ boiler_temperature C - 2025-10-11T10:12:50.818+02:00 - 2025-10-11T10:12:50.818+02:00 + 2025-10-11T16:37:38.108+02:00 + 2025-10-11T16:37:38.108+02:00 PT1H - - 34.00 + + 35.00 intended_boiler_temperature C - 2025-10-11T10:11:56.804+02:00 - 2025-10-11T10:11:56.804+02:00 + 2025-10-11T16:37:28.155+02:00 + 2025-10-11T16:37:28.155+02:00 - - 0.00 + + 22.50 @@ -1466,23 +1474,23 @@ burner_operation_time s - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:00:00+02:00 + 2025-10-11T16:00:00+02:00 + 2025-10-11T15:00:00+02:00 PT1H - - 165 + + 15 burner_operation_time hr - 2025-05-07T07:41:16+02:00 - 2025-05-07T07:41:16+02:00 + 2025-10-11T11:39:08+02:00 + 2025-10-11T11:39:08+02:00 - - 11575 + + 11576 @@ -1499,12 +1507,12 @@ flame_state - 2025-10-11T10:11:40.815+02:00 - 2025-10-11T10:11:40.815+02:00 + 2025-10-11T16:36:56.445+02:00 + 2025-10-11T16:36:56.445+02:00 - - off + + on @@ -1571,7 +1579,7 @@ A smart plug that can be switched on/off and measure power usage. central_heating_pump 2021-12-16T19:30:44.323+01:00 - 2025-10-11T10:11:58.007+02:00 + 2025-10-11T16:36:57.695+02:00 @@ -1581,64 +1589,64 @@ electricity_consumed Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:15:00+02:00 + 2025-10-11T16:00:00+02:00 PT15M - - 0.00 + + 0.00 electricity_produced W - 2025-10-11T10:11:37.940+02:00 - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 + 2025-10-11T16:36:56.517+02:00 - - 0.00 + + 0.00 electricity_consumed W - 2025-10-11T10:11:37.940+02:00 - 2025-10-11T10:11:37.940+02:00 + 2025-10-11T16:36:56.517+02:00 + 2025-10-11T16:36:56.517+02:00 - - 0.00 + + 49.00 relay - 2025-10-11T10:11:58.003+02:00 - 2025-10-11T10:11:58.003+02:00 + 2025-10-11T16:36:57.691+02:00 + 2025-10-11T16:36:57.691+02:00 - - off + + on electricity_produced Wh - 2025-10-11T10:00:00+02:00 - 2025-10-11T09:45:00+02:00 + 2025-10-11T16:15:00+02:00 + 2025-10-11T16:00:00+02:00 PT15M - - 0.00 + + 0.00 - 2025-10-11T10:11:58.003+02:00 + 2025-10-11T16:36:57.691+02:00 false - off + on @@ -1654,26 +1662,26 @@ - 000D6F000D5A168D + 000D6F000D5ACBA0 false - - 253 + + 255 15 neighbor - + 255 15 neighbor - + 253 15 neighbor - 2025-10-11T10:01:42+02:00 + 2025-10-11T16:33:50+02:00 true 24 @@ -1685,7 +1693,7 @@ A Thermostat thermostat 2021-12-16T19:30:53.779+01:00 - 2025-10-11T10:13:02.992+02:00 + 2025-10-11T16:37:52.588+02:00 @@ -1695,45 +1703,45 @@ thermostat C - 2025-10-11T10:13:01.119+02:00 - 2025-10-11T10:13:01.119+02:00 + 2025-10-11T16:37:35.479+02:00 + 2025-10-11T16:37:35.479+02:00 - - 15.00 + + 21.00 intended_domestic_hot_water_comfort_mode - 2025-10-11T10:12:30.034+02:00 - 2025-10-11T10:12:30.034+02:00 + 2025-10-11T16:37:52.576+02:00 + 2025-10-11T16:37:52.576+02:00 - - on + + on intended_central_heating_state - 2025-10-11T10:12:30.034+02:00 - 2025-10-11T10:12:30.034+02:00 + 2025-10-11T16:37:52.576+02:00 + 2025-10-11T16:37:52.576+02:00 - - off + + on temperature C - 2025-10-11T10:13:02.981+02:00 - 2025-10-11T10:13:02.981+02:00 + 2025-10-11T16:37:39.513+02:00 + 2025-10-11T16:37:39.513+02:00 PT3H - - 19.51 + + 19.93 @@ -1750,12 +1758,12 @@ - 2025-10-11T10:13:01.120+02:00 + 2025-10-11T16:37:35.480+02:00 thermostat - 1 - 35 + 0 + 30 0.01 - 15 + 21 @@ -1766,7 +1774,7 @@ A zone thermostat regulates the temperature in a heating zone (generally a room). zone_thermostat 2025-10-11T10:08:21.040+02:00 - 2025-10-11T10:13:01.603+02:00 + 2025-10-11T16:37:40.846+02:00 @@ -1774,62 +1782,73 @@ temperature_offset C - 2025-10-11T10:08:40.659+02:00 - 2025-10-11T10:08:40.659+02:00 + 2025-10-11T10:38:25.054+02:00 + 2025-10-11T10:38:25.054+02:00 - - 0.00 + + 0.00 humidity RH - 2025-10-11T10:08:47.158+02:00 - 2025-10-11T10:08:47.158+02:00 + 2025-10-11T16:20:00.169+02:00 + 2025-10-11T16:20:00.169+02:00 PT3H - - 61.75 + + 65.00 temperature C - 2025-10-11T10:12:39.598+02:00 - 2025-10-11T10:12:39.598+02:00 + 2025-10-11T16:33:54.074+02:00 + 2025-10-11T16:33:54.074+02:00 PT3H - - 21.90 + + 19.49 + + + + battery + + 2025-10-11T10:38:57.595+02:00 + 2025-10-11T10:38:57.595+02:00 + + + + 1.00 thermostat C - 2025-10-11T10:13:01.039+02:00 - 2025-10-11T10:13:01.039+02:00 + 2025-10-11T16:37:40.823+02:00 + 2025-10-11T16:37:40.823+02:00 - - 15.00 + + 21.00 - 2025-10-11T10:08:40.660+02:00 + 2025-10-11T10:38:25.055+02:00 temperature_offset 0 - 2025-10-11T10:13:01.040+02:00 + 2025-10-11T16:37:40.824+02:00 thermostat -20 90 0.01 - 15 + 21 @@ -1840,7 +1859,7 @@ A zone thermometer measures temperature and relative humidity. zone_thermometer 2025-10-10T16:51:44.381+02:00 - 2025-10-11T10:13:01.504+02:00 + 2025-10-11T16:37:35.597+02:00 @@ -1859,34 +1878,34 @@ temperature C - 2025-10-11T10:02:38.587+02:00 - 2025-10-11T10:02:38.587+02:00 + 2025-10-11T16:31:59.769+02:00 + 2025-10-11T16:31:59.769+02:00 PT3H - - 18.81 + + 19.30 humidity RH - 2025-10-11T09:36:38.034+02:00 - 2025-10-11T09:36:38.034+02:00 + 2025-10-11T13:39:00.750+02:00 + 2025-10-11T13:39:00.750+02:00 PT3H - - 63.88 + + 63.88 thermostat C - 2025-10-11T10:13:01.153+02:00 - 2025-10-11T10:13:01.153+02:00 + 2025-10-11T16:37:35.546+02:00 + 2025-10-11T16:37:35.546+02:00 - - 15.00 + + 21.00 @@ -1900,12 +1919,12 @@ - 2025-10-11T10:13:01.154+02:00 + 2025-10-11T16:37:35.547+02:00 thermostat 4 30 0.01 - 15 + 21 @@ -1956,34 +1975,34 @@ - 000D6F000D13CA9A + 000D6F000D13CBA0 router true mains - + 254 15 neighbor - + 255 2 child - + 255 0 neighbor - - 253 + + 255 15 neighbor - 2025-10-11T10:07:45+02:00 + 2025-10-11T16:23:45+02:00 true @@ -2146,52 +2165,52 @@ Container for variables logged about the Gateway in general. gateway 2021-12-16T19:30:16.149+01:00 - 2025-10-11T10:12:43.905+02:00 + 2025-10-11T16:37:52.056+02:00 signal_strength dBm - 2025-10-11T10:10:45.431+02:00 - 2025-10-11T10:10:45.431+02:00 + 2025-10-11T16:36:16.350+02:00 + 2025-10-11T16:36:16.350+02:00 - - -66.00 + + -62.00 link_quality - 2025-10-11T10:10:45.431+02:00 - 2025-10-11T10:10:45.431+02:00 + 2025-10-11T16:36:16.350+02:00 + 2025-10-11T16:36:16.350+02:00 - - 44 + + 48 lan_state - 2025-10-11T10:12:43.885+02:00 - 2025-10-11T10:12:43.885+02:00 + 2025-10-11T16:37:52.035+02:00 + 2025-10-11T16:37:52.035+02:00 - - down + + down wlan_state - 2025-10-11T10:10:45.432+02:00 - 2025-10-11T10:10:45.432+02:00 + 2025-10-11T16:36:16.351+02:00 + 2025-10-11T16:36:16.351+02:00 - - up + + up @@ -2208,12 +2227,12 @@ lan_ip_address - 2025-10-11T10:12:43+02:00 - 2025-10-11T10:12:43+02:00 + 2025-10-11T16:37:52+02:00 + 2025-10-11T16:37:52+02:00 - - 0.0.0.0 + + 0.0.0.0 @@ -2230,12 +2249,12 @@ wlan_ip_address - 2025-10-11T10:10:45+02:00 - 2025-10-11T10:10:45+02:00 + 2025-10-11T16:36:16+02:00 + 2025-10-11T16:36:16+02:00 - - 127.0.0.1 + + 127.0.0.1 @@ -2350,7 +2369,7 @@ - 000D6F000C8FF5EE + 000D6F000C8FCBA0 end_device true battery @@ -2370,7 +2389,7 @@ bathroom 2021-12-16T19:37:57.444+01:00 - 2025-10-11T10:05:40.241+02:00 + 2025-10-11T16:35:47.492+02:00 vacation @@ -2392,21 +2411,21 @@ temperature C - 2025-10-11T10:05:40.221+02:00 + 2025-10-11T16:35:47.475+02:00 2025-10-08T17:53:00.620+02:00 PT3H - - 18.80 + + 18.70 thermostat C - 2025-10-11T01:11:18.575+02:00 + 2025-10-11T13:08:46.711+02:00 2025-10-08T13:24:00.674+02:00 - - 12.00 + + 12.00 From 8675504e12a22d40b399ef47ec4c69fc81dfb069 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sat, 11 Oct 2025 16:52:33 +0200 Subject: [PATCH 2/4] Save updated fixture, update related test-json --- fixtures/adam_anna_new_2/data.json | 107 ++++--- tests/data/adam/adam_anna_new_2.json | 445 ++++++++++++++------------- 2 files changed, 305 insertions(+), 247 deletions(-) diff --git a/fixtures/adam_anna_new_2/data.json b/fixtures/adam_anna_new_2/data.json index 8e3c4892e..40de96f5c 100644 --- a/fixtures/adam_anna_new_2/data.json +++ b/fixtures/adam_anna_new_2/data.json @@ -3,8 +3,8 @@ "available": true, "binary_sensors": { "dhw_state": false, - "flame_state": false, - "heating_state": false + "flame_state": true, + "heating_state": true }, "dev_class": "heater_central", "location": "bc93488efab249e5bc54fd7e175a6f91", @@ -17,8 +17,8 @@ "model": "Generic heater", "name": "OpenTherm", "sensors": { - "intended_boiler_temperature": 0.0, - "water_temperature": 34.0 + "intended_boiler_temperature": 22.5, + "water_temperature": 35.0 }, "switches": { "dhw_cm_switch": false @@ -26,6 +26,9 @@ }, "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": { "available": true, + "binary_sensors": { + "low_battery": false + }, "dev_class": "zone_thermostat", "hardware": "1", "location": "f2bf9048bef64cc5b6d5110154e33c81", @@ -33,9 +36,10 @@ "model_id": "170-01", "name": "Emma", "sensors": { - "humidity": 61.8, - "setpoint": 15.0, - "temperature": 21.9 + "battery": 100, + "humidity": 65.0, + "setpoint": 21.0, + "temperature": 19.5 }, "temperature_offset": { "lower_bound": -2.0, @@ -44,7 +48,7 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "60EFABFFFE89965C" + "zigbee_mac_address": "60EFABFFFE89CBA0" }, "1772a4ea304041adb83f357b751341ff": { "available": true, @@ -61,7 +65,7 @@ "sensors": { "battery": 60, "setpoint": 12.0, - "temperature": 19.1, + "temperature": 19.0, "temperature_difference": -0.4, "valve_position": 0.0 }, @@ -72,7 +76,7 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C8FF5EE" + "zigbee_mac_address": "000D6F000C8FCBA0" }, "2568cc4b9c1e401495d4741a5f89bee1": { "available": true, @@ -83,8 +87,8 @@ "model_id": "160-01", "name": "Plug MediaTV", "sensors": { - "electricity_consumed": 15.6, - "electricity_consumed_interval": 4.0, + "electricity_consumed": 15.8, + "electricity_consumed_interval": 3.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 }, @@ -93,7 +97,7 @@ "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CCFD" + "zigbee_mac_address": "000D6F000D13CBA0" }, "29542b2b6a6a4169acecc15c72a599b8": { "available": true, @@ -114,7 +118,7 @@ "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CA9A" + "zigbee_mac_address": "000D6F000D13CBA0" }, "854f8a9b0e7e425db97f1f110e1ce4b3": { "available": true, @@ -125,16 +129,16 @@ "model_id": "160-01", "name": "Plug Vloerverwarming", "sensors": { - "electricity_consumed": 0.0, + "electricity_consumed": 49.0, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 }, "switches": { - "relay": false + "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CB6F" + "zigbee_mac_address": "000D6F000D13CBA0" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { "dev_class": "thermostat", @@ -143,8 +147,8 @@ "model_id": "143.1", "name": "Anna", "sensors": { - "setpoint": 15.0, - "temperature": 19.5 + "setpoint": 21.0, + "temperature": 19.9 }, "vendor": "Plugwise" }, @@ -154,22 +158,31 @@ }, "dev_class": "gateway", "firmware": "3.9.0", - "gateway_modes": ["away", "full", "vacation"], + "gateway_modes": [ + "away", + "full", + "vacation" + ], "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "D40FB2019891", + "mac_address": "D40FB201CBA0", "model": "Gateway", "model_id": "smile_open_therm", "name": "Adam", "notifications": {}, - "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"], + "regulation_modes": [ + "bleeding_cold", + "heating", + "off", + "bleeding_hot" + ], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { - "outdoor_temperature": 13.9 + "outdoor_temperature": 15.6 }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D5A168D" + "zigbee_mac_address": "000D6F000D5ACBA0" }, "da575e9e09b947e281fb6e3ebce3b174": { "available": true, @@ -186,11 +199,11 @@ "sensors": { "battery": 100, "humidity": 63.9, - "setpoint": 15.0, - "temperature": 18.8 + "setpoint": 21.0, + "temperature": 19.3 }, "vendor": "Plugwise", - "zigbee_mac_address": "70AC08FFFEE16437" + "zigbee_mac_address": "70AC08FFFEE1CBA0" }, "e2f4322d57924fa090fbbc48b3a140dc": { "available": true, @@ -207,7 +220,7 @@ "sensors": { "battery": 71, "setpoint": 12.0, - "temperature": 18.8 + "temperature": 18.7 }, "temperature_offset": { "lower_bound": -2.0, @@ -216,7 +229,7 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C869B61" + "zigbee_mac_address": "000D6F000C86CBA0" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { "dev_class": "switching", @@ -232,7 +245,7 @@ "vendor": "Plugwise" }, "f2bf9048bef64cc5b6d5110154e33c81": { - "active_preset": "vacation", + "active_preset": "home", "available_schedules": [ "Badkamer", "Vakantie", @@ -241,21 +254,27 @@ "off" ], "climate_mode": "heat", - "control_state": "idle", + "control_state": "heating", "dev_class": "climate", "model": "ThermoZone", "name": "Living room", - "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], + "preset_modes": [ + "vacation", + "no_frost", + "asleep", + "home", + "away" + ], "select_schedule": "off", "sensors": { - "electricity_consumed": 15.6, + "electricity_consumed": 64.8, "electricity_produced": 0.0, - "temperature": 18.8 + "temperature": 19.3 }, "thermostat": { "lower_bound": 1.0, "resolution": 0.01, - "setpoint": 15.0, + "setpoint": 21.0, "upper_bound": 35.0 }, "thermostats": { @@ -282,12 +301,18 @@ "dev_class": "climate", "model": "ThermoZone", "name": "Bathroom", - "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], + "preset_modes": [ + "vacation", + "no_frost", + "asleep", + "home", + "away" + ], "select_schedule": "off", "sensors": { "electricity_consumed": 0.0, "electricity_produced": 0.0, - "temperature": 18.8 + "temperature": 18.7 }, "thermostat": { "lower_bound": 0.0, @@ -296,8 +321,12 @@ "upper_bound": 99.9 }, "thermostats": { - "primary": ["e2f4322d57924fa090fbbc48b3a140dc"], - "secondary": ["1772a4ea304041adb83f357b751341ff"] + "primary": [ + "e2f4322d57924fa090fbbc48b3a140dc" + ], + "secondary": [ + "1772a4ea304041adb83f357b751341ff" + ] }, "vendor": "Plugwise" } diff --git a/tests/data/adam/adam_anna_new_2.json b/tests/data/adam/adam_anna_new_2.json index 5b075dc9f..6f3ee681b 100644 --- a/tests/data/adam/adam_anna_new_2.json +++ b/tests/data/adam/adam_anna_new_2.json @@ -1,306 +1,335 @@ { "devices": { "056ee145a816487eaa69243c3280f8bf": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "dhw_state": false, - "flame_state": false, - "heating_state": false - }, - "dev_class": "heater_central", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "maximum_boiler_temperature": { + "flame_state": true, + "heating_state": true + }, + "dev_class": "heater_central", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "maximum_boiler_temperature": { "lower_bound": 25.0, "resolution": 0.01, "setpoint": 50.0, "upper_bound": 95.0 - }, - "model": "Generic heater", - "name": "OpenTherm", - "sensors": { - "intended_boiler_temperature": 0.0, - "water_temperature": 34.0 - }, - "switches": { + }, + "model": "Generic heater", + "name": "OpenTherm", + "sensors": { + "intended_boiler_temperature": 22.5, + "water_temperature": 35.0 + }, + "switches": { "dhw_cm_switch": false - } + } }, "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": { - "available": true, - "dev_class": "zone_thermostat", - "hardware": "1", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Emma", - "model_id": "170-01", - "name": "Emma", - "sensors": { - "humidity": 61.8, - "setpoint": 15.0, - "temperature": 21.9 - }, - "temperature_offset": { + "available": true, + "binary_sensors": { + "low_battery": false + }, + "dev_class": "zone_thermostat", + "hardware": "1", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Emma", + "model_id": "170-01", + "name": "Emma", + "sensors": { + "battery": 100, + "humidity": 65.0, + "setpoint": 21.0, + "temperature": 19.5 + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.0, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "60EFABFFFE89965C" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "60EFABFFFE89CBA0" }, "1772a4ea304041adb83f357b751341ff": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "thermostatic_radiator_valve", - "firmware": "2020-11-04T01:00:00+01:00", - "hardware": "1", - "location": "f871b8c4d63549319221e294e4f88074", - "model": "Tom/Floor", - "model_id": "106-03", - "name": "Tom Badkamer", - "sensors": { + }, + "dev_class": "thermostatic_radiator_valve", + "firmware": "2020-11-04T01:00:00+01:00", + "hardware": "1", + "location": "f871b8c4d63549319221e294e4f88074", + "model": "Tom/Floor", + "model_id": "106-03", + "name": "Tom Badkamer", + "sensors": { "battery": 60, "setpoint": 12.0, - "temperature": 19.1, + "temperature": 19.0, "temperature_difference": -0.4, "valve_position": 0.0 - }, - "temperature_offset": { + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.1, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C8FF5EE" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000C8FCBA0" }, "2568cc4b9c1e401495d4741a5f89bee1": { - "available": true, - "dev_class": "hometheater_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Plug", - "model_id": "160-01", - "name": "Plug MediaTV", - "sensors": { - "electricity_consumed": 15.6, - "electricity_consumed_interval": 4.0, + "available": true, + "dev_class": "hometheater_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Plug", + "model_id": "160-01", + "name": "Plug MediaTV", + "sensors": { + "electricity_consumed": 15.8, + "electricity_consumed_interval": 3.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { + }, + "switches": { "lock": false, "relay": true - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CCFD" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "29542b2b6a6a4169acecc15c72a599b8": { - "available": true, - "dev_class": "water_heater_vessel_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "8201a2ac4d1b4303bf994e18d67311eb", - "model": "Plug", - "model_id": "160-01", - "name": "Plug Thermex Boiler", - "sensors": { + "available": true, + "dev_class": "water_heater_vessel_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "8201a2ac4d1b4303bf994e18d67311eb", + "model": "Plug", + "model_id": "160-01", + "name": "Plug Thermex Boiler", + "sensors": { "electricity_consumed": 0.69, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { + }, + "switches": { "lock": true, "relay": true - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CA9A" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "854f8a9b0e7e425db97f1f110e1ce4b3": { - "available": true, - "dev_class": "central_heating_pump_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Plug", - "model_id": "160-01", - "name": "Plug Vloerverwarming", - "sensors": { - "electricity_consumed": 0.0, + "available": true, + "dev_class": "central_heating_pump_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Plug", + "model_id": "160-01", + "name": "Plug Vloerverwarming", + "sensors": { + "electricity_consumed": 49.0, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { - "relay": false - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CB6F" + }, + "switches": { + "relay": true + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "dev_class": "thermostat", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "ThermoTouch", - "model_id": "143.1", - "name": "Anna", - "sensors": { - "setpoint": 15.0, - "temperature": 19.5 - }, - "vendor": "Plugwise" + "dev_class": "thermostat", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "ThermoTouch", + "model_id": "143.1", + "name": "Anna", + "sensors": { + "setpoint": 21.0, + "temperature": 19.9 + }, + "vendor": "Plugwise" }, "da224107914542988a88561b4452b0f6": { - "binary_sensors": { + "binary_sensors": { "plugwise_notification": false - }, - "dev_class": "gateway", - "firmware": "3.9.0", - "gateway_modes": ["away", "full", "vacation"], - "hardware": "AME Smile 2.0 board", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "D40FB2019891", - "model": "Gateway", - "model_id": "smile_open_therm", - "name": "Adam", - "notifications": {}, - "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"], - "select_gateway_mode": "full", - "select_regulation_mode": "heating", - "sensors": { - "outdoor_temperature": 13.9 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D5A168D" + }, + "dev_class": "gateway", + "firmware": "3.9.0", + "gateway_modes": [ + "away", + "full", + "vacation" + ], + "hardware": "AME Smile 2.0 board", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "mac_address": "D40FB201CBA0", + "model": "Gateway", + "model_id": "smile_open_therm", + "name": "Adam", + "notifications": {}, + "regulation_modes": [ + "bleeding_cold", + "heating", + "off", + "bleeding_hot" + ], + "select_gateway_mode": "full", + "select_regulation_mode": "heating", + "sensors": { + "outdoor_temperature": 15.6 + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D5ACBA0" }, "da575e9e09b947e281fb6e3ebce3b174": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "zone_thermometer", - "firmware": "2020-09-01T02:00:00+02:00", - "hardware": "1", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Jip", - "model_id": "168-01", - "name": "Jip", - "sensors": { + }, + "dev_class": "zone_thermometer", + "firmware": "2020-09-01T02:00:00+02:00", + "hardware": "1", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Jip", + "model_id": "168-01", + "name": "Jip", + "sensors": { "battery": 100, "humidity": 63.9, - "setpoint": 15.0, - "temperature": 18.8 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "70AC08FFFEE16437" + "setpoint": 21.0, + "temperature": 19.3 + }, + "vendor": "Plugwise", + "zigbee_mac_address": "70AC08FFFEE1CBA0" }, "e2f4322d57924fa090fbbc48b3a140dc": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "zone_thermostat", - "firmware": "2016-10-10T02:00:00+02:00", - "hardware": "255", - "location": "f871b8c4d63549319221e294e4f88074", - "model": "Lisa", - "model_id": "158-01", - "name": "Lisa Badkamer", - "sensors": { + }, + "dev_class": "zone_thermostat", + "firmware": "2016-10-10T02:00:00+02:00", + "hardware": "255", + "location": "f871b8c4d63549319221e294e4f88074", + "model": "Lisa", + "model_id": "158-01", + "name": "Lisa Badkamer", + "sensors": { "battery": 71, "setpoint": 12.0, - "temperature": 18.8 - }, - "temperature_offset": { + "temperature": 18.7 + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.0, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C869B61" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000C86CBA0" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { - "dev_class": "switching", - "members": [ + "dev_class": "switching", + "members": [ "2568cc4b9c1e401495d4741a5f89bee1", "29542b2b6a6a4169acecc15c72a599b8" - ], - "model": "Switchgroup", - "name": "Test", - "switches": { + ], + "model": "Switchgroup", + "name": "Test", + "switches": { "relay": true - }, - "vendor": "Plugwise" + }, + "vendor": "Plugwise" }, "f2bf9048bef64cc5b6d5110154e33c81": { - "active_preset": "vacation", - "available_schedules": [ + "active_preset": "home", + "available_schedules": [ "Badkamer", "Vakantie", "Weekschema", "Test", "off" - ], - "climate_mode": "heat", - "control_state": "idle", - "dev_class": "climate", - "model": "ThermoZone", - "name": "Living room", - "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], - "select_schedule": "off", - "sensors": { - "electricity_consumed": 15.6, + ], + "climate_mode": "heat", + "control_state": "heating", + "dev_class": "climate", + "model": "ThermoZone", + "name": "Living room", + "preset_modes": [ + "vacation", + "no_frost", + "asleep", + "home", + "away" + ], + "select_schedule": "off", + "sensors": { + "electricity_consumed": 64.8, "electricity_produced": 0.0, - "temperature": 18.8 - }, - "thermostat": { + "temperature": 19.3 + }, + "thermostat": { "lower_bound": 1.0, "resolution": 0.01, - "setpoint": 15.0, + "setpoint": 21.0, "upper_bound": 35.0 - }, - "thermostats": { + }, + "thermostats": { "primary": [ - "ad4838d7d35c4d6ea796ee12ae5aedf8", - "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6", - "da575e9e09b947e281fb6e3ebce3b174" + "ad4838d7d35c4d6ea796ee12ae5aedf8", + "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6", + "da575e9e09b947e281fb6e3ebce3b174" ], "secondary": [] - }, - "vendor": "Plugwise" + }, + "vendor": "Plugwise" }, "f871b8c4d63549319221e294e4f88074": { - "active_preset": "vacation", - "available_schedules": [ + "active_preset": "vacation", + "available_schedules": [ "Badkamer", "Vakantie", "Weekschema", "Test", "off" - ], - "climate_mode": "heat", - "control_state": "idle", - "dev_class": "climate", - "model": "ThermoZone", - "name": "Bathroom", - "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], - "select_schedule": "off", - "sensors": { + ], + "climate_mode": "heat", + "control_state": "idle", + "dev_class": "climate", + "model": "ThermoZone", + "name": "Bathroom", + "preset_modes": [ + "vacation", + "no_frost", + "asleep", + "home", + "away" + ], + "select_schedule": "off", + "sensors": { "electricity_consumed": 0.0, "electricity_produced": 0.0, - "temperature": 18.8 - }, - "thermostat": { + "temperature": 18.7 + }, + "thermostat": { "lower_bound": 0.0, "resolution": 0.01, "setpoint": 12.0, "upper_bound": 99.9 - }, - "thermostats": { - "primary": ["e2f4322d57924fa090fbbc48b3a140dc"], - "secondary": ["1772a4ea304041adb83f357b751341ff"] - }, - "vendor": "Plugwise" + }, + "thermostats": { + "primary": [ + "e2f4322d57924fa090fbbc48b3a140dc" + ], + "secondary": [ + "1772a4ea304041adb83f357b751341ff" + ] + }, + "vendor": "Plugwise" + } } - } } From e0910b9f09458632b7a199658a1d83d271ab5787 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sat, 11 Oct 2025 16:54:51 +0200 Subject: [PATCH 3/4] Update entity_items assert --- tests/test_adam.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_adam.py b/tests/test_adam.py index ba8a71095..32a1de49f 100644 --- a/tests/test_adam.py +++ b/tests/test_adam.py @@ -198,7 +198,7 @@ async def test_connect_adam_anna_new_2(self): ) await self.device_test(api, "2025-10-12 00:00:01", testdata) - assert self.entity_items == 195 + assert self.entity_items == 197 await api.close_connection() await self.disconnect(server, client) From fba7bc7e55ec6ad300b68691750596902aa32658 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Sat, 11 Oct 2025 16:55:40 +0200 Subject: [PATCH 4/4] Ruffed --- fixtures/adam_anna_new_2/data.json | 37 +-- tests/data/adam/adam_anna_new_2.json | 401 +++++++++++++-------------- 2 files changed, 194 insertions(+), 244 deletions(-) diff --git a/fixtures/adam_anna_new_2/data.json b/fixtures/adam_anna_new_2/data.json index 40de96f5c..0f2966aa2 100644 --- a/fixtures/adam_anna_new_2/data.json +++ b/fixtures/adam_anna_new_2/data.json @@ -158,11 +158,7 @@ }, "dev_class": "gateway", "firmware": "3.9.0", - "gateway_modes": [ - "away", - "full", - "vacation" - ], + "gateway_modes": ["away", "full", "vacation"], "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", "mac_address": "D40FB201CBA0", @@ -170,12 +166,7 @@ "model_id": "smile_open_therm", "name": "Adam", "notifications": {}, - "regulation_modes": [ - "bleeding_cold", - "heating", - "off", - "bleeding_hot" - ], + "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { @@ -258,13 +249,7 @@ "dev_class": "climate", "model": "ThermoZone", "name": "Living room", - "preset_modes": [ - "vacation", - "no_frost", - "asleep", - "home", - "away" - ], + "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], "select_schedule": "off", "sensors": { "electricity_consumed": 64.8, @@ -301,13 +286,7 @@ "dev_class": "climate", "model": "ThermoZone", "name": "Bathroom", - "preset_modes": [ - "vacation", - "no_frost", - "asleep", - "home", - "away" - ], + "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], "select_schedule": "off", "sensors": { "electricity_consumed": 0.0, @@ -321,12 +300,8 @@ "upper_bound": 99.9 }, "thermostats": { - "primary": [ - "e2f4322d57924fa090fbbc48b3a140dc" - ], - "secondary": [ - "1772a4ea304041adb83f357b751341ff" - ] + "primary": ["e2f4322d57924fa090fbbc48b3a140dc"], + "secondary": ["1772a4ea304041adb83f357b751341ff"] }, "vendor": "Plugwise" } diff --git a/tests/data/adam/adam_anna_new_2.json b/tests/data/adam/adam_anna_new_2.json index 6f3ee681b..fbd2b6f3b 100644 --- a/tests/data/adam/adam_anna_new_2.json +++ b/tests/data/adam/adam_anna_new_2.json @@ -1,335 +1,310 @@ { "devices": { "056ee145a816487eaa69243c3280f8bf": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "dhw_state": false, "flame_state": true, "heating_state": true - }, - "dev_class": "heater_central", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "maximum_boiler_temperature": { + }, + "dev_class": "heater_central", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "maximum_boiler_temperature": { "lower_bound": 25.0, "resolution": 0.01, "setpoint": 50.0, "upper_bound": 95.0 - }, - "model": "Generic heater", - "name": "OpenTherm", - "sensors": { + }, + "model": "Generic heater", + "name": "OpenTherm", + "sensors": { "intended_boiler_temperature": 22.5, "water_temperature": 35.0 - }, - "switches": { + }, + "switches": { "dhw_cm_switch": false - } + } }, "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "zone_thermostat", - "hardware": "1", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Emma", - "model_id": "170-01", - "name": "Emma", - "sensors": { + }, + "dev_class": "zone_thermostat", + "hardware": "1", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Emma", + "model_id": "170-01", + "name": "Emma", + "sensors": { "battery": 100, "humidity": 65.0, "setpoint": 21.0, "temperature": 19.5 - }, - "temperature_offset": { + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.0, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "60EFABFFFE89CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "60EFABFFFE89CBA0" }, "1772a4ea304041adb83f357b751341ff": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "thermostatic_radiator_valve", - "firmware": "2020-11-04T01:00:00+01:00", - "hardware": "1", - "location": "f871b8c4d63549319221e294e4f88074", - "model": "Tom/Floor", - "model_id": "106-03", - "name": "Tom Badkamer", - "sensors": { + }, + "dev_class": "thermostatic_radiator_valve", + "firmware": "2020-11-04T01:00:00+01:00", + "hardware": "1", + "location": "f871b8c4d63549319221e294e4f88074", + "model": "Tom/Floor", + "model_id": "106-03", + "name": "Tom Badkamer", + "sensors": { "battery": 60, "setpoint": 12.0, "temperature": 19.0, "temperature_difference": -0.4, "valve_position": 0.0 - }, - "temperature_offset": { + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.1, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C8FCBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000C8FCBA0" }, "2568cc4b9c1e401495d4741a5f89bee1": { - "available": true, - "dev_class": "hometheater_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Plug", - "model_id": "160-01", - "name": "Plug MediaTV", - "sensors": { + "available": true, + "dev_class": "hometheater_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Plug", + "model_id": "160-01", + "name": "Plug MediaTV", + "sensors": { "electricity_consumed": 15.8, "electricity_consumed_interval": 3.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { + }, + "switches": { "lock": false, "relay": true - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "29542b2b6a6a4169acecc15c72a599b8": { - "available": true, - "dev_class": "water_heater_vessel_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "8201a2ac4d1b4303bf994e18d67311eb", - "model": "Plug", - "model_id": "160-01", - "name": "Plug Thermex Boiler", - "sensors": { + "available": true, + "dev_class": "water_heater_vessel_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "8201a2ac4d1b4303bf994e18d67311eb", + "model": "Plug", + "model_id": "160-01", + "name": "Plug Thermex Boiler", + "sensors": { "electricity_consumed": 0.69, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { + }, + "switches": { "lock": true, "relay": true - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "854f8a9b0e7e425db97f1f110e1ce4b3": { - "available": true, - "dev_class": "central_heating_pump_plug", - "firmware": "2020-11-10T01:00:00+01:00", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Plug", - "model_id": "160-01", - "name": "Plug Vloerverwarming", - "sensors": { + "available": true, + "dev_class": "central_heating_pump_plug", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Plug", + "model_id": "160-01", + "name": "Plug Vloerverwarming", + "sensors": { "electricity_consumed": 49.0, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 - }, - "switches": { + }, + "switches": { "relay": true - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D13CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D13CBA0" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "dev_class": "thermostat", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "ThermoTouch", - "model_id": "143.1", - "name": "Anna", - "sensors": { + "dev_class": "thermostat", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "ThermoTouch", + "model_id": "143.1", + "name": "Anna", + "sensors": { "setpoint": 21.0, "temperature": 19.9 - }, - "vendor": "Plugwise" + }, + "vendor": "Plugwise" }, "da224107914542988a88561b4452b0f6": { - "binary_sensors": { + "binary_sensors": { "plugwise_notification": false - }, - "dev_class": "gateway", - "firmware": "3.9.0", - "gateway_modes": [ - "away", - "full", - "vacation" - ], - "hardware": "AME Smile 2.0 board", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "D40FB201CBA0", - "model": "Gateway", - "model_id": "smile_open_therm", - "name": "Adam", - "notifications": {}, - "regulation_modes": [ - "bleeding_cold", - "heating", - "off", - "bleeding_hot" - ], - "select_gateway_mode": "full", - "select_regulation_mode": "heating", - "sensors": { + }, + "dev_class": "gateway", + "firmware": "3.9.0", + "gateway_modes": ["away", "full", "vacation"], + "hardware": "AME Smile 2.0 board", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "mac_address": "D40FB201CBA0", + "model": "Gateway", + "model_id": "smile_open_therm", + "name": "Adam", + "notifications": {}, + "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"], + "select_gateway_mode": "full", + "select_regulation_mode": "heating", + "sensors": { "outdoor_temperature": 15.6 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000D5ACBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000D5ACBA0" }, "da575e9e09b947e281fb6e3ebce3b174": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "zone_thermometer", - "firmware": "2020-09-01T02:00:00+02:00", - "hardware": "1", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Jip", - "model_id": "168-01", - "name": "Jip", - "sensors": { + }, + "dev_class": "zone_thermometer", + "firmware": "2020-09-01T02:00:00+02:00", + "hardware": "1", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Jip", + "model_id": "168-01", + "name": "Jip", + "sensors": { "battery": 100, "humidity": 63.9, "setpoint": 21.0, "temperature": 19.3 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "70AC08FFFEE1CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "70AC08FFFEE1CBA0" }, "e2f4322d57924fa090fbbc48b3a140dc": { - "available": true, - "binary_sensors": { + "available": true, + "binary_sensors": { "low_battery": false - }, - "dev_class": "zone_thermostat", - "firmware": "2016-10-10T02:00:00+02:00", - "hardware": "255", - "location": "f871b8c4d63549319221e294e4f88074", - "model": "Lisa", - "model_id": "158-01", - "name": "Lisa Badkamer", - "sensors": { + }, + "dev_class": "zone_thermostat", + "firmware": "2016-10-10T02:00:00+02:00", + "hardware": "255", + "location": "f871b8c4d63549319221e294e4f88074", + "model": "Lisa", + "model_id": "158-01", + "name": "Lisa Badkamer", + "sensors": { "battery": 71, "setpoint": 12.0, "temperature": 18.7 - }, - "temperature_offset": { + }, + "temperature_offset": { "lower_bound": -2.0, "resolution": 0.1, "setpoint": 0.0, "upper_bound": 2.0 - }, - "vendor": "Plugwise", - "zigbee_mac_address": "000D6F000C86CBA0" + }, + "vendor": "Plugwise", + "zigbee_mac_address": "000D6F000C86CBA0" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { - "dev_class": "switching", - "members": [ + "dev_class": "switching", + "members": [ "2568cc4b9c1e401495d4741a5f89bee1", "29542b2b6a6a4169acecc15c72a599b8" - ], - "model": "Switchgroup", - "name": "Test", - "switches": { + ], + "model": "Switchgroup", + "name": "Test", + "switches": { "relay": true - }, - "vendor": "Plugwise" + }, + "vendor": "Plugwise" }, "f2bf9048bef64cc5b6d5110154e33c81": { - "active_preset": "home", - "available_schedules": [ + "active_preset": "home", + "available_schedules": [ "Badkamer", "Vakantie", "Weekschema", "Test", "off" - ], - "climate_mode": "heat", - "control_state": "heating", - "dev_class": "climate", - "model": "ThermoZone", - "name": "Living room", - "preset_modes": [ - "vacation", - "no_frost", - "asleep", - "home", - "away" - ], - "select_schedule": "off", - "sensors": { + ], + "climate_mode": "heat", + "control_state": "heating", + "dev_class": "climate", + "model": "ThermoZone", + "name": "Living room", + "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], + "select_schedule": "off", + "sensors": { "electricity_consumed": 64.8, "electricity_produced": 0.0, "temperature": 19.3 - }, - "thermostat": { + }, + "thermostat": { "lower_bound": 1.0, "resolution": 0.01, "setpoint": 21.0, "upper_bound": 35.0 - }, - "thermostats": { + }, + "thermostats": { "primary": [ - "ad4838d7d35c4d6ea796ee12ae5aedf8", - "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6", - "da575e9e09b947e281fb6e3ebce3b174" + "ad4838d7d35c4d6ea796ee12ae5aedf8", + "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6", + "da575e9e09b947e281fb6e3ebce3b174" ], "secondary": [] - }, - "vendor": "Plugwise" + }, + "vendor": "Plugwise" }, "f871b8c4d63549319221e294e4f88074": { - "active_preset": "vacation", - "available_schedules": [ + "active_preset": "vacation", + "available_schedules": [ "Badkamer", "Vakantie", "Weekschema", "Test", "off" - ], - "climate_mode": "heat", - "control_state": "idle", - "dev_class": "climate", - "model": "ThermoZone", - "name": "Bathroom", - "preset_modes": [ - "vacation", - "no_frost", - "asleep", - "home", - "away" - ], - "select_schedule": "off", - "sensors": { + ], + "climate_mode": "heat", + "control_state": "idle", + "dev_class": "climate", + "model": "ThermoZone", + "name": "Bathroom", + "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"], + "select_schedule": "off", + "sensors": { "electricity_consumed": 0.0, "electricity_produced": 0.0, "temperature": 18.7 - }, - "thermostat": { + }, + "thermostat": { "lower_bound": 0.0, "resolution": 0.01, "setpoint": 12.0, "upper_bound": 99.9 - }, - "thermostats": { - "primary": [ - "e2f4322d57924fa090fbbc48b3a140dc" - ], - "secondary": [ - "1772a4ea304041adb83f357b751341ff" - ] - }, - "vendor": "Plugwise" - } + }, + "thermostats": { + "primary": ["e2f4322d57924fa090fbbc48b3a140dc"], + "secondary": ["1772a4ea304041adb83f357b751341ff"] + }, + "vendor": "Plugwise" } + } }