Climate 1.0 (#23899)

* Climate 1.0 / part 1/2/3 * fix flake * Lint * Update Google Assistant * ambiclimate to climate 1.0 (#24911) * Fix Alexa * Lint * Migrate zhong_hong * Migrate tuya * Migrate honeywell to new climate schema (#24257) * Update one * Fix model climate v2 * Cleanup p4 * Add comfort hold mode * Fix old code * Update homeassistant/components/climate/__init__.py Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io> * Update homeassistant/components/climate/const.py Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io> * First renaming * Rename operation to hvac for paulus * Rename hold mode to preset mode * Cleanup & update comments * Remove on/off * Fix supported feature count * Update services * Update demo * Fix tests & use current_hvac * Update comment * Fix tests & add typing * Add more typing * Update modes * Fix tests * Cleanup low/high with range * Update homematic part 1 * Finish homematic * Fix lint * fix hm mapping * Support simple devices * convert lcn * migrate oem * Fix xs1 * update hive * update mil * Update toon * migrate deconz * cleanup * update tesla * Fix lint * Fix vera * Migrate zwave * Migrate velbus * Cleanup humity feature * Cleanup * Migrate wink * migrate dyson * Fix current hvac * Renaming * Fix lint * Migrate tfiac * migrate tado * Fix PRESET can be None * apply PR#23913 from dev * remove EU component, etc. * remove EU component, etc. * ready to test now * de-linted * some tweaks * de-lint * better handling of edge cases * delint * fix set_mode typos * apply PR#23913 from dev * remove EU component, etc. * ready to test now * de-linted * some tweaks * de-lint * better handling of edge cases * delint * fix set_mode typos * delint, move debug code * away preset now working * code tidy-up * code tidy-up 2 * code tidy-up 3 * address issues #18932, #15063 * address issues #18932, #15063 - 2/2 * refactor MODE_AUTO to MODE_HEAT_COOL and use F not C * add low/high to set_temp * add low/high to set_temp 2 * add low/high to set_temp - delint * run HA scripts * port changes from PR #24402 * manual rebase * manual rebase 2 * delint * minor change * remove SUPPORT_HVAC_ACTION * Migrate radiotherm * Convert touchline * Migrate flexit * Migrate nuheat * Migrate maxcube * Fix names maxcube const * Migrate proliphix * Migrate heatmiser * Migrate fritzbox * Migrate opentherm_gw * Migrate venstar * Migrate daikin * Migrate modbus * Fix elif * Migrate Homematic IP Cloud to climate-1.0 (#24913) * hmip climate fix * Update hvac_mode and preset_mode * fix lint * Fix lint * Migrate generic_thermostat * Migrate incomfort to new climate schema (#24915) * initial commit * Update climate.py * Migrate eq3btsmart * Lint * cleanup PRESET_MANUAL * Migrate ecobee * No conditional features * KNX: Migrate climate component to new climate platform (#24931) * Migrate climate component * Remove unused code * Corrected line length * Lint * Lint * fix tests * Fix value * Migrate geniushub to new climate schema (#24191) * Update one * Fix model climate v2 * Cleanup p4 * Add comfort hold mode * Fix old code * Update homeassistant/components/climate/__init__.py Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io> * Update homeassistant/components/climate/const.py Co-Authored-By: Paulus Schoutsen <paulus@home-assistant.io> * First renaming * Rename operation to hvac for paulus * Rename hold mode to preset mode * Cleanup & update comments * Remove on/off * Fix supported feature count * Update services * Update demo * Fix tests & use current_hvac * Update comment * Fix tests & add typing * Add more typing * Update modes * Fix tests * Cleanup low/high with range * Update homematic part 1 * Finish homematic * Fix lint * fix hm mapping * Support simple devices * convert lcn * migrate oem * Fix xs1 * update hive * update mil * Update toon * migrate deconz * cleanup * update tesla * Fix lint * Fix vera * Migrate zwave * Migrate velbus * Cleanup humity feature * Cleanup * Migrate wink * migrate dyson * Fix current hvac * Renaming * Fix lint * Migrate tfiac * migrate tado * delinted * delinted * use latest client * clean up mappings * clean up mappings * add duration to set_temperature * add duration to set_temperature * manual rebase * tweak * fix regression * small fix * fix rebase mixup * address comments * finish refactor * fix regression * tweak type hints * delint * manual rebase * WIP: Fixes for honeywell migration to climate-1.0 (#24938) * add type hints * code tidy-up * Fixes for incomfort migration to climate-1.0 (#24936) * delint type hints * no async unless await * revert: no async unless await * revert: no async unless await 2 * delint * fix typo * Fix homekit_controller on climate-1.0 (#24948) * Fix tests on climate-1.0 branch * As part of climate-1.0, make state return the heating-cooling.current characteristic * Fixes from review * lint * Fix imports * Migrate stibel_eltron * Fix lint * Migrate coolmaster to climate 1.0 (#24967) * Migrate coolmaster to climate 1.0 * fix lint errors * More lint fixes * Fix demo to work with UI * Migrate spider * Demo update * Updated frontend to 20190705.0 * Fix boost mode (#24980) * Prepare Netatmo for climate 1.0 (#24973) * Migration Netatmo * Address comments * Update climate.py * Migrate ephember * Migrate Sensibo * Implemented review comments (#24942) * Migrate ESPHome * Migrate MQTT * Migrate Nest * Migrate melissa * Initial/partial migration of ST * Migrate ST * Remove Away mode (#24995) * Migrate evohome, cache access tokens (#24491) * add water_heater, add storage - initial commit * add water_heater, add storage - initial commit delint add missing code desiderata update honeywell client library & CODEOWNER add auth_tokens code, refactor & delint refactor for broker delint * Add Broker, Water Heater & Refactor add missing code desiderata * update honeywell client library & CODEOWNER add auth_tokens code, refactor & delint refactor for broker * bugfix - loc_idx may not be 0 more refactor - ensure pure async more refactoring appears all r/o attributes are working tweak precsion, DHW & delint remove unused code remove unused code 2 remove unused code, refactor _save_auth_tokens() * support RoundThermostat bugfix opmode, switch to util.dt, add until=1h revert breaking change * store at_expires as naive UTC remove debug code delint tidy up exception handling delint add water_heater, add storage - initial commit delint add missing code desiderata update honeywell client library & CODEOWNER add auth_tokens code, refactor & delint refactor for broker add water_heater, add storage - initial commit delint add missing code desiderata update honeywell client library & CODEOWNER add auth_tokens code, refactor & delint refactor for broker delint bugfix - loc_idx may not be 0 more refactor - ensure pure async more refactoring appears all r/o attributes are working tweak precsion, DHW & delint remove unused code remove unused code 2 remove unused code, refactor _save_auth_tokens() support RoundThermostat bugfix opmode, switch to util.dt, add until=1h revert breaking change store at_expires as naive UTC remove debug code delint tidy up exception handling delint * update CODEOWNERS * fix regression * fix requirements * migrate to climate-1.0 * tweaking * de-lint * TCS working? & delint * tweaking * TCS code finalised * remove available() logic * refactor _switchpoints() * tidy up switchpoint code * tweak * teaking device_state_attributes * some refactoring * move PRESET_CUSTOM back to evohome * move CONF_ACCESS_TOKEN_EXPIRES CONF_REFRESH_TOKEN back to evohome * refactor SP code and dt conversion * delinted * delinted * remove water_heater * fix regression * Migrate homekit * Cleanup away mode * Fix tests * add helpers * fix tests melissa * Fix nehueat * fix zwave * add more tests * fix deconz * Fix climate test emulate_hue * fix tests * fix dyson tests * fix demo with new layout * fix honeywell * Switch homekit_controller to use HVAC_MODE_HEAT_COOL instead of HVAC_MODE_AUTO (#25009) * Lint * PyLint * Pylint * fix fritzbox tests * Fix google * Fix all tests * Fix lint * Fix auto for homekit like controler * Fix lint * fix lint
2025-12-24 12:59:34 +00:00 · 2019-07-08 14:00:24 +02:00
parent c2f1c4b981
commit 84cf76ba36
119 changed files with 5240 additions and 5525 deletions
--- a/homeassistant/components/nest/climate.py
+++ b/homeassistant/components/nest/climate.py
@@ -5,13 +5,12 @@ import voluptuous as vol

 from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice
 from homeassistant.components.climate.const import (
-    ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, STATE_AUTO, STATE_COOL,
-    STATE_ECO, STATE_HEAT, SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE,
-    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
-    SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW)
+    ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, FAN_AUTO, FAN_ON,
+    HVAC_MODE_AUTO, HVAC_MODE_COOL, HVAC_MODE_HEAT, HVAC_MODE_OFF,
+    SUPPORT_PRESET_MODE, SUPPORT_FAN_MODE, SUPPORT_TARGET_TEMPERATURE,
+    SUPPORT_TARGET_TEMPERATURE_RANGE, PRESET_AWAY, PRESET_ECO)
 from homeassistant.const import (
-    ATTR_TEMPERATURE, CONF_SCAN_INTERVAL, STATE_OFF, STATE_ON, TEMP_CELSIUS,
-    TEMP_FAHRENHEIT)
+    ATTR_TEMPERATURE, CONF_SCAN_INTERVAL, TEMP_CELSIUS, TEMP_FAHRENHEIT)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect

 from . import DATA_NEST, DOMAIN as NEST_DOMAIN, SIGNAL_NEST_UPDATE
