From 7077e19cf8cc79dfa0ca1c4036152ad969f78e17 Mon Sep 17 00:00:00 2001 From: Glenn Waters Date: Mon, 5 Nov 2018 20:09:07 -0500 Subject: [PATCH] Elk-M1 fixes (#18154) * Fix default value for temperature unit * Add defaults for subdomains * Remove unused import * Fix PR comment --- homeassistant/components/elkm1/__init__.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py index aa7b9973c8e..755696b5002 100644 --- a/homeassistant/components/elkm1/__init__.py +++ b/homeassistant/components/elkm1/__init__.py @@ -11,7 +11,7 @@ import re import voluptuous as vol from homeassistant.const import ( CONF_EXCLUDE, CONF_HOST, CONF_INCLUDE, CONF_PASSWORD, - CONF_TEMPERATURE_UNIT, CONF_USERNAME, TEMP_FAHRENHEIT) + CONF_TEMPERATURE_UNIT, CONF_USERNAME) from homeassistant.core import HomeAssistant, callback # noqa from homeassistant.helpers import config_validation as cv from homeassistant.helpers import discovery @@ -83,17 +83,17 @@ CONFIG_SCHEMA = vol.Schema({ vol.Required(CONF_HOST): cv.string, vol.Optional(CONF_USERNAME, default=''): cv.string, vol.Optional(CONF_PASSWORD, default=''): cv.string, - vol.Optional(CONF_TEMPERATURE_UNIT, default=TEMP_FAHRENHEIT): + vol.Optional(CONF_TEMPERATURE_UNIT, default='F'): cv.temperature_unit, - vol.Optional(CONF_AREA): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_COUNTER): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_KEYPAD): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_OUTPUT): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_PLC): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_SETTING): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_TASK): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_THERMOSTAT): CONFIG_SCHEMA_SUBDOMAIN, - vol.Optional(CONF_ZONE): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_AREA, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_COUNTER, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_KEYPAD, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_OUTPUT, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_PLC, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_SETTING, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_TASK, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_THERMOSTAT, default={}): CONFIG_SCHEMA_SUBDOMAIN, + vol.Optional(CONF_ZONE, default={}): CONFIG_SCHEMA_SUBDOMAIN, }, _host_validator, )