diff --git a/esphomeyaml/components/binary_sensor/__init__.py b/esphomeyaml/components/binary_sensor/__init__.py index 21aaa339d0..7ee847b78d 100644 --- a/esphomeyaml/components/binary_sensor/__init__.py +++ b/esphomeyaml/components/binary_sensor/__init__.py @@ -1,19 +1,19 @@ import voluptuous as vol from esphomeyaml import automation, core -from esphomeyaml.automation import maybe_simple_id, CONDITION_REGISTRY, Condition +from esphomeyaml.automation import CONDITION_REGISTRY, Condition, maybe_simple_id from esphomeyaml.components import mqtt from esphomeyaml.components.mqtt import setup_mqtt_component import esphomeyaml.config_validation as cv from esphomeyaml.const import CONF_DELAYED_OFF, CONF_DELAYED_ON, CONF_DEVICE_CLASS, CONF_FILTERS, \ CONF_HEARTBEAT, CONF_ID, CONF_INTERNAL, CONF_INVALID_COOLDOWN, CONF_INVERT, CONF_INVERTED, \ CONF_LAMBDA, CONF_MAX_LENGTH, CONF_MIN_LENGTH, CONF_MQTT_ID, CONF_ON_CLICK, \ - CONF_ON_DOUBLE_CLICK, CONF_ON_MULTI_CLICK, CONF_ON_PRESS, CONF_ON_RELEASE, CONF_STATE, \ - CONF_TIMING, CONF_TRIGGER_ID, CONF_ON_STATE + CONF_ON_DOUBLE_CLICK, CONF_ON_MULTI_CLICK, CONF_ON_PRESS, CONF_ON_RELEASE, CONF_ON_STATE, \ + CONF_STATE, CONF_TIMING, CONF_TRIGGER_ID from esphomeyaml.core import CORE -from esphomeyaml.cpp_generator import process_lambda, ArrayInitializer, add, Pvariable, \ - StructInitializer, get_variable -from esphomeyaml.cpp_types import esphomelib_ns, Nameable, Trigger, NoArg, Component, App, bool_, \ +from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, get_variable, \ + process_lambda +from esphomeyaml.cpp_types import App, Component, Nameable, NoArg, Trigger, bool_, esphomelib_ns, \ optional from esphomeyaml.py_compat import string_types @@ -53,7 +53,6 @@ HeartbeatFilter = binary_sensor_ns.class_('HeartbeatFilter', Filter, Component) InvertFilter = binary_sensor_ns.class_('InvertFilter', Filter) LambdaFilter = binary_sensor_ns.class_('LambdaFilter', Filter) - FILTER_KEYS = [CONF_INVERT, CONF_DELAYED_ON, CONF_DELAYED_OFF, CONF_LAMBDA, CONF_HEARTBEAT] FILTERS_SCHEMA = cv.ensure_list({ @@ -302,7 +301,6 @@ def core_to_hass_config(data, config): BUILD_FLAGS = '-DUSE_BINARY_SENSOR' - CONF_BINARY_SENSOR_IS_ON = 'binary_sensor.is_on' BINARY_SENSOR_IS_ON_CONDITION_SCHEMA = maybe_simple_id({ vol.Required(CONF_ID): cv.use_variable_id(BinarySensor), diff --git a/esphomeyaml/components/light/__init__.py b/esphomeyaml/components/light/__init__.py index 702656865c..a2d976e7d3 100644 --- a/esphomeyaml/components/light/__init__.py +++ b/esphomeyaml/components/light/__init__.py @@ -5,16 +5,15 @@ from esphomeyaml.components import mqtt from esphomeyaml.components.mqtt import setup_mqtt_component import esphomeyaml.config_validation as cv from esphomeyaml.const import CONF_ALPHA, CONF_BLUE, CONF_BRIGHTNESS, CONF_COLORS, \ - CONF_DEFAULT_TRANSITION_LENGTH, CONF_DURATION, CONF_EFFECTS, CONF_EFFECT_ID, \ - CONF_GAMMA_CORRECT, CONF_GREEN, CONF_ID, CONF_INTERNAL, CONF_LAMBDA, CONF_MQTT_ID, CONF_NAME, \ - CONF_NUM_LEDS, CONF_RANDOM, CONF_RED, CONF_SPEED, CONF_STATE, CONF_TRANSITION_LENGTH, \ - CONF_UPDATE_INTERVAL, CONF_WHITE, CONF_WIDTH, CONF_FLASH_LENGTH, CONF_COLOR_TEMPERATURE, \ - CONF_EFFECT + CONF_COLOR_TEMPERATURE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_DURATION, CONF_EFFECT, \ + CONF_EFFECTS, CONF_EFFECT_ID, CONF_FLASH_LENGTH, CONF_GAMMA_CORRECT, CONF_GREEN, CONF_ID, \ + CONF_INTERNAL, CONF_LAMBDA, CONF_MQTT_ID, CONF_NAME, CONF_NUM_LEDS, CONF_RANDOM, CONF_RED, \ + CONF_SPEED, CONF_STATE, CONF_TRANSITION_LENGTH, CONF_UPDATE_INTERVAL, CONF_WHITE, CONF_WIDTH from esphomeyaml.core import CORE -from esphomeyaml.cpp_generator import process_lambda, Pvariable, add, StructInitializer, \ - ArrayInitializer, get_variable, templatable -from esphomeyaml.cpp_types import esphomelib_ns, Application, Component, Nameable, Action, uint32, \ - float_, std_string, void +from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, get_variable, \ + process_lambda, templatable +from esphomeyaml.cpp_types import Action, Application, Component, Nameable, esphomelib_ns, float_, \ + std_string, uint32, void PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ diff --git a/esphomeyaml/components/sensor/__init__.py b/esphomeyaml/components/sensor/__init__.py index b064a22bd7..3cfb795d14 100644 --- a/esphomeyaml/components/sensor/__init__.py +++ b/esphomeyaml/components/sensor/__init__.py @@ -13,8 +13,7 @@ from esphomeyaml.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CO CONF_SLIDING_WINDOW_MOVING_AVERAGE, CONF_THROTTLE, CONF_TRIGGER_ID, CONF_UNIQUE, \ CONF_UNIT_OF_MEASUREMENT, CONF_WINDOW_SIZE from esphomeyaml.core import CORE -from esphomeyaml.cpp_generator import ArrayInitializer, Pvariable, add, process_lambda, \ - templatable, get_variable +from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphomeyaml.cpp_types import App, Component, Nameable, PollingComponent, Trigger, \ esphomelib_ns, float_, optional @@ -224,7 +223,6 @@ def register_sensor(var, config): BUILD_FLAGS = '-DUSE_SENSOR' - CONF_SENSOR_IN_RANGE = 'sensor.in_range' SENSOR_IN_RANGE_CONDITION_SCHEMA = vol.All({ vol.Required(CONF_ID): cv.use_variable_id(Sensor), diff --git a/esphomeyaml/components/time/__init__.py b/esphomeyaml/components/time/__init__.py index 68011d5d2c..e5a1cc3ce2 100644 --- a/esphomeyaml/components/time/__init__.py +++ b/esphomeyaml/components/time/__init__.py @@ -4,13 +4,13 @@ import math import voluptuous as vol -import esphomeyaml.config_validation as cv from esphomeyaml import automation +import esphomeyaml.config_validation as cv from esphomeyaml.const import CONF_CRON, CONF_DAYS_OF_MONTH, CONF_DAYS_OF_WEEK, CONF_HOURS, \ CONF_MINUTES, CONF_MONTHS, CONF_ON_TIME, CONF_SECONDS, CONF_TIMEZONE, CONF_TRIGGER_ID from esphomeyaml.core import CORE -from esphomeyaml.cpp_generator import add, Pvariable, ArrayInitializer -from esphomeyaml.cpp_types import esphomelib_ns, Component, NoArg, Trigger, App +from esphomeyaml.cpp_generator import Pvariable, add +from esphomeyaml.cpp_types import App, Component, NoArg, Trigger, esphomelib_ns from esphomeyaml.py_compat import string_types _LOGGER = logging.getLogger(__name__)