@@ -24,6 +23,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })

 NEST_MODE_HEAT_COOL = 'heat-cool'
+NEST_MODE_ECO = 'eco'
+NEST_MODE_HEAT = 'heat'
+NEST_MODE_COOL = 'cool'
+NEST_MODE_OFF = 'off'
+
+PRESET_MODES = [PRESET_AWAY, PRESET_ECO]


 def setup_platform(hass, config, add_entities, discovery_info=None):
@@ -53,29 +58,28 @@ class NestThermostat(ClimateDevice):
        self._unit = temp_unit
        self.structure = structure
        self.device = device
-        self._fan_list = [STATE_ON, STATE_AUTO]
+        self._fan_modes = [FAN_ON, FAN_AUTO]

        # Set the default supported features
        self._support_flags = (SUPPORT_TARGET_TEMPERATURE |
-                               SUPPORT_OPERATION_MODE | SUPPORT_AWAY_MODE)
+                               SUPPORT_PRESET_MODE)

        # Not all nest devices support cooling and heating remove unused
-        self._operation_list = [STATE_OFF]
+        self._operation_list = []
+
+        if self.device.can_heat and self.device.can_cool:
+            self._operation_list.append(HVAC_MODE_AUTO)
+            self._support_flags = (self._support_flags |
+                                   SUPPORT_TARGET_TEMPERATURE_RANGE)

        # Add supported nest thermostat features
        if self.device.can_heat:
