evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SMALL-PR] Don't make climate calls if feature is not supported (#11841)

Browse source 
* Don't make climate calls if feature is not supported

* Implemented suggested code review changes & cleanup

* Fix demo climate unit tests
This commit is contained in:
Frantz 2018-01-24 10:35:31 +02:00 • committed by Pascal Vizeli
parent 5b0a475197
commit 676c95ed2d
2 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
homeassistant/components/climate/__init__.py
View file

@ -499,53 +499,54 @@ class ClimateDevice(Entity):
self.precision), self.precision),
} }
supported_features = self.supported_features
if self.target_temperature_step is not None: if self.target_temperature_step is not None:
data[ATTR_TARGET_TEMP_STEP] = self.target_temperature_step data[ATTR_TARGET_TEMP_STEP] = self.target_temperature_step
target_temp_high = self.target_temperature_high if supported_features & SUPPORT_TARGET_TEMPERATURE_HIGH:
if target_temp_high is not None:
data[ATTR_TARGET_TEMP_HIGH] = show_temp( data[ATTR_TARGET_TEMP_HIGH] = show_temp(
self.hass, self.target_temperature_high, self.temperature_unit, self.hass, self.target_temperature_high, self.temperature_unit,
self.precision) self.precision)
if supported_features & SUPPORT_TARGET_TEMPERATURE_LOW:
data[ATTR_TARGET_TEMP_LOW] = show_temp( data[ATTR_TARGET_TEMP_LOW] = show_temp(
self.hass, self.target_temperature_low, self.temperature_unit, self.hass, self.target_temperature_low, self.temperature_unit,
self.precision) self.precision)
humidity = self.target_humidity if supported_features & SUPPORT_TARGET_HUMIDITY:
if humidity is not None: data[ATTR_HUMIDITY] = self.target_humidity
data[ATTR_HUMIDITY] = humidity
data[ATTR_CURRENT_HUMIDITY] = self.current_humidity data[ATTR_CURRENT_HUMIDITY] = self.current_humidity
data[ATTR_MIN_HUMIDITY] = self.min_humidity
data[ATTR_MAX_HUMIDITY] = self.max_humidity
fan_mode = self.current_fan_mode if supported_features & SUPPORT_TARGET_HUMIDITY_LOW:
if fan_mode is not None: data[ATTR_MIN_HUMIDITY] = self.min_humidity
data[ATTR_FAN_MODE] = fan_mode
if supported_features & SUPPORT_TARGET_HUMIDITY_HIGH:
data[ATTR_MAX_HUMIDITY] = self.max_humidity
if supported_features & SUPPORT_FAN_MODE:
data[ATTR_FAN_MODE] = self.current_fan_mode
if self.fan_list: if self.fan_list:
data[ATTR_FAN_LIST] = self.fan_list data[ATTR_FAN_LIST] = self.fan_list
operation_mode = self.current_operation if supported_features & SUPPORT_OPERATION_MODE:
if operation_mode is not None: data[ATTR_OPERATION_MODE] = self.current_operation
data[ATTR_OPERATION_MODE] = operation_mode
if self.operation_list: if self.operation_list:
data[ATTR_OPERATION_LIST] = self.operation_list data[ATTR_OPERATION_LIST] = self.operation_list
is_hold = self.current_hold_mode if supported_features & SUPPORT_HOLD_MODE:
if is_hold is not None: data[ATTR_HOLD_MODE] = self.current_hold_mode
data[ATTR_HOLD_MODE] = is_hold
swing_mode = self.current_swing_mode if supported_features & SUPPORT_SWING_MODE:
if swing_mode is not None: data[ATTR_SWING_MODE] = self.current_swing_mode
data[ATTR_SWING_MODE] = swing_mode
if self.swing_list: if self.swing_list:
data[ATTR_SWING_LIST] = self.swing_list data[ATTR_SWING_LIST] = self.swing_list
is_away = self.is_away_mode_on if supported_features & SUPPORT_AWAY_MODE:
if is_away is not None: is_away = self.is_away_mode_on
data[ATTR_AWAY_MODE] = STATE_ON if is_away else STATE_OFF data[ATTR_AWAY_MODE] = STATE_ON if is_away else STATE_OFF
is_aux_heat = self.is_aux_heat_on if supported_features & SUPPORT_AUX_HEAT:
if is_aux_heat is not None: is_aux_heat = self.is_aux_heat_on
data[ATTR_AUX_HEAT] = STATE_ON if is_aux_heat else STATE_OFF data[ATTR_AUX_HEAT] = STATE_ON if is_aux_heat else STATE_OFF
return data return data

2
homeassistant/components/climate/demo.py
View file

@ -7,6 +7,7 @@ https://home-assistant.io/components/demo/
from homeassistant.components.climate import ( from homeassistant.components.climate import (
ClimateDevice, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, ClimateDevice, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW,
SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_HUMIDITY, SUPPORT_TARGET_TEMPERATURE, SUPPORT_TARGET_HUMIDITY,
SUPPORT_TARGET_HUMIDITY_LOW, SUPPORT_TARGET_HUMIDITY_HIGH,
SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE, SUPPORT_FAN_MODE, SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE, SUPPORT_FAN_MODE,
SUPPORT_OPERATION_MODE, SUPPORT_AUX_HEAT, SUPPORT_SWING_MODE, SUPPORT_OPERATION_MODE, SUPPORT_AUX_HEAT, SUPPORT_SWING_MODE,
SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW, SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW,
@ -14,6 +15,7 @@ from homeassistant.components.climate import (
from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE
SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_TARGET_HUMIDITY | SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_TARGET_HUMIDITY |
SUPPORT_TARGET_HUMIDITY_LOW | SUPPORT_TARGET_HUMIDITY_HIGH |
SUPPORT_AWAY_MODE | SUPPORT_HOLD_MODE | SUPPORT_FAN_MODE | SUPPORT_AWAY_MODE | SUPPORT_HOLD_MODE | SUPPORT_FAN_MODE |
SUPPORT_OPERATION_MODE | SUPPORT_AUX_HEAT | SUPPORT_OPERATION_MODE | SUPPORT_AUX_HEAT |
SUPPORT_SWING_MODE | SUPPORT_TARGET_TEMPERATURE_HIGH | SUPPORT_SWING_MODE | SUPPORT_TARGET_TEMPERATURE_HIGH |