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

Fix IHC config schema (#19415)

Browse Source 
* Update __init__.py

Update "unit" -> "unit_of_measurement" and configuration (from plural to singular)

* Update __init__.py

* Removing vol.ALLOW_EXTRA arguments

* Update __init__.py
This commit is contained in:
Morten Lüneborg 2018-12-18 12:40:03 +01:00 committed by Fabian Affolter
parent 6c64b315db
commit c59e049050
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/ihc/__init__.py
View File

@ -18,8 +18,8 @@ from homeassistant.components.ihc.const import (
SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT) SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT)
from homeassistant.config import load_yaml_config_file from homeassistant.config import load_yaml_config_file
from homeassistant.const import ( from homeassistant.const import (
CONF_BINARY_SENSORS, CONF_ID, CONF_LIGHTS, CONF_NAME, CONF_PASSWORD, CONF_ID, CONF_NAME, CONF_PASSWORD,
CONF_SENSORS, CONF_SWITCHES, CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_URL, CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_URL,
CONF_USERNAME, TEMP_CELSIUS) CONF_USERNAME, TEMP_CELSIUS)
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -49,7 +49,7 @@ DEVICE_SCHEMA = vol.Schema({
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_POSITION): cv.string, vol.Optional(CONF_POSITION): cv.string,
vol.Optional(CONF_NOTE): cv.string vol.Optional(CONF_NOTE): cv.string
}, extra=vol.ALLOW_EXTRA) })
SWITCH_SCHEMA = DEVICE_SCHEMA.extend({ SWITCH_SCHEMA = DEVICE_SCHEMA.extend({
@ -75,31 +75,31 @@ IHC_SCHEMA = vol.Schema({
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_AUTOSETUP, default=True): cv.boolean, vol.Optional(CONF_AUTOSETUP, default=True): cv.boolean,
vol.Optional(CONF_INFO, default=True): cv.boolean, vol.Optional(CONF_INFO, default=True): cv.boolean,
vol.Optional(CONF_BINARY_SENSORS, default=[]): vol.Optional(CONF_BINARY_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All( vol.All(
BINARY_SENSOR_SCHEMA, BINARY_SENSOR_SCHEMA,
validate_name) validate_name)
]), ]),
vol.Optional(CONF_LIGHTS, default=[]): vol.Optional(CONF_LIGHT, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All( vol.All(
LIGHT_SCHEMA, LIGHT_SCHEMA,
validate_name) validate_name)
]), ]),
vol.Optional(CONF_SENSORS, default=[]): vol.Optional(CONF_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All( vol.All(
SENSOR_SCHEMA, SENSOR_SCHEMA,
validate_name) validate_name)
]), ]),
vol.Optional(CONF_SWITCHES, default=[]): vol.Optional(CONF_SWITCH, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All( vol.All(
SWITCH_SCHEMA, SWITCH_SCHEMA,
validate_name) validate_name)
]), ]),
}, extra=vol.ALLOW_EXTRA) })
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema(vol.All( DOMAIN: vol.Schema(vol.All(
@ -224,7 +224,8 @@ def get_manual_configuration(hass, config, conf, ihc_controller,
'type': sensor_cfg.get(CONF_TYPE), 'type': sensor_cfg.get(CONF_TYPE),
'inverting': sensor_cfg.get(CONF_INVERTING), 'inverting': sensor_cfg.get(CONF_INVERTING),
'dimmable': sensor_cfg.get(CONF_DIMMABLE), 'dimmable': sensor_cfg.get(CONF_DIMMABLE),
'unit': sensor_cfg.get(CONF_UNIT_OF_MEASUREMENT) 'unit_of_measurement': sensor_cfg.get(
CONF_UNIT_OF_MEASUREMENT)
} }
} }
discovery_info[name] = device discovery_info[name] = device