mirror of
				https://github.com/esphome/esphome.git
				synced 2025-11-04 00:51:49 +00:00 
			
		
		
		
	Compare commits
	
		
			17 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					5ed987adcd | ||
| 
						 | 
					a463c59733 | ||
| 
						 | 
					1726c4237b | ||
| 
						 | 
					f1241af91d | ||
| 
						 | 
					7ae6777fd6 | ||
| 
						 | 
					a169d37557 | ||
| 
						 | 
					be21aa786d | ||
| 
						 | 
					9a881100e6 | ||
| 
						 | 
					c2f88776c7 | ||
| 
						 | 
					846fcb8ccd | ||
| 
						 | 
					44495c919c | ||
| 
						 | 
					d4ce7699d4 | ||
| 
						 | 
					318bb8b254 | ||
| 
						 | 
					9a939d2d27 | ||
| 
						 | 
					f51d301d53 | ||
| 
						 | 
					d7d3a4aa36 | ||
| 
						 | 
					6a2e9a8503 | 
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "esphomeyaml-beta",
 | 
			
		||||
  "version": "1.9.0b5",
 | 
			
		||||
  "version": "1.9.3",
 | 
			
		||||
  "slug": "esphomeyaml-beta",
 | 
			
		||||
  "description": "Beta version of esphomeyaml HassIO add-on.",
 | 
			
		||||
  "url": "https://beta.esphomelib.com/esphomeyaml/index.html",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,18 +1,16 @@
 | 
			
		||||
import voluptuous as vol
 | 
			
		||||
 | 
			
		||||
from esphomeyaml.automation import maybe_simple_id, ACTION_REGISTRY
 | 
			
		||||
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id
 | 
			
		||||
from esphomeyaml.components import mqtt
 | 
			
		||||
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
 | 
			
		||||
from esphomeyaml.helpers import Application, ArrayInitializer, Pvariable, RawExpression, \
 | 
			
		||||
    StructInitializer, add, add_job, esphomelib_ns, process_lambda, setup_mqtt_component, \
 | 
			
		||||
    get_variable, TemplateArguments, templatable, uint32, float_, std_string, Nameable, Component, \
 | 
			
		||||
    Action
 | 
			
		||||
    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.helpers import Action, Application, ArrayInitializer, Component, Nameable, \
 | 
			
		||||
    Pvariable, StructInitializer, TemplateArguments, add, add_job, esphomelib_ns, float_, \
 | 
			
		||||
    get_variable, process_lambda, setup_mqtt_component, std_string, templatable, uint32
 | 
			
		||||
 | 
			
		||||
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
 | 
			
		||||
 | 
			
		||||
@@ -24,6 +22,7 @@ LightState = light_ns.class_('LightState', Nameable, Component)
 | 
			
		||||
MakeLight = Application.struct('MakeLight')
 | 
			
		||||
LightOutput = light_ns.class_('LightOutput')
 | 
			
		||||
FastLEDLightOutputComponent = light_ns.class_('FastLEDLightOutputComponent', LightOutput)
 | 
			
		||||
FastLEDLightOutputComponentRef = FastLEDLightOutputComponent.operator('ref')
 | 
			
		||||
 | 
			
		||||
# Actions
 | 
			
		||||
ToggleAction = light_ns.class_('ToggleAction', Action)
 | 
			
		||||
@@ -32,7 +31,6 @@ TurnOnAction = light_ns.class_('TurnOnAction', Action)
 | 
			
		||||
 | 
			
		||||
LightColorValues = light_ns.class_('LightColorValues')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
MQTTJSONLightComponent = light_ns.class_('MQTTJSONLightComponent', mqtt.MQTTComponent)
 | 
			
		||||
 | 
			
		||||
# Effects
 | 
			
		||||
@@ -249,8 +247,7 @@ def build_effect(full_config):
 | 
			
		||||
            add(effect.set_intensity(config[CONF_INTENSITY]))
 | 
			
		||||
        yield effect
 | 
			
		||||
    elif key == CONF_FASTLED_LAMBDA:
 | 
			
		||||
        lambda_ = None
 | 
			
		||||
        args = [(RawExpression('FastLEDLightOutputComponent &'), 'it')]
 | 
			
		||||
        args = [(FastLEDLightOutputComponentRef, 'it')]
 | 
			
		||||
        for lambda_ in process_lambda(config[CONF_LAMBDA], args):
 | 
			
		||||
            yield None
 | 
			
		||||
        yield FastLEDLambdaLightEffect.new(config[CONF_NAME], lambda_, config[CONF_UPDATE_INTERVAL])
 | 
			
		||||
@@ -354,7 +351,6 @@ def setup_light(light_obj, mqtt_obj, config):
 | 
			
		||||
 | 
			
		||||
BUILD_FLAGS = '-DUSE_LIGHT'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CONF_LIGHT_TOGGLE = 'light.toggle'
 | 
			
		||||
