sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into vornado-ir

Browse Source
This commit is contained in:
Jordan Zucker
2025-02-16 12:43:18 -08:00
parent 8081a8a0e6 2e66b33672
commit 38c6388b4b
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/display/display.cpp
View File

@@ -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; }

2
esphome/components/scd30/sensor.py
View File

@@ -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)
), ),
), ),
} }

2
esphome/dashboard/web_server.py
View File

@@ -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

2
requirements.txt
View File

@@ -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