-            self._operation_list.append(STATE_HEAT)
+            self._operation_list.append(HVAC_MODE_HEAT)

        if self.device.can_cool:
-            self._operation_list.append(STATE_COOL)
+            self._operation_list.append(HVAC_MODE_COOL)

-        if self.device.can_heat and self.device.can_cool:
-            self._operation_list.append(STATE_AUTO)
-            self._support_flags = (self._support_flags |
-                                   SUPPORT_TARGET_TEMPERATURE_HIGH |
-                                   SUPPORT_TARGET_TEMPERATURE_LOW)
-
-        self._operation_list.append(STATE_ECO)
+        self._operation_list.append(HVAC_MODE_OFF)

        # feature of device
        self._has_fan = self.device.has_fan
@@ -151,25 +155,29 @@ class NestThermostat(ClimateDevice):
        return self._temperature

    @property
-    def current_operation(self):
+    def hvac_mode(self):
        """Return current operation ie. heat, cool, idle."""
-        if self._mode in [STATE_HEAT, STATE_COOL, STATE_OFF, STATE_ECO]:
+        if self._mode in \
+                (NEST_MODE_HEAT, NEST_MODE_COOL, NEST_MODE_OFF):
            return self._mode
+        if self._mode == NEST_MODE_ECO:
+            # We assume the first operation in operation list is the main one
+            return self._operation_list[0]
        if self._mode == NEST_MODE_HEAT_COOL:
