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

Use same pattern for device defaults in both platforms. (#5682)

Browse source
This commit is contained in:
Johan Bloemberg 2017-02-01 10:42:50 +01:00 • committed by Pascal Vizeli
parent 987f59e8d8
commit cabc4dff03
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/light/rflink.py
View file

@ -13,8 +13,8 @@ from homeassistant.components.light import (
from homeassistant.components.rflink import ( from homeassistant.components.rflink import (
CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT, CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT,
CONF_IGNORE_DEVICES, CONF_NEW_DEVICES_GROUP, CONF_SIGNAL_REPETITIONS, CONF_IGNORE_DEVICES, CONF_NEW_DEVICES_GROUP, CONF_SIGNAL_REPETITIONS,
DATA_DEVICE_REGISTER, DATA_ENTITY_LOOKUP, DEFAULT_SIGNAL_REPETITIONS, DATA_DEVICE_REGISTER, DATA_ENTITY_LOOKUP, DEVICE_DEFAULTS_SCHEMA, DOMAIN,
DOMAIN, EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice, cv, vol) EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice, cv, vol)
from homeassistant.const import CONF_NAME, CONF_PLATFORM, CONF_TYPE from homeassistant.const import CONF_NAME, CONF_PLATFORM, CONF_TYPE
DEPENDENCIES = ['rflink'] DEPENDENCIES = ['rflink']
@ -25,11 +25,6 @@ TYPE_DIMMABLE = 'dimmable'
TYPE_SWITCHABLE = 'switchable' TYPE_SWITCHABLE = 'switchable'
TYPE_HYBRID = 'hybrid' TYPE_HYBRID = 'hybrid'
DEVICE_DEFAULTS_SCHEMA = vol.Schema({
vol.Optional(CONF_FIRE_EVENT, default=False): cv.boolean,
vol.Optional(CONF_SIGNAL_REPETITIONS,
default=DEFAULT_SIGNAL_REPETITIONS): vol.Coerce(int),
})
PLATFORM_SCHEMA = vol.Schema({ PLATFORM_SCHEMA = vol.Schema({
vol.Required(CONF_PLATFORM): DOMAIN, vol.Required(CONF_PLATFORM): DOMAIN,
vol.Optional(CONF_NEW_DEVICES_GROUP, default=None): cv.string, vol.Optional(CONF_NEW_DEVICES_GROUP, default=None): cv.string,

6
homeassistant/components/rflink.py
View file

@ -53,6 +53,12 @@ CONF_WAIT_FOR_ACK = 'wait_for_ack'
DEFAULT_SIGNAL_REPETITIONS = 1 DEFAULT_SIGNAL_REPETITIONS = 1
DEFAULT_RECONNECT_INTERVAL = 10 DEFAULT_RECONNECT_INTERVAL = 10
DEVICE_DEFAULTS_SCHEMA = vol.Schema({
vol.Optional(CONF_FIRE_EVENT, default=False): cv.boolean,
vol.Optional(CONF_SIGNAL_REPETITIONS,
default=DEFAULT_SIGNAL_REPETITIONS): vol.Coerce(int),
})
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({ DOMAIN: vol.Schema({
vol.Required(CONF_PORT): vol.Any(cv.port, cv.string), vol.Required(CONF_PORT): vol.Any(cv.port, cv.string),

9
homeassistant/components/switch/rflink.py
View file

@ -9,7 +9,7 @@ import logging
from homeassistant.components.rflink import ( from homeassistant.components.rflink import (
CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT, CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES, CONF_FIRE_EVENT,
CONF_SIGNAL_REPETITIONS, DATA_ENTITY_LOOKUP, DEFAULT_SIGNAL_REPETITIONS, CONF_SIGNAL_REPETITIONS, DATA_ENTITY_LOOKUP, DEVICE_DEFAULTS_SCHEMA,
DOMAIN, EVENT_KEY_COMMAND, SwitchableRflinkDevice, cv, vol) DOMAIN, EVENT_KEY_COMMAND, SwitchableRflinkDevice, cv, vol)
from homeassistant.components.switch import SwitchDevice from homeassistant.components.switch import SwitchDevice
from homeassistant.const import CONF_NAME, CONF_PLATFORM from homeassistant.const import CONF_NAME, CONF_PLATFORM
@ -21,11 +21,8 @@ _LOGGER = logging.getLogger(__name__)
PLATFORM_SCHEMA = vol.Schema({ PLATFORM_SCHEMA = vol.Schema({
vol.Required(CONF_PLATFORM): DOMAIN, vol.Required(CONF_PLATFORM): DOMAIN,
vol.Optional(CONF_DEVICE_DEFAULTS, default={}): vol.Schema({ vol.Optional(CONF_DEVICE_DEFAULTS, default=DEVICE_DEFAULTS_SCHEMA({})):
vol.Optional(CONF_FIRE_EVENT, default=False): cv.boolean, DEVICE_DEFAULTS_SCHEMA,
vol.Optional(CONF_SIGNAL_REPETITIONS,
default=DEFAULT_SIGNAL_REPETITIONS): vol.Coerce(int),
}),
vol.Optional(CONF_DEVICES, default={}): vol.Schema({ vol.Optional(CONF_DEVICES, default={}): vol.Schema({
cv.string: { cv.string: {
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,