sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-16 15:48:16 +00:00
Code Issues Releases Wiki Activity

Added check for scan length being longer than addressable light

Browse Source
This commit is contained in:
Major Péter 2019-06-03 17:01:01 +02:00
parent 308bfc3601
commit ba07df8c22
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
esphome/components/light/addressable_light_effect.h
View File

@ -146,7 +146,8 @@ class AddressableScanEffect : public AddressableLightEffect {
void apply(AddressableLight &it, const ESPColor &current_color) override { void apply(AddressableLight &it, const ESPColor &current_color) override {
it.all() = ESPColor::BLACK; it.all() = ESPColor::BLACK;
for (auto i = 0; i < this->scan_length_; i++) { const uint32_t scan_length_limited = (scan_length_ < it.size()) ? scan_length_ : it.size();
for (auto i = 0; i < scan_length_limited; i++) {
it[this->at_led_ + i] = current_color; it[this->at_led_ + i] = current_color;
} }
@ -154,7 +155,7 @@ class AddressableScanEffect : public AddressableLightEffect {
if (now - this->last_move_ > this->move_interval_) { if (now - this->last_move_ > this->move_interval_) {
if (direction_) { if (direction_) {
this->at_led_++; this->at_led_++;
if (this->at_led_ == it.size() - scan_length_) if (this->at_led_ == it.size() - scan_length_limited)
this->direction_ = false; this->direction_ = false;
} else { } else {
this->at_led_--; this->at_led_--;
@ -167,7 +168,7 @@ class AddressableScanEffect : public AddressableLightEffect {
protected: protected:
uint32_t move_interval_{}; uint32_t move_interval_{};
uint32_t scan_length_{10}; //TODO check less than it.size() uint32_t scan_length_{10};
uint32_t last_move_{0}; uint32_t last_move_{0};
int at_led_{0}; int at_led_{0};
bool direction_{true}; bool direction_{true};