mirror of
https://github.com/esphome/esphome.git
synced 2025-10-05 19:33:47 +01:00
🏗 Merge C++ into python codebase (#504)
## Description: Move esphome-core codebase into esphome (and a bunch of other refactors). See https://github.com/esphome/feature-requests/issues/97 Yes this is a shit ton of work and no there's no way to automate it :( But it will be worth it 👍 Progress: - Core support (file copy etc): 80% - Base Abstractions (light, switch): ~50% - Integrations: ~10% - Working? Yes, (but only with ported components). Other refactors: - Moves all codegen related stuff into a single class: `esphome.codegen` (imported as `cg`) - Rework coroutine syntax - Move from `component/platform.py` to `domain/component.py` structure as with HA - Move all defaults out of C++ and into config validation. - Remove `make_...` helpers from Application class. Reason: Merge conflicts with every single new integration. - Pointer Variables are stored globally instead of locally in setup(). Reason: stack size limit. Future work: - Rework const.py - Move all `CONF_...` into a conf class (usage `conf.UPDATE_INTERVAL` vs `CONF_UPDATE_INTERVAL`). Reason: Less convoluted import block - Enable loading from `custom_components` folder. **Related issue (if applicable):** https://github.com/esphome/feature-requests/issues/97 **Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here> ## Checklist: - [ ] The code change is tested and works locally. - [ ] Tests have been added to verify that the new code works (under `tests/` folder). If user exposed functionality or configuration variables are added/changed: - [ ] Documentation added/updated in [esphomedocs](https://github.com/OttoWinter/esphomedocs).
This commit is contained in:
40
esphome/components/script/__init__.py
Normal file
40
esphome/components/script/__init__.py
Normal file
@@ -0,0 +1,40 @@
|
||||
from esphome import automation
|
||||
from esphome.automation import ACTION_REGISTRY, maybe_simple_id
|
||||
import esphome.config_validation as cv
|
||||
import esphome.codegen as cg
|
||||
from esphome.const import CONF_ID
|
||||
|
||||
script_ns = cg.esphome_ns.namespace('script')
|
||||
Script = script_ns.class_('Script', cg.Trigger.template())
|
||||
ScriptExecuteAction = script_ns.class_('ScriptExecuteAction', cg.Action)
|
||||
ScriptStopAction = script_ns.class_('ScriptStopAction', cg.Action)
|
||||
|
||||
CONFIG_SCHEMA = automation.validate_automation({
|
||||
cv.Required(CONF_ID): cv.declare_variable_id(Script),
|
||||
})
|
||||
|
||||
|
||||
def to_code(config):
|
||||
for conf in config:
|
||||
trigger = cg.new_Pvariable(conf[CONF_ID])
|
||||
yield automation.build_automation(trigger, [], conf)
|
||||
|
||||
|
||||
@ACTION_REGISTRY.register('script.execute', maybe_simple_id({
|
||||
cv.Required(CONF_ID): cv.use_variable_id(Script),
|
||||
}))
|
||||
def script_execute_action_to_code(config, action_id, template_arg, args):
|
||||
var = yield cg.get_variable(config[CONF_ID])
|
||||
type = ScriptExecuteAction.template(template_arg)
|
||||
rhs = type.new(var)
|
||||
yield cg.Pvariable(action_id, rhs, type=type)
|
||||
|
||||
|
||||
@ACTION_REGISTRY.register('script.stop', maybe_simple_id({
|
||||
cv.Required(CONF_ID): cv.use_variable_id(Script)
|
||||
}))
|
||||
def script_stop_action_to_code(config, action_id, template_arg, args):
|
||||
var = yield cg.get_variable(config[CONF_ID])
|
||||
type = ScriptStopAction.template(template_arg)
|
||||
rhs = type.new(var)
|
||||
yield cg.Pvariable(action_id, rhs, type=type)
|
40
esphome/components/script/script.h
Normal file
40
esphome/components/script/script.h
Normal file
@@ -0,0 +1,40 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/automation.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace script {
|
||||
|
||||
class Script : public Trigger<> {
|
||||
public:
|
||||
void execute() { this->trigger(); }
|
||||
};
|
||||
|
||||
template<typename... Ts> class ScriptExecuteAction : public Action<Ts...> {
|
||||
public:
|
||||
ScriptExecuteAction(Script *script) : script_(script) {}
|
||||
|
||||
void play(Ts... x) override {
|
||||
this->script_->trigger();
|
||||
this->play_next(x...);
|
||||
}
|
||||
|
||||
protected:
|
||||
Script *script_;
|
||||
};
|
||||
|
||||
template<typename... Ts> class ScriptStopAction : public Action<Ts...> {
|
||||
public:
|
||||
ScriptStopAction(Script *script) : script_(script) {}
|
||||
|
||||
void play(Ts... x) override {
|
||||
this->script_->stop();
|
||||
this->play_next(x...);
|
||||
}
|
||||
|
||||
protected:
|
||||
Script *script_;
|
||||
};
|
||||
|
||||
} // namespace script
|
||||
} // namespace esphome
|
Reference in New Issue
Block a user