-            return STATE_AUTO
+            return HVAC_MODE_AUTO
        return None

    @property
    def target_temperature(self):
        """Return the temperature we try to reach."""
-        if self._mode not in (NEST_MODE_HEAT_COOL, STATE_ECO):
+        if self._mode not in (NEST_MODE_HEAT_COOL, NEST_MODE_ECO):
            return self._target_temperature
        return None

    @property
    def target_temperature_low(self):
        """Return the lower bound temperature we try to reach."""
-        if self._mode == STATE_ECO:
+        if self._mode == NEST_MODE_ECO:
            return self._eco_temperature[0]
        if self._mode == NEST_MODE_HEAT_COOL:
            return self._target_temperature[0]
@@ -178,17 +186,12 @@ class NestThermostat(ClimateDevice):
    @property
    def target_temperature_high(self):
        """Return the upper bound temperature we try to reach."""
-        if self._mode == STATE_ECO:
+        if self._mode == NEST_MODE_ECO:
            return self._eco_temperature[1]
        if self._mode == NEST_MODE_HEAT_COOL:
            return self._target_temperature[1]
        return None

-    @property
-    def is_away_mode_on(self):
-        """Return if away mode is on."""
-        return self._away
-
    def set_temperature(self, **kwargs):
        """Set new target temperature."""
        import nest
@@ -211,46 +214,69 @@ class NestThermostat(ClimateDevice):
            # restore target temperature
            self.schedule_update_ha_state(True)

-    def set_operation_mode(self, operation_mode):
+    def set_hvac_mode(self, hvac_mode):
        """Set operation mode."""
-        if operation_mode in [STATE_HEAT, STATE_COOL, STATE_OFF, STATE_ECO]:
-            device_mode = operation_mode
-        elif operation_mode == STATE_AUTO:
+        if hvac_mode in (HVAC_MODE_HEAT, HVAC_MODE_COOL, HVAC_MODE_OFF):
+            device_mode = hvac_mode
+        elif hvac_mode == HVAC_MODE_AUTO:
            device_mode = NEST_MODE_HEAT_COOL
        else:
-            device_mode = STATE_OFF
+            device_mode = HVAC_MODE_OFF
            _LOGGER.error(
                "An error occurred while setting device mode. "
-                "Invalid operation mode: %s", operation_mode)
+                "Invalid operation mode: %s", hvac_mode)
        self.device.mode = device_mode

    @property
-    def operation_list(self):
+    def hvac_modes(self):
        """List of available operation modes."""
        return self._operation_list

-    def turn_away_mode_on(self):
-        """Turn away on."""
-        self.structure.away = True
+    @property
+    def preset_mode(self):
+        """Return current preset mode."""
+        if self._away:
+            return PRESET_AWAY

-    def turn_away_mode_off(self):
-        """Turn away off."""
-        self.structure.away = False
+        if self._mode == NEST_MODE_ECO:
+            return PRESET_ECO
+
+        return None

    @property
-    def current_fan_mode(self):
+    def preset_modes(self):
+        """Return preset modes."""
+        return PRESET_MODES
+
+    def set_preset_mode(self, preset_mode):
+        """Set preset mode."""
+        if preset_mode == self.preset_mode:
+            return
+
+        if self._away:
+            self.structure.away = False
+        elif preset_mode == PRESET_AWAY:
+            self.structure.away = True
+
+        if self.preset_mode == PRESET_ECO:
+            self.device.mode = self._operation_list[0]
+        elif preset_mode == PRESET_ECO:
+            self.device.mode = NEST_MODE_ECO
+
+    @property
+    def fan_mode(self):
        """Return whether the fan is on."""
        if self._has_fan:
            # Return whether the fan is on
-            return STATE_ON if self._fan else STATE_AUTO
+            return FAN_ON if self._fan else FAN_AUTO
        # No Fan available so disable slider
        return None

    @property
-    def fan_list(self):
+    def fan_modes(self):
        """List of available fan modes."""
        if self._has_fan:
-            return self._fan_list
+            return self._fan_modes
        return None

    def set_fan_mode(self, fan_mode):