mirror of
https://github.com/esphome/esphome.git
synced 2025-09-10 23:32:23 +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:
0
esphome/components/partition/__init__.py
Normal file
0
esphome/components/partition/__init__.py
Normal file
36
esphome/components/partition/light.py
Normal file
36
esphome/components/partition/light.py
Normal file
@@ -0,0 +1,36 @@
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.components import light
|
||||
from esphome.const import CONF_FROM, CONF_ID, CONF_SEGMENTS, CONF_TO, CONF_OUTPUT_ID
|
||||
|
||||
partitions_ns = cg.esphome_ns.namespace('partition')
|
||||
AddressableSegment = partitions_ns.class_('AddressableSegment')
|
||||
PartitionLightOutput = partitions_ns.class_('PartitionLightOutput', light.AddressableLight)
|
||||
|
||||
|
||||
def validate_from_to(value):
|
||||
if value[CONF_FROM] > value[CONF_TO]:
|
||||
raise cv.Invalid(u"From ({}) must not be larger than to ({})"
|
||||
u"".format(value[CONF_FROM], value[CONF_TO]))
|
||||
return value
|
||||
|
||||
|
||||
CONFIG_SCHEMA = cv.nameable(light.ADDRESSABLE_LIGHT_SCHEMA.extend({
|
||||
cv.GenerateID(CONF_OUTPUT_ID): cv.declare_variable_id(PartitionLightOutput),
|
||||
cv.Required(CONF_SEGMENTS): cv.All(cv.ensure_list({
|
||||
cv.Required(CONF_ID): cv.use_variable_id(light.AddressableLightState),
|
||||
cv.Required(CONF_FROM): cv.positive_int,
|
||||
cv.Required(CONF_TO): cv.positive_int,
|
||||
}, validate_from_to), cv.Length(min=1)),
|
||||
}))
|
||||
|
||||
|
||||
def to_code(config):
|
||||
segments = []
|
||||
for conf in config[CONF_SEGMENTS]:
|
||||
var = yield cg.get_variable(conf[CONF_ID])
|
||||
segments.append(AddressableSegment(var, conf[CONF_FROM],
|
||||
conf[CONF_TO] - conf[CONF_FROM] + 1))
|
||||
|
||||
var = cg.new_Pvariable(config[CONF_OUTPUT_ID], segments)
|
||||
yield light.register_light(var, config)
|
10
esphome/components/partition/light_partition.cpp
Normal file
10
esphome/components/partition/light_partition.cpp
Normal file
@@ -0,0 +1,10 @@
|
||||
#include "light_partition.h"
|
||||
#include "esphome/core/log.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace partition {
|
||||
|
||||
static const char *TAG = "partition.light";
|
||||
|
||||
} // namespace partition
|
||||
} // namespace esphome
|
84
esphome/components/partition/light_partition.h
Normal file
84
esphome/components/partition/light_partition.h
Normal file
@@ -0,0 +1,84 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/light/addressable_light.h"
|
||||
|
||||
namespace esphome {
|
||||
namespace partition {
|
||||
|
||||
class AddressableSegment {
|
||||
public:
|
||||
AddressableSegment(light::LightState *src, int32_t src_offset, int32_t size)
|
||||
: src_(static_cast<light::AddressableLight *>(src->get_output())), src_offset_(src_offset), size_(size) {}
|
||||
|
||||
light::AddressableLight *get_src() const { return this->src_; }
|
||||
int32_t get_src_offset() const { return this->src_offset_; }
|
||||
int32_t get_size() const { return this->size_; }
|
||||
int32_t get_dst_offset() const { return this->dst_offset_; }
|
||||
void set_dst_offset(int32_t dst_offset) { this->dst_offset_ = dst_offset; }
|
||||
|
||||
protected:
|
||||
light::AddressableLight *src_;
|
||||
int32_t src_offset_;
|
||||
int32_t size_;
|
||||
int32_t dst_offset_;
|
||||
};
|
||||
|
||||
class PartitionLightOutput : public light::AddressableLight, public Component {
|
||||
public:
|
||||
explicit PartitionLightOutput(std::vector<AddressableSegment> segments) : segments_(segments) {
|
||||
int32_t off = 0;
|
||||
for (auto &seg : this->segments_) {
|
||||
seg.set_dst_offset(off);
|
||||
off += seg.get_size();
|
||||
}
|
||||
}
|
||||
int32_t size() const override {
|
||||
auto &last_seg = this->segments_[this->segments_.size() - 1];
|
||||
return last_seg.get_dst_offset() + last_seg.get_size();
|
||||
}
|
||||
light::ESPColorView operator[](int32_t index) const override {
|
||||
uint32_t lo = 0;
|
||||
uint32_t hi = this->segments_.size() - 1;
|
||||
while (lo < hi) {
|
||||
uint32_t mid = (lo + hi) / 2;
|
||||
int32_t begin = this->segments_[mid].get_dst_offset();
|
||||
int32_t end = begin + this->segments_[mid].get_size();
|
||||
if (index < begin) {
|
||||
hi = mid - 1;
|
||||
} else if (index >= end) {
|
||||
lo = mid + 1;
|
||||
} else {
|
||||
lo = hi = mid;
|
||||
}
|
||||
}
|
||||
auto &seg = this->segments_[lo];
|
||||
// offset within the segment
|
||||
int32_t seg_off = index - seg.get_dst_offset();
|
||||
// offset within the src
|
||||
int32_t src_off = seg.get_src_offset() + seg_off;
|
||||
auto view = (*seg.get_src())[src_off];
|
||||
view.raw_set_color_correction(&this->correction_);
|
||||
return view;
|
||||
}
|
||||
void clear_effect_data() override {
|
||||
for (auto &seg : this->segments_) {
|
||||
seg.get_src()->clear_effect_data();
|
||||
}
|
||||
}
|
||||
light::LightTraits get_traits() override { return this->segments_[0].get_src()->get_traits(); }
|
||||
void loop() override {
|
||||
if (this->should_show_()) {
|
||||
for (auto seg : this->segments_) {
|
||||
seg.get_src()->schedule_show();
|
||||
}
|
||||
this->mark_shown_();
|
||||
}
|
||||
}
|
||||
|
||||
protected:
|
||||
std::vector<AddressableSegment> segments_;
|
||||
};
|
||||
|
||||
} // namespace partition
|
||||
} // namespace esphome
|
Reference in New Issue
Block a user