Improve using initial values

Author: bouwew

plugwise/data.py

@@ -268,15 +268,13 @@ def _climate_data(
             data["active_preset"] = self._preset(loc_id)
 
         # Schedule
+        data["available_schedules"] = []
+        data["select_schedule"] = None
+        self._count += 2
         avail_schedules, sel_schedule = self._schedules(loc_id)
         if avail_schedules != [NONE]:
             data["available_schedules"] = avail_schedules
             data["select_schedule"] = sel_schedule
-            self._count += 2
-        # Handle removal of the last remaining schedule for a thermostat zone
-        elif data["available_schedules"]:
-            data["available_schedules"] = []
-            data["select_schedule"] = None
 
         # Set HA climate HVACMode: auto, heat, heat_cool, cool and off
         data["climate_mode"] = "auto"

plugwise/legacy/data.py

@@ -67,15 +67,13 @@ def _climate_data(self, entity: GwEntityData, data: GwEntityData) -> None:
             data["active_preset"] = self._preset()
 
         # Schedule
+        data["available_schedules"] = []
+        data["select_schedule"] = None
+        self._count += 2
         avail_schedules, sel_schedule = self._schedules()
         if avail_schedules != [NONE]:
             data["available_schedules"] = avail_schedules
             data["select_schedule"] = sel_schedule
-            self._count += 2
-        # Handle removal of the thermostat schedule
-        elif data["available_schedules"]:
-            data["available_schedules"] = []
-            data["select_schedule"] = None
 
         # Set HA climate HVACMode: auto, heat
         data["climate_mode"] = "auto"