Merge pull request #559 from plugwise/correct-fixtures

Don't output schedule-related data when no valid schedule(s) found

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.37.7
+
+- Don't output schedule-related data when no valid schedule(s) found.
+- Various corrections to impacted test- and data-files/fixtures.
+
 ## v0.37.6
 
 - Schedule-related improvements.

fixtures/adam_jip/all_data.json

@@ -3,7 +3,6 @@
     "1346fbd8498d4dbcab7e18d51b771f3d": {
       "active_preset": "no_frost",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -13,7 +12,6 @@
       "model": "Lisa",
       "name": "Slaapkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 92,
         "setpoint": 13.0,
@@ -99,7 +97,6 @@
     "6f3e9d7084214c21b9dfa46f6eeb8700": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -109,7 +106,6 @@
       "model": "Lisa",
       "name": "Kinderkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 79,
         "setpoint": 13.0,
@@ -156,7 +152,6 @@
     "a6abc6a129ee499c88a4d420cc413b47": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -166,7 +161,6 @@
       "model": "Lisa",
       "name": "Logeerkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 80,
         "setpoint": 13.0,
@@ -269,7 +263,6 @@
     "f61f1a2535f54f52ad006a3d18e459ca": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermometer",
       "firmware": "2020-09-01T02:00:00+02:00",
@@ -279,7 +272,6 @@
       "model": "Jip",
       "name": "Woonkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 100,
         "humidity": 56.2,
@@ -306,7 +298,7 @@
     "cooling_present": false,
     "gateway_id": "b5c2386c6f6342669e50fe49dd05b188",
     "heater_id": "e4684553153b44afbef2200885f379dc",
-    "item_count": 221,
+    "item_count": 213,
     "notifications": {},
     "smile_name": "Adam"
   }

fixtures/legacy_anna/all_data.json

@@ -36,7 +36,6 @@
     },
     "0d266432d64443e283b5d708ae98b455": {
       "active_preset": "home",
-      "available_schedules": ["None"],
       "dev_class": "thermostat",
       "firmware": "2017-03-13T11:54:58+01:00",
       "hardware": "6539-1301-500",
@@ -45,7 +44,6 @@
       "model": "ThermoTouch",
       "name": "Anna",
       "preset_modes": ["away", "vacation", "asleep", "home", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "illuminance": 151,
         "setpoint": 20.5,
@@ -64,7 +62,7 @@
     "cooling_present": false,
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
     "heater_id": "04e4cbfe7f4340f090f85ec3b9e6a950",
-    "item_count": 43,
+    "item_count": 41,
     "smile_name": "Smile Anna"
   }
 }

fixtures/m_adam_cooling/all_data.json

@@ -66,7 +66,7 @@
       "model": "ThermoTouch",
       "name": "Anna",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
-      "select_schedule": "None",
+      "select_schedule": "off",
       "sensors": {
         "setpoint": 23.5,
         "temperature": 25.8

fixtures/m_adam_heating/all_data.json

@@ -71,7 +71,7 @@
       "model": "ThermoTouch",
       "name": "Anna",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
-      "select_schedule": "None",
+      "select_schedule": "off",
       "sensors": {
         "setpoint": 20.0,
         "temperature": 19.1

fixtures/m_adam_jip/all_data.json

@@ -3,7 +3,6 @@
     "1346fbd8498d4dbcab7e18d51b771f3d": {
       "active_preset": "no_frost",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -13,7 +12,6 @@
       "model": "Lisa",
       "name": "Slaapkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 92,
         "setpoint": 13.0,
@@ -99,7 +97,6 @@
     "6f3e9d7084214c21b9dfa46f6eeb8700": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -109,7 +106,6 @@
       "model": "Lisa",
       "name": "Kinderkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 79,
         "setpoint": 13.0,
@@ -156,7 +152,6 @@
     "a6abc6a129ee499c88a4d420cc413b47": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
@@ -166,7 +161,6 @@
       "model": "Lisa",
       "name": "Logeerkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 80,
         "setpoint": 13.0,
@@ -269,7 +263,6 @@
     "f61f1a2535f54f52ad006a3d18e459ca": {
       "active_preset": "home",
       "available": true,
-      "available_schedules": ["None"],
       "control_state": "off",
       "dev_class": "zone_thermometer",
       "firmware": "2020-09-01T02:00:00+02:00",
@@ -279,7 +272,6 @@
       "model": "Jip",
       "name": "Woonkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
-      "select_schedule": "None",
       "sensors": {
         "battery": 100,
         "humidity": 56.2,
@@ -306,7 +298,7 @@
     "cooling_present": false,
     "gateway_id": "b5c2386c6f6342669e50fe49dd05b188",
     "heater_id": "e4684553153b44afbef2200885f379dc",
-    "item_count": 221,
+    "item_count": 213,
     "notifications": {},
     "smile_name": "Adam"
   }