jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-15 17:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce target_temperature_state_address for climate device (#21541)

Browse Source
This commit is contained in:
Marvin Wichmann 2019-03-07 22:53:42 +01:00 committed by Diogo Gomes
parent c91fb82807
commit 5112f8f6b5
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/knx/__init__.py
View File

@ -11,7 +11,7 @@ import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.event import async_track_state_change
from homeassistant.helpers.script import Script from homeassistant.helpers.script import Script
REQUIREMENTS = ['xknx==0.9.4'] REQUIREMENTS = ['xknx==0.10.0']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -25,6 +25,7 @@ CONF_KNX_LOCAL_IP = "local_ip"
CONF_KNX_FIRE_EVENT = "fire_event" CONF_KNX_FIRE_EVENT = "fire_event"
CONF_KNX_FIRE_EVENT_FILTER = "fire_event_filter" CONF_KNX_FIRE_EVENT_FILTER = "fire_event_filter"
CONF_KNX_STATE_UPDATER = "state_updater" CONF_KNX_STATE_UPDATER = "state_updater"
CONF_KNX_RATE_LIMIT = "rate_limit"
CONF_KNX_EXPOSE = "expose" CONF_KNX_EXPOSE = "expose"
CONF_KNX_EXPOSE_TYPE = "type" CONF_KNX_EXPOSE_TYPE = "type"
CONF_KNX_EXPOSE_ADDRESS = "address" CONF_KNX_EXPOSE_ADDRESS = "address"
@ -62,6 +63,8 @@ CONFIG_SCHEMA = vol.Schema({
vol.Inclusive(CONF_KNX_FIRE_EVENT_FILTER, 'fire_ev'): vol.Inclusive(CONF_KNX_FIRE_EVENT_FILTER, 'fire_ev'):
vol.All(cv.ensure_list, [cv.string]), vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_KNX_STATE_UPDATER, default=True): cv.boolean, vol.Optional(CONF_KNX_STATE_UPDATER, default=True): cv.boolean,
vol.Optional(CONF_KNX_RATE_LIMIT, default=20):
vol.All(vol.Coerce(int), vol.Range(min=1, max=100)),
vol.Optional(CONF_KNX_EXPOSE): vol.Optional(CONF_KNX_EXPOSE):
vol.All( vol.All(
cv.ensure_list, cv.ensure_list,
@ -138,7 +141,8 @@ class KNXModule:
def init_xknx(self): def init_xknx(self):
"""Initialize of KNX object.""" """Initialize of KNX object."""
from xknx import XKNX from xknx import XKNX
self.xknx = XKNX(config=self.config_file(), loop=self.hass.loop) self.xknx = XKNX(config=self.config_file(), loop=self.hass.loop,
rate_limit=self.config[DOMAIN][CONF_KNX_RATE_LIMIT])
async def start(self): async def start(self):
"""Start KNX object. Connect to tunneling or Routing device.""" """Start KNX object. Connect to tunneling or Routing device."""

8
homeassistant/components/knx/climate.py
View File

@ -17,6 +17,7 @@ CONF_SETPOINT_SHIFT_MAX = 'setpoint_shift_max'
CONF_SETPOINT_SHIFT_MIN = 'setpoint_shift_min' CONF_SETPOINT_SHIFT_MIN = 'setpoint_shift_min'
CONF_TEMPERATURE_ADDRESS = 'temperature_address' CONF_TEMPERATURE_ADDRESS = 'temperature_address'
CONF_TARGET_TEMPERATURE_ADDRESS = 'target_temperature_address' CONF_TARGET_TEMPERATURE_ADDRESS = 'target_temperature_address'
CONF_TARGET_TEMPERATURE_STATE_ADDRESS = 'target_temperature_state_address'
CONF_OPERATION_MODE_ADDRESS = 'operation_mode_address' CONF_OPERATION_MODE_ADDRESS = 'operation_mode_address'
CONF_OPERATION_MODE_STATE_ADDRESS = 'operation_mode_state_address' CONF_OPERATION_MODE_STATE_ADDRESS = 'operation_mode_state_address'
CONF_CONTROLLER_STATUS_ADDRESS = 'controller_status_address' CONF_CONTROLLER_STATUS_ADDRESS = 'controller_status_address'
@ -57,7 +58,8 @@ OPERATION_MODES_INV = dict((
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Required(CONF_TEMPERATURE_ADDRESS): cv.string, vol.Required(CONF_TEMPERATURE_ADDRESS): cv.string,
vol.Required(CONF_TARGET_TEMPERATURE_ADDRESS): cv.string, vol.Required(CONF_TARGET_TEMPERATURE_STATE_ADDRESS): cv.string,
vol.Optional(CONF_TARGET_TEMPERATURE_ADDRESS): cv.string,
vol.Optional(CONF_SETPOINT_SHIFT_ADDRESS): cv.string, vol.Optional(CONF_SETPOINT_SHIFT_ADDRESS): cv.string,
vol.Optional(CONF_SETPOINT_SHIFT_STATE_ADDRESS): cv.string, vol.Optional(CONF_SETPOINT_SHIFT_STATE_ADDRESS): cv.string,
vol.Optional(CONF_SETPOINT_SHIFT_STEP, vol.Optional(CONF_SETPOINT_SHIFT_STEP,
@ -136,9 +138,11 @@ def async_add_entities_config(hass, config, async_add_entities):
climate = xknx.devices.Climate( climate = xknx.devices.Climate(
hass.data[DATA_KNX].xknx, hass.data[DATA_KNX].xknx,
name=config.get(CONF_NAME), name=config.get(CONF_NAME),
group_address_temperature=config.get(CONF_TEMPERATURE_ADDRESS), group_address_temperature=config[CONF_TEMPERATURE_ADDRESS],
group_address_target_temperature=config.get( group_address_target_temperature=config.get(
CONF_TARGET_TEMPERATURE_ADDRESS), CONF_TARGET_TEMPERATURE_ADDRESS),
group_address_target_temperature_state=config[
CONF_TARGET_TEMPERATURE_STATE_ADDRESS],
group_address_setpoint_shift=config.get(CONF_SETPOINT_SHIFT_ADDRESS), group_address_setpoint_shift=config.get(CONF_SETPOINT_SHIFT_ADDRESS),
group_address_setpoint_shift_state=config.get( group_address_setpoint_shift_state=config.get(
CONF_SETPOINT_SHIFT_STATE_ADDRESS), CONF_SETPOINT_SHIFT_STATE_ADDRESS),

2
requirements_all.txt
View File

@ -1782,7 +1782,7 @@ xboxapi==0.1.1
xfinity-gateway==0.0.4 xfinity-gateway==0.0.4
# homeassistant.components.knx # homeassistant.components.knx
xknx==0.9.4 xknx==0.10.0
# homeassistant.components.media_player.bluesound # homeassistant.components.media_player.bluesound
# homeassistant.components.sensor.startca # homeassistant.components.sensor.startca