Climate merge

Author: CoMPaTech

custom_components/plugwise-beta/climate.py

@@ -9,7 +9,6 @@
     CURRENT_HVAC_HEAT,
     CURRENT_HVAC_IDLE,
     HVAC_MODE_AUTO,
-    HVAC_MODE_COOL,
     HVAC_MODE_HEAT,
     HVAC_MODE_HEAT_COOL,
     HVAC_MODE_OFF,
@@ -198,7 +197,7 @@ def hvac_modes(self):
     @property
     def hvac_mode(self):
         """Return current active hvac state."""
-        self._hvac_mode
+        return self._hvac_mode
 
     @property
     def target_temperature(self):
@@ -315,13 +314,10 @@ def update(self):
 
         if self._schema_status:
             self._hvac_mode = HVAC_MODE_AUTO
-        elif self._central_heating_state or self._boiler_state:
+        elif self._central_heating_state is not None or self._boiler_state is not None:
             if self._cooling_state is not None:
                 self._hvac_mode = HVAC_MODE_HEAT_COOL
             self._hvac_mode = HVAC_MODE_HEAT
-        elif self._cooling_state:
-            if self._central_heating_state is not None:
+        elif self._cooling_state is not None:
+            if self._central_heating_state is not None or self._boiler_state is not None:
                 self._hvac_mode = HVAC_MODE_HEAT_COOL
-            self._hvac_mode = HVAC_MODE_COOL
-        else:
-            self._hvac_mode = HVAC_MODE_OFF