Merge branch 'develop' into rtl+bidi

pull/16/head
LuBeDa 3 years ago committed by GitHub
commit 72f1704839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -395,6 +395,7 @@ namespace esphome
if (this->screen_pointer != MAXQUEUE) if (this->screen_pointer != MAXQUEUE)
{ {
this->queue[this->screen_pointer]->last_time = ts + this->queue[this->screen_pointer]->screen_time_; this->queue[this->screen_pointer]->last_time = ts + this->queue[this->screen_pointer]->screen_time_;
if (this->queue[this->screen_pointer]->icon < this->icon_count) if (this->queue[this->screen_pointer]->icon < this->icon_count)
{ {

@ -91,6 +91,7 @@ namespace esphome
} }
else else
{ {
result = startx + this->config_->scroll_step; result = startx + this->config_->scroll_step;
} }
} }

Loading…
Cancel
Save