Added scheduling
This commit is contained in:
@@ -68,9 +68,8 @@ bool BoomDisplay::begin() {
|
||||
esp_timer_create_args_t timerArgs = {};
|
||||
timerArgs.callback = &tickCb;
|
||||
timerArgs.name = "boom_lv_tick";
|
||||
esp_timer_handle_t tickTimer = nullptr;
|
||||
ESP_ERROR_CHECK(esp_timer_create(&timerArgs, &tickTimer));
|
||||
ESP_ERROR_CHECK(esp_timer_start_periodic(tickTimer, 5 * 1000));
|
||||
ESP_ERROR_CHECK(esp_timer_create(&timerArgs, &tickTimer_));
|
||||
ESP_ERROR_CHECK(esp_timer_start_periodic(tickTimer_, 5 * 1000));
|
||||
|
||||
if (lock()) {
|
||||
createScreens();
|
||||
@@ -104,10 +103,10 @@ void BoomDisplay::lvglTask() {
|
||||
while (true) {
|
||||
uint32_t delayMs = 50;
|
||||
if (lock()) {
|
||||
delayMs = lv_timer_handler();
|
||||
delayMs = scheduledIdle_ ? 500 : lv_timer_handler();
|
||||
unlock();
|
||||
}
|
||||
delayMs = constrain(delayMs, 20U, 250U);
|
||||
delayMs = constrain(delayMs, 20U, 500U);
|
||||
vTaskDelay(pdMS_TO_TICKS(delayMs));
|
||||
}
|
||||
}
|
||||
@@ -334,6 +333,7 @@ void BoomDisplay::applySnapshot(const BoomStateSnapshot& s) {
|
||||
}
|
||||
|
||||
void BoomDisplay::update() {
|
||||
if (scheduledIdle_) return;
|
||||
if (millis() - lastStatusUpdateMs_ < DISPLAY_STATUS_UPDATE_MS) return;
|
||||
lastStatusUpdateMs_ = millis();
|
||||
|
||||
@@ -362,3 +362,52 @@ void BoomDisplay::update() {
|
||||
haveLast_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void BoomDisplay::setScheduledIdle(bool idle, const String& next) {
|
||||
if (idle == scheduledIdle_ && (!idle || next == sleepNext_)) return;
|
||||
if (!display_ || !lock()) return;
|
||||
scheduledIdle_ = idle;
|
||||
if (idle) {
|
||||
if (!sleepScreen_) {
|
||||
sleepScreen_ = lv_obj_create(nullptr);
|
||||
stylePlainScreen(sleepScreen_);
|
||||
auto label = [this](const char* text, int y, int width) {
|
||||
lv_obj_t* l = lv_label_create(sleepScreen_);
|
||||
lv_label_set_text(l, text); lv_obj_set_width(l, width);
|
||||
lv_obj_set_style_text_align(l, LV_TEXT_ALIGN_CENTER, 0);
|
||||
lv_obj_align(l, LV_ALIGN_TOP_MID, 0, y); return l;
|
||||
};
|
||||
label("BoomCast", 8, 190);
|
||||
static const lv_point_t sleepingZ[3][4] = {
|
||||
{{0,0},{24,0},{0,27},{24,27}},
|
||||
{{0,0},{17,0},{0,19},{17,19}},
|
||||
{{0,0},{11,0},{0,12},{11,12}}
|
||||
};
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
auto z = lv_line_create(sleepScreen_);
|
||||
lv_line_set_points(z, sleepingZ[i], 4);
|
||||
lv_obj_set_pos(z, 61 + i * 30, 36 + i * 6);
|
||||
lv_obj_set_style_line_width(z, 3, 0);
|
||||
lv_obj_set_style_line_color(z, lv_color_black(), 0);
|
||||
}
|
||||
label("SLAAPSTAND", 70, 190);
|
||||
label("Zelfs de knalidioten zijn\nblijkbaar even stil.", 94, 190);
|
||||
sleepNextLabel_ = label("", 140, 190);
|
||||
label("BOOT: tijdelijk luisteren", 179, 190);
|
||||
}
|
||||
sleepNext_ = next;
|
||||
lv_label_set_text(sleepNextLabel_, (String("Luistert weer:\n") + next).c_str());
|
||||
lv_scr_load(sleepScreen_);
|
||||
} else {
|
||||
lv_scr_load(page_ == 0 ? publicScreen_ : detailScreen_);
|
||||
haveLast_ = false;
|
||||
}
|
||||
requestFullRefresh();
|
||||
if (idle) {
|
||||
lv_refr_now(display_); // finish the single sleep-screen flush before stopping ticks
|
||||
esp_timer_stop(tickTimer_);
|
||||
} else {
|
||||
if (!esp_timer_is_active(tickTimer_)) esp_timer_start_periodic(tickTimer_, 5000);
|
||||
}
|
||||
unlock();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user