From 1baa3386b7a001a5cd3e8b2f30e012a25e6fd3be Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Mon, 21 May 2018 20:55:39 +0200 Subject: [PATCH] Update dev library URI --- esphomeyaml/components/binary_sensor/__init__.py | 2 +- esphomeyaml/components/fan/__init__.py | 2 +- esphomeyaml/components/sensor/pulse_counter.py | 2 +- esphomeyaml/config.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/esphomeyaml/components/binary_sensor/__init__.py b/esphomeyaml/components/binary_sensor/__init__.py index 138e273c80..e96de8bec7 100644 --- a/esphomeyaml/components/binary_sensor/__init__.py +++ b/esphomeyaml/components/binary_sensor/__init__.py @@ -30,7 +30,7 @@ BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({ cv.GenerateID('mqtt_binary_sensor', CONF_MQTT_ID): cv.register_variable_id, cv.GenerateID('binary_sensor'): cv.register_variable_id, vol.Optional(CONF_INVERTED): cv.boolean, - vol.Optional(CONF_DEVICE_CLASS): vol.All(vol.Lower, cv.one_of(DEVICE_CLASSES)), + vol.Optional(CONF_DEVICE_CLASS): vol.All(vol.Lower, cv.one_of(*DEVICE_CLASSES)), vol.Optional(CONF_ON_PRESS): vol.All(cv.ensure_list, [automation.AUTOMATION_SCHEMA]), vol.Optional(CONF_ON_RELEASE): vol.All(cv.ensure_list, [automation.AUTOMATION_SCHEMA]), vol.Optional(CONF_ON_CLICK): vol.All(cv.ensure_list, [automation.AUTOMATION_SCHEMA.extend({ diff --git a/esphomeyaml/components/fan/__init__.py b/esphomeyaml/components/fan/__init__.py index 9bfe765600..8c9f2bfd0b 100644 --- a/esphomeyaml/components/fan/__init__.py +++ b/esphomeyaml/components/fan/__init__.py @@ -39,7 +39,7 @@ FAN_SPEEDS = { def validate_fan_speed(value): - return vol.All(vol.Upper, cv.one_of(FAN_SPEEDS))(value) + return vol.All(vol.Upper, cv.one_of(*FAN_SPEEDS))(value) def setup_fan_core_(fan_var, mqtt_var, config): diff --git a/esphomeyaml/components/sensor/pulse_counter.py b/esphomeyaml/components/sensor/pulse_counter.py index 93eb12acca..c4e2020f07 100644 --- a/esphomeyaml/components/sensor/pulse_counter.py +++ b/esphomeyaml/components/sensor/pulse_counter.py @@ -25,7 +25,7 @@ COUNT_MODES = { 'DECREMENT': global_ns.PCNT_COUNT_DEC, } -COUNT_MODE_SCHEMA = vol.All(vol.Upper, cv.one_of(COUNT_MODES)) +COUNT_MODE_SCHEMA = vol.All(vol.Upper, cv.one_of(*COUNT_MODES)) PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({ cv.GenerateID('pulse_counter', CONF_MAKE_ID): cv.register_variable_id, diff --git a/esphomeyaml/config.py b/esphomeyaml/config.py index 8c503453dc..e843f95d2d 100644 --- a/esphomeyaml/config.py +++ b/esphomeyaml/config.py @@ -18,7 +18,8 @@ from esphomeyaml.helpers import App, add, color _LOGGER = logging.getLogger(__name__) -DEFAULT_LIBRARY_URI = u'https://github.com/OttoWinter/esphomelib.git#v1.5.3' +DEFAULT_LIBRARY_URI = u'https://github.com/OttoWinter/esphomelib.git#' \ + u'2693649d487bcb2e351d4b7b7296bd9237e963f7' BUILD_FLASH_MODES = ['qio', 'qout', 'dio', 'dout']