Ink-Board/ink-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: improve watchdog handling and screen loading in UI and display handlers

Browse Source
This commit is contained in:
GW_MC
2026-01-25 19:39:21 +08:00
parent 5865f6d383
commit f3dfc4f43f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/display/eink_display_handler.cpp
View File

@@ -3,6 +3,7 @@
#include "common/constants.h" #include "common/constants.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_heap_caps.h" #include "esp_heap_caps.h"
#include "esp_task_wdt.h"
#include <cstring> #include <cstring>
#define TAG "EInkDisplayHandler" #define TAG "EInkDisplayHandler"
@@ -382,10 +383,10 @@ void EInkDisplayHandler::_perform_full_refresh(const uint8_t* framebuffer) {
break; break;
} }
// Yield every 1000 bytes to prevent watchdog timeout // Yield every 100 bytes to prevent watchdog timeout
if (i % 1000 == 999) { if (i % 100 == 99) {
xSemaphoreGive(_spi_mutex); xSemaphoreGive(_spi_mutex);
vTaskDelay(pdMS_TO_TICKS(1)); // Small delay vTaskDelay(pdMS_TO_TICKS(5)); // Increased delay for better yielding
if (xSemaphoreTake(_spi_mutex, pdMS_TO_TICKS(5000)) != pdTRUE) { if (xSemaphoreTake(_spi_mutex, pdMS_TO_TICKS(5000)) != pdTRUE) {
ESP_LOGE(TAG, "SPI mutex timeout during yield at byte %zu", i); ESP_LOGE(TAG, "SPI mutex timeout during yield at byte %zu", i);
return; return;
@@ -501,6 +502,7 @@ void EInkDisplayHandler::_wait_for_busy() {
int timeout = 0; int timeout = 0;
while (gpio_get_level(PIN_BUSY) == BUSY_ACTIVE_LEVEL) { // 0=BUSY, 1=FREE while (gpio_get_level(PIN_BUSY) == BUSY_ACTIVE_LEVEL) { // 0=BUSY, 1=FREE
vTaskDelay(pdMS_TO_TICKS(100)); vTaskDelay(pdMS_TO_TICKS(100));
esp_task_wdt_reset(); // Feed the watchdog during long wait
timeout++; timeout++;
if (timeout > 100) { // 10 second timeout if (timeout > 100) { // 10 second timeout
ESP_LOGE(TAG, "Display BUSY timeout! Pin level: %d", gpio_get_level(PIN_BUSY)); ESP_LOGE(TAG, "Display BUSY timeout! Pin level: %d", gpio_get_level(PIN_BUSY));

11
main/ui/ui_handler.cpp
View File

@@ -2,6 +2,7 @@
#include "ui/root_layout.h" #include "ui/root_layout.h"
#include "ui/app_registry.h" #include "ui/app_registry.h"
#include "esp_log.h" #include "esp_log.h"
#include "lvgl.h"
#define TAG "UIHandler" #define TAG "UIHandler"
@@ -45,8 +46,14 @@ esp_err_t UIHandler::init(void) {
ESP_LOGW(TAG, "Failed to render app icons"); ESP_LOGW(TAG, "Failed to render app icons");
} }
// Load the main screen // Defer screen loading to prevent blocking during initialization
lv_screen_load(_main_screen); // Use LVGL timer to load screen after allowing watchdog reset
lv_timer_create([](lv_timer_t* timer) {
lv_obj_t* screen = static_cast<lv_obj_t*>(lv_timer_get_user_data(timer));
ESP_LOGI("UIHandler", "Loading main screen via timer");
lv_screen_load(screen);
lv_timer_del(timer);
}, 100, _main_screen); // 100ms delay to allow watchdog reset
ESP_LOGI(TAG, "UIHandler initialized successfully"); ESP_LOGI(TAG, "UIHandler initialized successfully");
return ESP_OK; return ESP_OK;