manual rebase

homeassistant/components/climate/__init__.py

@@ -28,7 +28,7 @@
     ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_STEP, DOMAIN, HVAC_MODES,
     SERVICE_SET_AUX_HEAT, SERVICE_SET_FAN_MODE, SERVICE_SET_PRESET_MODE,
     SERVICE_SET_HUMIDITY, SERVICE_SET_HVAC_MODE, SERVICE_SET_SWING_MODE,
-    SERVICE_SET_TEMPERATURE, SUPPORT_AUX_HEAT, SUPPORT_HVAC_ACTION,
+    SERVICE_SET_TEMPERATURE, SUPPORT_AUX_HEAT,
     SUPPORT_FAN_MODE, SUPPORT_PRESET_MODE, SUPPORT_SWING_MODE,
     SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_TEMPERATURE_RANGE)
 from .reproduce_state import async_reproduce_states  # noqa
@@ -70,7 +70,7 @@
 })
 SET_PRESET_MODE_SCHEMA = vol.Schema({
     vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
-    vol.Required(ATTR_PRESET_MODE): cv.string,
+    vol.Required(ATTR_PRESET_MODE): vol.Maybe(cv.string),
 })
 SET_HVAC_MODE_SCHEMA = vol.Schema({
     vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
@@ -192,7 +192,7 @@ def state_attributes(self) -> Dict[str, Any]:
             data[ATTR_FAN_MODE] = self.fan_mode
             data[ATTR_FAN_MODES] = self.fan_modes
 
-        if supported_features & SUPPORT_HVAC_ACTION:
+        if self.hvac_action:
             data[ATTR_HVAC_ACTIONS] = self.hvac_action
 
         if supported_features & SUPPORT_PRESET_MODE:
@@ -264,48 +264,75 @@ def target_temperature_step(self) -> Optional[float]:
 
     @property
     def target_temperature_high(self) -> Optional[float]:
-        """Return the highbound target temperature we try to reach."""
-        return None
+        """Return the highbound target temperature we try to reach.
+
+        Requires SUPPORT_TARGET_TEMPERATURE_RANGE.
+        """
+        raise NotImplementedError
 
     @property
     def target_temperature_low(self) -> Optional[float]:
-        """Return the lowbound target temperature we try to reach."""
-        return None
+        """Return the lowbound target temperature we try to reach.
+
+        Requires SUPPORT_TARGET_TEMPERATURE_RANGE.
+        """
+        raise NotImplementedError
 
     @property
     def preset_mode(self) -> Optional[str]:
-        """Return the current preset mode, e.g., home, away, temp."""
-        return None
+        """Return the current preset mode, e.g., home, away, temp.
+
+        Requires SUPPORT_PRESET_MODE.
+        """
+        raise NotImplementedError
 
     @property
     def preset_modes(self) -> Optional[List[str]]:
-        """Return a list of available preset modes."""
-        return None
+        """Return a list of available preset modes.
+
+        Requires SUPPORT_PRESET_MODE.
+        """
+        raise NotImplementedError
 
     @property
     def is_aux_heat(self) -> Optional[str]:
-        """Return true if aux heater."""
-        return None
+        """Return true if aux heater.
+
+        Requires SUPPORT_AUX_HEAT.
+        """
+        raise NotImplementedError
 
     @property
     def fan_mode(self) -> Optional[str]:
-        """Return the fan setting."""
-        return None
+        """Return the fan setting.
+
+        Requires SUPPORT_FAN_MODE.
+        """
+        raise NotImplementedError
 
     @property
     def fan_modes(self) -> Optional[List[str]]:
-        """Return the list of available fan modes."""
-        return None
+        """Return the list of available fan modes.
+
+        Requires SUPPORT_FAN_MODE.
+        """
+        raise NotImplementedError
 
     @property
     def swing_mode(self) -> Optional[str]:
-        """Return the fan setting."""
-        return None
+        """Return the swing setting.
+
+        Requires SUPPORT_SWING_MODE.
+        """
+        raise NotImplementedError
 
     @property
     def swing_modes(self) -> Optional[List[str]]:
-        """Return the list of available swing modes."""
-        return None
+        """Return the list of available swing modes.
+
+        Requires SUPPORT_SWING_MODE.
+        """
+        raise NotImplementedError
 
     def set_temperature(self, **kwargs) -> None:
         """Set new target temperature."""

homeassistant/components/deconz/climate.py

@@ -25,9 +25,6 @@ async def async_setup_platform(
 SUPPORT_HVAC = HVAC_MODE_HEAT | HVAC_MODE_OFF
 
 
-SUPPORT_HVAC = HVAC_MODE_HEAT | HVAC_MODE_OFF
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ climate devices.
 

homeassistant/components/demo/climate.py

@@ -4,39 +4,93 @@
     ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, CURRENT_HVAC_COOL,
     CURRENT_HVAC_HEAT, HVAC_MODE_AUTO, HVAC_MODE_COOL, HVAC_MODE_HEAT,
     HVAC_MODE_HEAT_COOL, HVAC_MODE_OFF, HVAC_MODES, SUPPORT_AUX_HEAT,
-    SUPPORT_HVAC_ACTION, SUPPORT_FAN_MODE, SUPPORT_PRESET_MODE,
-    SUPPORT_SWING_MODE, SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_HUMIDITY_RANGE,
-    SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_TEMPERATURE_RANGE)
+    SUPPORT_FAN_MODE, SUPPORT_PRESET_MODE, SUPPORT_SWING_MODE,
+    SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_TEMPERATURE,
+    SUPPORT_TARGET_TEMPERATURE_RANGE)
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
 
-SUPPORT_FLAGS = SUPPORT_TARGET_HUMIDITY_RANGE
+SUPPORT_FLAGS = 0
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo climate devices."""
     add_entities([
-        DemoClimate('HeatPump', 68, TEMP_FAHRENHEIT, None, 77,
-                    None, None, None, None, HVAC_MODE_AUTO,
-                    CURRENT_HVAC_HEAT, None, None, None,
-                    [HVAC_MODE_HEAT, HVAC_MODE_OFF]),
-        DemoClimate('Hvac', 21, TEMP_CELSIUS, None, 22, 'On High',
-                    67, 54, 'Off', HVAC_MODE_COOL, CURRENT_HVAC_COOL,
-                    False, None, None, HVAC_MODES),
-        DemoClimate('Ecobee', None, TEMP_CELSIUS, 'home', 23, 'Auto Low',
-                    None, None, 'Auto', HVAC_MODE_HEAT_COOL, None, None, 24,
-                    21, [HVAC_MODE_AUTO, HVAC_MODE_HEAT_COOL, HVAC_MODE_COOL,
-                         HVAC_MODE_HEAT])
+        DemoClimate(
+            name='HeatPump',
+            target_temperature=68,
+            unit_of_measurement=TEMP_FAHRENHEIT,
+            preset=None,
+            current_temperature=77,
+            fan_mode=None,
+            target_humidity=None,
+            current_humidity=None,
+            swing_mode=None,
+            hvac_mode=HVAC_MODE_HEAT,
+            hvac_action=CURRENT_HVAC_HEAT,
+            aux=None,
+            target_temp_high=None,
+            target_temp_low=None,
+            hvac_modes=[HVAC_MODE_HEAT, HVAC_MODE_OFF]
+        ),
+        DemoClimate(
+            name='Hvac',
+            target_temperature=21,
+            unit_of_measurement=TEMP_CELSIUS,
+            preset=None,
+            current_temperature=22,
+            fan_mode='On High',
+            target_humidity=67,
+            current_humidity=54,
+            swing_mode='Off',
+            hvac_mode=HVAC_MODE_COOL,
+            hvac_action=CURRENT_HVAC_COOL,
+            aux=False,
+            target_temp_high=None,
+            target_temp_low=None,
+            hvac_modes=HVAC_MODES
+        ),
+        DemoClimate(
+            name='Ecobee',
+            target_temperature=None,
+            unit_of_measurement=TEMP_CELSIUS,
+            preset='home',
+            preset_modes=['home', 'eco'],
+            current_temperature=23,
+            fan_mode='Auto Low',
+            target_humidity=None,
+            current_humidity=None,
+            swing_mode='Auto',
+            hvac_mode=HVAC_MODE_HEAT_COOL,
+            hvac_action=None,
+            aux=None,
+            target_temp_high=24,
+            target_temp_low=21,
+            hvac_modes=[HVAC_MODE_AUTO, HVAC_MODE_HEAT_COOL, HVAC_MODE_COOL,
+                        HVAC_MODE_HEAT])
     ])
 
 
 class DemoClimate(ClimateDevice):
     """Representation of a demo climate device."""
 
     def __init__(
-            self, name, target_temperature, unit_of_measurement, preset,
-            current_temperature, fan_mode, target_humidity, current_humidity,
-            swing_mode, hvac_mode, hvac_action, aux, target_temp_high,
-            target_temp_low, hvac_modes
+            self,
+            name,
+            target_temperature,
+            unit_of_measurement,
+            preset,
+            current_temperature,
+            fan_mode,
+            target_humidity,
+            current_humidity,
+            swing_mode,
+            hvac_mode,
+            hvac_action,
+            aux,
+            target_temp_high,
+            target_temp_low,
+            hvac_modes,
+            preset_modes=None,
     ):
         """Initialize the climate device."""
         self._name = name
@@ -54,8 +108,7 @@ def __init__(
         if swing_mode is not None:
             self._support_flags = self._support_flags | SUPPORT_SWING_MODE
         if hvac_action is not None:
-            self._support_flags = \
-                self._support_flags | SUPPORT_HVAC_ACTION
+            self._support_flags = self._support_flags
         if aux is not None:
             self._support_flags = self._support_flags | SUPPORT_AUX_HEAT
         if target_temp_high is not None and target_temp_low is not None:
@@ -65,6 +118,7 @@ def __init__(
         self._target_humidity = target_humidity
         self._unit_of_measurement = unit_of_measurement
         self._preset = preset
+        self._preset_modes = preset_modes
         self._current_temperature = current_temperature
         self._current_humidity = current_humidity
         self._current_fan_mode = fan_mode
@@ -150,9 +204,14 @@ def hvac_modes(self):
 
     @property
     def preset_mode(self):
-        """Return hold mode setting."""
+        """Return preset mode."""
         return self._preset
 
+    @property
+    def preset_modes(self):
+        """Return preset modes."""
+        return self._preset_modes
+
     @property
     def is_aux_heat(self):
         """Return true if aux heat is on."""

homeassistant/components/dyson/climate.py

@@ -8,7 +8,7 @@
 from homeassistant.components.climate import ClimateDevice
 from homeassistant.components.climate.const import (
     CURRENT_HVAC_COOL, CURRENT_HVAC_HEAT, CURRENT_HVAC_IDLE, HVAC_MODE_COOL,
-    HVAC_MODE_HEAT, SUPPORT_HVAC_ACTION, SUPPORT_FAN_MODE, FAN_FOCUS,
+    HVAC_MODE_HEAT, SUPPORT_FAN_MODE, FAN_FOCUS,
     FAN_DIFFUSE, SUPPORT_TARGET_TEMPERATURE)
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 
@@ -18,8 +18,7 @@
 
 SUPPORT_FAN = [FAN_FOCUS, FAN_DIFFUSE]
 SUPPORT_HVAG = [HVAC_MODE_COOL, HVAC_MODE_HEAT]
-SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE |
-                 SUPPORT_HVAC_ACTION)
+SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):

homeassistant/components/geniushub/manifest.json

@@ -3,7 +3,7 @@
   "name": "Genius Hub",
   "documentation": "https://www.home-assistant.io/components/geniushub",
   "requirements": [
-    "geniushub-client==0.4.11"
+    "geniushub-client==0.4.12"
   ],
   "dependencies": [],
   "codeowners": ["@zxdavb"]

homeassistant/components/honeywell/climate.py

@@ -10,8 +10,8 @@
 from homeassistant.components.climate import ClimateDevice, PLATFORM_SCHEMA
 from homeassistant.components.climate.const import (
     ATTR_FAN_MODE, ATTR_FAN_MODES,
-    ATTR_OPERATION_MODE, ATTR_OPERATION_LIST, SUPPORT_TARGET_TEMPERATURE,
-    SUPPORT_AWAY_MODE, SUPPORT_OPERATION_MODE)
+    ATTR_HVAC_MODE, ATTR_OPERATION_LIST, SUPPORT_TARGET_TEMPERATURE,
+    SUPPORT_AWAY_MODE)
 from homeassistant.const import (
     CONF_PASSWORD, CONF_USERNAME, TEMP_CELSIUS, TEMP_FAHRENHEIT,
     ATTR_TEMPERATURE, CONF_REGION)

homeassistant/components/lcn/climate.py

@@ -52,7 +52,7 @@ def __init__(self, config, address_connection):
 
         self._current_temperature = None
         self._target_temperature = None
-        self._is_on = True
+        self._is_on = None
 
     async def async_added_to_hass(self):
         """Run when entity about to be added to hass."""

homeassistant/components/mill/climate.py

@@ -7,10 +7,9 @@
 from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice
 from homeassistant.components.climate.const import (
     DOMAIN, HVAC_MODE_HEAT, HVAC_MODE_OFF, SUPPORT_FAN_MODE,
-    SUPPORT_TARGET_TEMPERATURE)
+    SUPPORT_TARGET_TEMPERATURE, FAN_ON)
 from homeassistant.const import (
-    ATTR_TEMPERATURE, CONF_PASSWORD, CONF_USERNAME, STATE_OFF, STATE_ON,
-    TEMP_CELSIUS)
+    ATTR_TEMPERATURE, CONF_PASSWORD, CONF_USERNAME, TEMP_CELSIUS)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -143,7 +142,7 @@ def fan_mode(self):
     @property
     def fan_modes(self):
         """List of available fan modes."""
-        return [STATE_ON, STATE_OFF]
+        return [FAN_ON, HVAC_MODE_OFF]
 
     @property
     def min_temp(self):
@@ -185,7 +184,7 @@ async def async_set_temperature(self, **kwargs):
 
     async def async_set_fan_mode(self, fan_mode):
         """Set new target fan mode."""
-        fan_status = 1 if fan_mode == STATE_ON else 0
+        fan_status = 1 if fan_mode == FAN_ON else 0
         await self._conn.heater_control(
             self._heater.device_id, fan_status=fan_status)
 

homeassistant/components/nest/climate.py

@@ -52,7 +52,7 @@ def __init__(self, structure, device, temp_unit):
         self._unit = temp_unit
         self.structure = structure
         self.device = device
-        self._fan_modes = [STATE_ON, STATE_AUTO]
+        self._fan_modes = [FAN_ON, FAN_AUTO]
 
         # Set the default supported features
         self._support_flags = (SUPPORT_TARGET_TEMPERATURE |

homeassistant/components/oem/climate.py

@@ -8,8 +8,7 @@
 from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice
 from homeassistant.components.climate.const import (
     CURRENT_HVAC_HEAT, CURRENT_HVAC_IDLE, CURRENT_HVAC_OFF, HVAC_MODE_AUTO,
-    HVAC_MODE_HEAT, HVAC_MODE_OFF, SUPPORT_HVAC_ACTION,
-    SUPPORT_TARGET_TEMPERATURE)
+    HVAC_MODE_HEAT, HVAC_MODE_OFF, SUPPORT_TARGET_TEMPERATURE)
 from homeassistant.const import (
     ATTR_TEMPERATURE, CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT,
     CONF_USERNAME, TEMP_CELSIUS)
@@ -26,7 +25,7 @@
     vol.Inclusive(CONF_PASSWORD, 'authentication'): cv.string,
 })
 
-SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_HVAC_ACTION
+SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE
 SUPPORT_HVAC = [HVAC_MODE_AUTO, HVAC_MODE_HEAT, HVAC_MODE_OFF]