Z-Wave: Rename customize to device_config [Breaking change] (#5933)
* Z-Wave: Rename customize to device_config * Fix light * Make entity id not required
This commit is contained in:
1 parent
41849eab06
commit
8ca3ca8564
3 files changed
+10
-80
No files matched your search
@@ -11,11 +11,10 @@ from pprint import pprint
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.helpers import discovery, customize
|
||||
from homeassistant.helpers import discovery
|
||||
from homeassistant.const import (
|
||||
ATTR_BATTERY_LEVEL, ATTR_LOCATION, ATTR_ENTITY_ID, ATTR_WAKEUP,
|
||||
CONF_CUSTOMIZE, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
|
||||
CONF_ENTITY_ID)
|
||||
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.helpers.event import track_time_change
|
||||
from homeassistant.util import convert, slugify
|
||||
@@ -38,6 +37,7 @@ CONF_CONFIG_PATH = 'config_path'
|
||||
CONF_IGNORED = 'ignored'
|
||||
CONF_REFRESH_VALUE = 'refresh_value'
|
||||
CONF_REFRESH_DELAY = 'delay'
|
||||
CONF_DEVICE_CONFIG = 'device_config'
|
||||
|
||||
DEFAULT_CONF_AUTOHEAL = True
|
||||
DEFAULT_CONF_USB_STICK_PATH = '/zwaveusbstick'
|
||||
@@ -49,6 +49,7 @@ DEFAULT_CONF_REFRESH_DELAY = 2
|
||||
DOMAIN = 'zwave'
|
||||
|
||||
NETWORK = None
|
||||
DATA_DEVICE_CONFIG = 'zwave_device_config'
|
||||
|
||||
# List of tuple (DOMAIN, discovered service, supported command classes,
|
||||
# value type, genre type, specific device class).
|
||||
@@ -159,8 +160,7 @@ SET_WAKEUP_SCHEMA = vol.Schema({
|
||||
vol.All(vol.Coerce(int), cv.positive_int),
|
||||
})
|
||||
|
||||
_ZWAVE_CUSTOMIZE_SCHEMA_ENTRY = vol.Schema({
|
||||
vol.Required(CONF_ENTITY_ID): cv.match_all,
|
||||
_DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
|
||||
vol.Optional(CONF_POLLING_INTENSITY): cv.positive_int,
|
||||
vol.Optional(CONF_IGNORED, default=DEFAULT_CONF_IGNORED): cv.boolean,
|
||||
vol.Optional(CONF_REFRESH_VALUE, default=DEFAULT_CONF_REFRESH_VALUE):
|
||||
@@ -173,9 +173,8 @@ CONFIG_SCHEMA = vol.Schema({
|
||||
DOMAIN: vol.Schema({
|
||||
vol.Optional(CONF_AUTOHEAL, default=DEFAULT_CONF_AUTOHEAL): cv.boolean,
|
||||
vol.Optional(CONF_CONFIG_PATH): cv.string,
|
||||
vol.Optional(CONF_CUSTOMIZE, default=[]):
|
||||
vol.All(customize.CUSTOMIZE_SCHEMA,
|
||||
[_ZWAVE_CUSTOMIZE_SCHEMA_ENTRY]),
|
||||
vol.Optional(CONF_DEVICE_CONFIG, default={}):
|
||||
_DEVICE_CONFIG_SCHEMA_ENTRY,
|
||||
vol.Optional(CONF_DEBUG, default=DEFAULT_DEBUG): cv.boolean,
|
||||
vol.Optional(CONF_POLLING_INTERVAL, default=DEFAULT_POLLING_INTERVAL):
|
||||
cv.positive_int,
|
||||
@@ -296,8 +295,8 @@ def setup(hass, config):
|
||||
|
||||
# Load configuration
|
||||
use_debug = config[DOMAIN].get(CONF_DEBUG)
|
||||
customize.set_customize(hass, DOMAIN, config[DOMAIN].get(CONF_CUSTOMIZE))
|
||||
autoheal = config[DOMAIN].get(CONF_AUTOHEAL)
|
||||
hass.data[DATA_DEVICE_CONFIG] = config[DOMAIN][CONF_DEVICE_CONFIG]
|
||||
|
||||
# Setup options
|
||||
options = ZWaveOption(
|
||||
@@ -382,7 +381,7 @@ def setup(hass, config):
|
||||
component = workaround_component
|
||||
|
||||
name = "{}.{}".format(component, object_id(value))
|
||||
node_config = customize.get_overrides(hass, DOMAIN, name)
|
||||
node_config = hass.data[DATA_DEVICE_CONFIG].get(name)
|
||||
|
||||
if node_config.get(CONF_IGNORED):
|
||||
_LOGGER.info("Ignoring device %s", name)
|
||||
|
||||
Reference in new issue
Block a user