LIGHT_TOGGLE_ACTION_SCHEMA = maybe_simple_id({
 | 
			
		||||
    vol.Required(CONF_ID): cv.use_variable_id(LightState),
 | 
			
		||||
 
 | 
			
		||||
@@ -4,12 +4,12 @@ from esphomeyaml.components import sensor, uart
 | 
			
		||||
from esphomeyaml.components.uart import UARTComponent
 | 
			
		||||
import esphomeyaml.config_validation as cv
 | 
			
		||||
from esphomeyaml.const import CONF_CURRENT, CONF_ID, CONF_NAME, CONF_POWER, CONF_UART_ID, \
 | 
			
		||||
    CONF_VOLTAGE
 | 
			
		||||
from esphomeyaml.helpers import App, Pvariable, get_variable, setup_component, Component
 | 
			
		||||
    CONF_UPDATE_INTERVAL, CONF_VOLTAGE
 | 
			
		||||
from esphomeyaml.helpers import App, PollingComponent, Pvariable, get_variable, setup_component
 | 
			
		||||
 | 
			
		||||
DEPENDENCIES = ['uart']
 | 
			
		||||
 | 
			
		||||
CSE7766Component = sensor.sensor_ns.class_('CSE7766Component', Component, uart.UARTDevice)
 | 
			
		||||
CSE7766Component = sensor.sensor_ns.class_('CSE7766Component', PollingComponent, uart.UARTDevice)
 | 
			
		||||
CSE7766VoltageSensor = sensor.sensor_ns.class_('CSE7766VoltageSensor',
 | 
			
		||||
                                               sensor.EmptySensor)
 | 
			
		||||
CSE7766CurrentSensor = sensor.sensor_ns.class_('CSE7766CurrentSensor',
 | 
			
		||||
@@ -30,6 +30,7 @@ PLATFORM_SCHEMA = vol.All(sensor.PLATFORM_SCHEMA.extend({
 | 
			
		||||
    vol.Optional(CONF_POWER): cv.nameable(sensor.SENSOR_SCHEMA.extend({
 | 
			
		||||
        cv.GenerateID(): cv.declare_variable_id(CSE7766PowerSensor),
 | 
			
		||||
    })),
 | 
			
		||||
    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
 | 
			
		||||
}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(CONF_VOLTAGE, CONF_CURRENT,
 | 
			
		||||
                                                               CONF_POWER))
 | 
			
		||||
 | 
			
		||||
@@ -38,7 +39,7 @@ def to_code(config):
 | 
			
		||||
    for uart_ in get_variable(config[CONF_UART_ID]):
 | 
			
		||||
        yield
 | 
			
		||||
 | 
			
		||||
    rhs = App.make_cse7766(uart_)
 | 
			
		||||
    rhs = App.make_cse7766(uart_, config.get(CONF_UPDATE_INTERVAL))
 | 
			
		||||
    cse = Pvariable(config[CONF_ID], rhs)
 | 
			
		||||
 | 
			
		||||
    if CONF_VOLTAGE in config:
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ SNTPComponent = time_.time_ns.class_('SNTPComponent', time_.RealTimeClockCompone
 | 
			
		||||
 | 
			
		||||
PLATFORM_SCHEMA = time_.TIME_PLATFORM_SCHEMA.extend({
 | 
			
		||||
    cv.GenerateID(): cv.declare_variable_id(SNTPComponent),
 | 
			
		||||
    vol.Optional(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string], vol.Length(max=3)),
 | 
			
		||||
    vol.Optional(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string], vol.Length(min=1, max=3)),
 | 
			
		||||
    vol.Optional(CONF_LAMBDA): cv.lambda_,
 | 
			
		||||
}).extend(cv.COMPONENT_SCHEMA.schema)
 | 
			
		||||
 | 
			
		||||
@@ -18,7 +18,9 @@ def to_code(config):
 | 
			
		||||
    rhs = App.make_sntp_component()
 | 
			
		||||
    sntp = Pvariable(config[CONF_ID], rhs)
 | 
			
		||||
    if CONF_SERVERS in config:
 | 
			
		||||
        add(sntp.set_servers(*config[CONF_SERVERS]))
 | 
			
		||||
        servers = config[CONF_SERVERS]
 | 
			
		||||
        servers += [''] * (3 - len(servers))
 | 
			
		||||
        add(sntp.set_servers(*servers))
 | 
			
		||||
 | 
			
		||||
    time_.setup_time(sntp, config)
 | 
			
		||||
    setup_component(sntp, config)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "esphomeyaml",
 | 
			
		||||
  "version": "1.9.0b1",
 | 
			
		||||
  "version": "1.9.3",
 | 
			
		||||
  "slug": "esphomeyaml",
 | 
			
		||||
  "description": "esphomeyaml HassIO add-on for intelligently managing all your ESP8266/ESP32 devices.",
 | 
			
		||||
  "url": "https://esphomelib.com/esphomeyaml/index.html",
 | 
			
		||||
 
 | 
			
		||||
@@ -2,10 +2,10 @@
 | 
			
		||||
 | 
			
		||||
MAJOR_VERSION = 1
 | 
			
		||||
MINOR_VERSION = 9
 | 
			
		||||
PATCH_VERSION = '0b6'
 | 
			
		||||
PATCH_VERSION = '3'
 | 
			
		||||
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 | 
			
		||||
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 | 
			
		||||
ESPHOMELIB_VERSION = '1.9.0b6'
 | 
			
		||||
ESPHOMELIB_VERSION = '1.9.3'
 | 
			
		||||
 | 
			
		||||
ESP_PLATFORM_ESP32 = 'ESP32'
 | 
			
		||||
ESP_PLATFORM_ESP8266 = 'ESP8266'
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user