mirror of
https://github.com/esphome/esphome.git
synced 2025-03-15 07:08:20 +00:00
Merge branch 'dev' into vornado-ir
This commit is contained in:
commit
38c6388b4b
@ -815,8 +815,20 @@ void Display::test_card() {
|
|||||||
|
|
||||||
DisplayPage::DisplayPage(display_writer_t writer) : writer_(std::move(writer)) {}
|
DisplayPage::DisplayPage(display_writer_t writer) : writer_(std::move(writer)) {}
|
||||||
void DisplayPage::show() { this->parent_->show_page(this); }
|
void DisplayPage::show() { this->parent_->show_page(this); }
|
||||||
void DisplayPage::show_next() { this->next_->show(); }
|
void DisplayPage::show_next() {
|
||||||
void DisplayPage::show_prev() { this->prev_->show(); }
|
if (this->next_ == nullptr) {
|
||||||
|
ESP_LOGE(TAG, "no next page");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this->next_->show();
|
||||||
|
}
|
||||||
|
void DisplayPage::show_prev() {
|
||||||
|
if (this->prev_ == nullptr) {
|
||||||
|
ESP_LOGE(TAG, "no previous page");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this->prev_->show();
|
||||||
|
}
|
||||||
void DisplayPage::set_parent(Display *parent) { this->parent_ = parent; }
|
void DisplayPage::set_parent(Display *parent) { this->parent_ = parent; }
|
||||||
void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
|
void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
|
||||||
void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
|
void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
|
||||||
|
@ -75,7 +75,7 @@ CONFIG_SCHEMA = (
|
|||||||
cv.Optional(CONF_UPDATE_INTERVAL, default="60s"): cv.All(
|
cv.Optional(CONF_UPDATE_INTERVAL, default="60s"): cv.All(
|
||||||
cv.positive_time_period_seconds,
|
cv.positive_time_period_seconds,
|
||||||
cv.Range(
|
cv.Range(
|
||||||
min=core.TimePeriod(seconds=1), max=core.TimePeriod(seconds=1800)
|
min=core.TimePeriod(seconds=2), max=core.TimePeriod(seconds=1800)
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
|
@ -853,7 +853,7 @@ class InfoRequestHandler(BaseHandler):
|
|||||||
dashboard = DASHBOARD
|
dashboard = DASHBOARD
|
||||||
entry = dashboard.entries.get(yaml_path)
|
entry = dashboard.entries.get(yaml_path)
|
||||||
|
|
||||||
if not entry:
|
if not entry or entry.storage is None:
|
||||||
self.set_status(404)
|
self.set_status(404)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ esptool==4.7.0
|
|||||||
click==8.1.7
|
click==8.1.7
|
||||||
esphome-dashboard==20250212.0
|
esphome-dashboard==20250212.0
|
||||||
aioesphomeapi==24.6.2
|
aioesphomeapi==24.6.2
|
||||||
zeroconf==0.144.1
|
zeroconf==0.144.3
|
||||||
puremagic==1.27
|
puremagic==1.27
|
||||||
ruamel.yaml==0.18.6 # dashboard_import
|
ruamel.yaml==0.18.6 # dashboard_import
|
||||||
glyphsets==1.0.0
|
glyphsets==1.0.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user