Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-20 16:18:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix sun default elevation (#620)

Browse Source
This commit is contained in:
Otto Winter 2019-06-06 15:12:40 +02:00
parent 2e6db39173
commit a451705e0b
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/sun/__init__.py
View File

@ -17,6 +17,10 @@ CONF_ELEVATION = 'elevation'
CONF_ON_SUNRISE = 'on_sunrise' CONF_ON_SUNRISE = 'on_sunrise'
CONF_ON_SUNSET = 'on_sunset' CONF_ON_SUNSET = 'on_sunset'
# Default sun elevation is a bit below horizon because sunset
# means time when the entire sun disk is below the horizon
DEFAULT_ELEVATION = -0.883
ELEVATION_MAP = { ELEVATION_MAP = {
'sunrise': 0.0, 'sunrise': 0.0,
'sunset': 0.0, 'sunset': 0.0,
@ -44,11 +48,11 @@ CONFIG_SCHEMA = cv.Schema({
cv.Optional(CONF_ON_SUNRISE): automation.validate_automation({ cv.Optional(CONF_ON_SUNRISE): automation.validate_automation({
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SunTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SunTrigger),
cv.Optional(CONF_ELEVATION, default=0.0): elevation, cv.Optional(CONF_ELEVATION, default=DEFAULT_ELEVATION): elevation,
}), }),
cv.Optional(CONF_ON_SUNSET): automation.validate_automation({ cv.Optional(CONF_ON_SUNSET): automation.validate_automation({
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SunTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SunTrigger),
cv.Optional(CONF_ELEVATION, default=0.0): elevation, cv.Optional(CONF_ELEVATION, default=DEFAULT_ELEVATION): elevation,
}), }),
}) })
@ -79,7 +83,7 @@ def to_code(config):
@automation.register_condition('sun.is_above_horizon', SunCondition, cv.Schema({ @automation.register_condition('sun.is_above_horizon', SunCondition, cv.Schema({
cv.GenerateID(): cv.use_id(Sun), cv.GenerateID(): cv.use_id(Sun),
cv.Optional(CONF_ELEVATION, default=0): cv.templatable(elevation), cv.Optional(CONF_ELEVATION, default=DEFAULT_ELEVATION): cv.templatable(elevation),
})) }))
def sun_above_horizon_to_code(config, condition_id, template_arg, args): def sun_above_horizon_to_code(config, condition_id, template_arg, args):
var = cg.new_Pvariable(condition_id, template_arg) var = cg.new_Pvariable(condition_id, template_arg)
@ -92,7 +96,7 @@ def sun_above_horizon_to_code(config, condition_id, template_arg, args):
@automation.register_condition('sun.is_below_horizon', SunCondition, cv.Schema({ @automation.register_condition('sun.is_below_horizon', SunCondition, cv.Schema({
cv.GenerateID(): cv.use_id(Sun), cv.GenerateID(): cv.use_id(Sun),
cv.Optional(CONF_ELEVATION, default=0): cv.templatable(elevation), cv.Optional(CONF_ELEVATION, default=DEFAULT_ELEVATION): cv.templatable(elevation),
})) }))
def sun_below_horizon_to_code(config, condition_id, template_arg, args): def sun_below_horizon_to_code(config, condition_id, template_arg, args):
var = cg.new_Pvariable(condition_id, template_arg) var = cg.new_Pvariable(condition_id, template_arg)

4
esphome/components/sun/text_sensor/__init__.py
View File

@ -3,7 +3,7 @@ import esphome.config_validation as cv
import esphome.codegen as cg import esphome.codegen as cg
from esphome.const import CONF_ICON, ICON_WEATHER_SUNSET_DOWN, ICON_WEATHER_SUNSET_UP, CONF_TYPE, \ from esphome.const import CONF_ICON, ICON_WEATHER_SUNSET_DOWN, ICON_WEATHER_SUNSET_UP, CONF_TYPE, \
CONF_ID, CONF_FORMAT CONF_ID, CONF_FORMAT
from .. import sun_ns, CONF_SUN_ID, Sun, CONF_ELEVATION, elevation from .. import sun_ns, CONF_SUN_ID, Sun, CONF_ELEVATION, elevation, DEFAULT_ELEVATION
DEPENDENCIES = ['sun'] DEPENDENCIES = ['sun']
@ -28,7 +28,7 @@ CONFIG_SCHEMA = cv.All(text_sensor.TEXT_SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(SunTextSensor), cv.GenerateID(): cv.declare_id(SunTextSensor),
cv.GenerateID(CONF_SUN_ID): cv.use_id(Sun), cv.GenerateID(CONF_SUN_ID): cv.use_id(Sun),
cv.Required(CONF_TYPE): cv.one_of(*SUN_TYPES, lower=True), cv.Required(CONF_TYPE): cv.one_of(*SUN_TYPES, lower=True),
cv.Optional(CONF_ELEVATION, default=0): elevation, cv.Optional(CONF_ELEVATION, default=DEFAULT_ELEVATION): elevation,
cv.Optional(CONF_FORMAT, default='%X'): cv.string_strict, cv.Optional(CONF_FORMAT, default='%X'): cv.string_strict,
}).extend(cv.polling_component_schema('60s')), validate_optional_icon) }).extend(cv.polling_component_schema('60s')), validate_optional_icon)