sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-29 08:32:26 +01:00
Code Issues Releases Wiki Activity

Cleanup dashboard JS (#491)

Browse Source 
* Cleanup dashboard JS

* Add vscode

* Save start_mark/end_mark

* Updates

* Updates

* Remove need for cv.nameable

It's a bit hacky but removes so much bloat from integrations

* Add enum helper

* Document APIs, and Improvements

* Fixes

* Fixes

* Update PULL_REQUEST_TEMPLATE.md

* Updates

* Updates

* Updates
This commit is contained in:
Otto Winter
2019-04-22 21:56:30 +02:00
committed by GitHub
parent 6682c43dfa
commit 8e75980ebd
359 changed files with 4395 additions and 4223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
esphome/components/template/text_sensor/__init__.py
View File

@@ -1,24 +1,22 @@
from esphome.automation import ACTION_REGISTRY
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome.components import text_sensor
from esphome.components.text_sensor import TextSensorPublishAction
import esphome.config_validation as cv
import esphome.codegen as cg
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE, CONF_UPDATE_INTERVAL
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
from .. import template_ns
TemplateTextSensor = template_ns.class_('TemplateTextSensor', text_sensor.TextSensor,
cg.PollingComponent)
CONFIG_SCHEMA = cv.nameable(text_sensor.TEXT_SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_variable_id(TemplateTextSensor),
CONFIG_SCHEMA = text_sensor.TEXT_SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateTextSensor),
cv.Optional(CONF_LAMBDA): cv.lambda_,
cv.Optional(CONF_UPDATE_INTERVAL, default='60s'): cv.update_interval,
}).extend(cv.COMPONENT_SCHEMA))
}).extend(cv.polling_component_schema('60s'))
def to_code(config):
var = cg.new_Pvariable(config[CONF_ID], config[CONF_NAME], config[CONF_UPDATE_INTERVAL])
var = cg.new_Pvariable(config[CONF_ID])
yield cg.register_component(var, config)
yield text_sensor.register_text_sensor(var, config)
@@ -28,15 +26,13 @@ def to_code(config):
cg.add(var.set_template(template_))
@ACTION_REGISTRY.register('text_sensor.template.publish', cv.Schema({
cv.Required(CONF_ID): cv.use_variable_id(text_sensor.TextSensor),
@automation.register_action('text_sensor.template.publish', TextSensorPublishAction, cv.Schema({
cv.Required(CONF_ID): cv.use_id(text_sensor.TextSensor),
cv.Required(CONF_STATE): cv.templatable(cv.string_strict),
}))
def text_sensor_template_publish_to_code(config, action_id, template_arg, args):
var = yield cg.get_variable(config[CONF_ID])
type = TextSensorPublishAction.template(template_arg)
rhs = type.new(var)
action = cg.Pvariable(action_id, rhs, type=type)
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)
template_ = yield cg.templatable(config[CONF_STATE], args, cg.std_string)
cg.add(action.set_state(template_))
yield action
cg.add(var.set_state(template_))
yield var

2
esphome/components/template/text_sensor/template_text_sensor.cpp
View File

@@ -6,8 +6,6 @@ namespace template_ {
static const char *TAG = "template.text_sensor";
TemplateTextSensor::TemplateTextSensor(const std::string &name, uint32_t update_interval)
: TextSensor(name), PollingComponent(update_interval) {}
void TemplateTextSensor::update() {
if (!this->f_.has_value())
return;

2
esphome/components/template/text_sensor/template_text_sensor.h
View File

@@ -9,8 +9,6 @@ namespace template_ {
class TemplateTextSensor : public text_sensor::TextSensor, public PollingComponent {
public:
TemplateTextSensor(const std::string &name, uint32_t update_interval);
void set_template(std::function<optional<std::string>()> &&f);
void update() override;