Update adam_plus_anna_new test-json

Author: bouwew

tests/data/adam/adam_plus_anna_new.json

@@ -1,232 +1,240 @@
 {
-  "da224107914542988a88561b4452b0f6": {
-    "dev_class": "gateway",
-    "firmware": "3.7.8",
-    "hardware": "AME Smile 2.0 board",
-    "location": "bc93488efab249e5bc54fd7e175a6f91",
-    "mac_address": "012345679891",
-    "model": "Gateway",
-    "name": "Adam",
-    "zigbee_mac_address": "000D6F000D5A168D",
-    "vendor": "Plugwise",
+  "056ee145a816487eaa69243c3280f8bf": {
+    "available": true,
     "binary_sensors": {
-      "plugwise_notification": false
-    },
-    "sensors": {
-      "outdoor_temperature": 9.19
+      "dhw_state": false,
+      "flame_state": true,
+      "heating_state": true
     },
-    "select_regulation_mode": "heating",
-    "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
-    "gateway_modes": ["away", "full", "vacation"],
-    "select_gateway_mode": "full"
-  },
-  "056ee145a816487eaa69243c3280f8bf": {
     "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": 23.9,
+      "water_temperature": 30.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
+    }
+  },
+  "1772a4ea304041adb83f357b751341ff": {
+    "available": true,
     "binary_sensors": {
-      "dhw_state": false,
-      "heating_state": true,
-      "flame_state": true
+      "low_battery": false
     },
+    "dev_class": "thermo_sensor",
+    "firmware": "2020-11-04T01:00:00+01:00",
+    "hardware": "1",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "model": "Tom/Floor",
+    "model_id": "106-03",
+    "name": "Tom Badkamer",
+    "sensors": {
+      "battery": 99,
+      "setpoint": 18.0,
+      "temperature": 17.6,
+      "temperature_difference": -0.2,
+      "valve_position": 100
+    },
+    "temperature_offset": {
+      "lower_bound": -2.0,
+      "resolution": 0.1,
+      "setpoint": 0.1,
+      "upper_bound": 2.0
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C8FF5EE"
+  },
+  "2568cc4b9c1e401495d4741a5f89bee1": {
+    "available": true,
+    "dev_class": "hometheater",
+    "firmware": "2020-11-10T01:00:00+01:00",
+    "location": "f2bf9048bef64cc5b6d5110154e33c81",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "Plug MediaTV",
     "sensors": {
-      "water_temperature": 30,
-      "intended_boiler_temperature": 23.9
+      "electricity_consumed": 14.8,
+      "electricity_consumed_interval": 3.0,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
     },
     "switches": {
-      "dhw_cm_switch": false
+      "lock": true,
+      "relay": true
     },
-    "maximum_boiler_temperature": {
-      "setpoint": 50,
-      "resolution": 0.01,
-      "lower_bound": 25,
-      "upper_bound": 95
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D13CCFD"
+  },
+  "29542b2b6a6a4169acecc15c72a599b8": {
+    "available": true,
+    "dev_class": "computer_desktop",
+    "firmware": "2020-11-10T01:00:00+01:00",
+    "location": "f2bf9048bef64cc5b6d5110154e33c81",
+    "model": "Plug",
+    "model_id": "160-01",
+    "name": "Plug Werkplek",
+    "sensors": {
+      "electricity_consumed": 91.3,
+      "electricity_consumed_interval": 23.0,
+      "electricity_produced": 0.0,
+      "electricity_produced_interval": 0.0
     },
-    "available": true
+    "switches": {
+      "lock": false,
+      "relay": true
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D13CA9A"
   },
   "67d73d0bd469422db25a618a5fb8eeb0": {
+    "available": true,
     "dev_class": "zz_misc",
     "location": "b4f211175e124df59603412bafa77a34",
     "model": "Aqara Smart Plug",
+    "model_id": "lumi.plug.maeu01",
     "name": "SmartPlug Floor 0",
-    "zigbee_mac_address": "54EF4410002C97F2",
-    "vendor": "LUMI",
     "sensors": {
-      "electricity_consumed_interval": 0
+      "electricity_consumed_interval": 0.0
     },
     "switches": {
-      "relay": true,
-      "lock": false
-    },
-    "available": true
-  },
-  "e2f4322d57924fa090fbbc48b3a140dc": {
-    "dev_class": "zone_thermostat",
-    "firmware": "2016-10-10T02:00:00+02:00",
-    "hardware": "255",
-    "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Lisa",
-    "name": "Lisa Badkamer",
-    "zigbee_mac_address": "000D6F000C869B61",
-    "vendor": "Plugwise",
-    "binary_sensors": {
-      "low_battery": true
-    },
-    "sensors": {
-      "temperature": 16.5,
-      "setpoint": 18,
-      "battery": 14
-    },
-    "temperature_offset": {
-      "lower_bound": -2,
-      "resolution": 0.1,
-      "upper_bound": 2,
-      "setpoint": 0
-    },
-    "thermostat": {
-      "setpoint": 18,
-      "resolution": 0.01,
-      "lower_bound": 0,
-      "upper_bound": 99.9
+      "lock": false,
+      "relay": true
     },
-    "available": true,
-    "control_state": "preheating",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
-    "active_preset": "home",
-    "available_schedules": [
-      "Badkamer",
-      "Test",
-      "Vakantie",
-      "Weekschema",
-      "off"
-    ],
-    "select_schedule": "Badkamer",
-    "mode": "auto"
+    "vendor": "LUMI",
+    "zigbee_mac_address": "54EF4410002C97F2"
   },
   "854f8a9b0e7e425db97f1f110e1ce4b3": {
+    "available": true,
     "dev_class": "central_heating_pump",
     "firmware": "2020-11-10T01:00:00+01:00",
     "location": "f2bf9048bef64cc5b6d5110154e33c81",
     "model": "Plug",
+    "model_id": "160-01",
     "name": "Plug Vloerverwarming",
-    "zigbee_mac_address": "000D6F000D13CB6F",
-    "vendor": "Plugwise",
     "sensors": {
       "electricity_consumed": 43.8,
-      "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
     },
-    "available": true
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D13CB6F"
   },
   "ad4838d7d35c4d6ea796ee12ae5aedf8": {
+    "active_preset": "home",
+    "available_schedules": [
+      "Badkamer",
+      "Test",
+      "Vakantie",
+      "Weekschema",
+      "off"
+    ],
+    "control_state": "heating",
     "dev_class": "thermostat",
     "location": "f2bf9048bef64cc5b6d5110154e33c81",
+    "mode": "auto",
     "model": "ThermoTouch",
+    "model_id": "143.1",
     "name": "Anna",
-    "vendor": "Plugwise",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "Weekschema",
     "sensors": {
-      "temperature": 18.4,
-      "setpoint": 18.5
+      "setpoint": 18.5,
+      "temperature": 18.4
     },
     "thermostat": {
-      "setpoint": 18.5,
+      "lower_bound": 1.0,
       "resolution": 0.01,
-      "lower_bound": 1,
-      "upper_bound": 35
+      "setpoint": 18.5,
+      "upper_bound": 35.0
     },
-    "control_state": "heating",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "vendor": "Plugwise"
+  },
+  "da224107914542988a88561b4452b0f6": {
+    "binary_sensors": {
+      "plugwise_notification": false
+    },
+    "dev_class": "gateway",
+    "firmware": "3.7.8",
+    "gateway_modes": ["away", "full", "vacation"],
+    "hardware": "AME Smile 2.0 board",
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
+    "mac_address": "012345679891",
+    "model": "Gateway",
+    "model_id": "smile_open_therm",
+    "name": "Adam",
+    "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
+    "select_gateway_mode": "full",
+    "select_regulation_mode": "heating",
+    "sensors": {
+      "outdoor_temperature": 9.19
+    },
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000D5A168D"
+  },
+  "e2f4322d57924fa090fbbc48b3a140dc": {
     "active_preset": "home",
+    "available": true,
     "available_schedules": [
       "Badkamer",
       "Test",
       "Vakantie",
       "Weekschema",
       "off"
     ],
-    "select_schedule": "Weekschema",
-    "mode": "auto"
-  },
-  "29542b2b6a6a4169acecc15c72a599b8": {
-    "dev_class": "computer_desktop",
-    "firmware": "2020-11-10T01:00:00+01:00",
-    "location": "f2bf9048bef64cc5b6d5110154e33c81",
-    "model": "Plug",
-    "name": "Plug Werkplek",
-    "zigbee_mac_address": "000D6F000D13CA9A",
-    "vendor": "Plugwise",
-    "sensors": {
-      "electricity_consumed": 91.3,
-      "electricity_consumed_interval": 23,
-      "electricity_produced": 0,
-      "electricity_produced_interval": 0
-    },
-    "switches": {
-      "relay": true,
-      "lock": false
-    },
-    "available": true
-  },
-  "1772a4ea304041adb83f357b751341ff": {
-    "dev_class": "thermo_sensor",
-    "firmware": "2020-11-04T01:00:00+01:00",
-    "hardware": "1",
-    "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
-    "name": "Tom Badkamer",
-    "zigbee_mac_address": "000D6F000C8FF5EE",
-    "vendor": "Plugwise",
     "binary_sensors": {
-      "low_battery": false
+      "low_battery": true
     },
+    "control_state": "preheating",
+    "dev_class": "zone_thermostat",
+    "firmware": "2016-10-10T02:00:00+02:00",
+    "hardware": "255",
+    "location": "f871b8c4d63549319221e294e4f88074",
+    "mode": "auto",
+    "model": "Lisa",
+    "model_id": "158-01",
+    "name": "Lisa Badkamer",
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "select_schedule": "Badkamer",
     "sensors": {
-      "temperature": 17.6,
-      "setpoint": 18,
-      "battery": 99,
-      "temperature_difference": -0.2,
-      "valve_position": 100
+      "battery": 14,
+      "setpoint": 18.0,
+      "temperature": 16.5
     },
     "temperature_offset": {
-      "lower_bound": -2,
+      "lower_bound": -2.0,
       "resolution": 0.1,
-      "upper_bound": 2,
-      "setpoint": 0.1
-    },
-    "available": true
-  },
-  "2568cc4b9c1e401495d4741a5f89bee1": {
-    "dev_class": "hometheater",
-    "firmware": "2020-11-10T01:00:00+01:00",
-    "location": "f2bf9048bef64cc5b6d5110154e33c81",
-    "model": "Plug",
-    "name": "Plug MediaTV",
-    "zigbee_mac_address": "000D6F000D13CCFD",
-    "vendor": "Plugwise",
-    "sensors": {
-      "electricity_consumed": 14.8,
-      "electricity_consumed_interval": 3,
-      "electricity_produced": 0,
-      "electricity_produced_interval": 0
+      "setpoint": 0.0,
+      "upper_bound": 2.0
     },
-    "switches": {
-      "relay": true,
-      "lock": true
+    "thermostat": {
+      "lower_bound": 0.0,
+      "resolution": 0.01,
+      "setpoint": 18.0,
+      "upper_bound": 99.9
     },
-    "available": true
+    "vendor": "Plugwise",
+    "zigbee_mac_address": "000D6F000C869B61"
   },
   "e8ef2a01ed3b4139a53bf749204fe6b4": {
     "dev_class": "switching",
-    "model": "Switchgroup",
-    "name": "Test",
     "members": [
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
+    "model": "Switchgroup",
+    "name": "Test",
     "switches": {
       "relay": true
     }