jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HASP_USE_LVGL_TASK

Browse Source
This commit is contained in:
fvanroie 2023-04-14 00:08:12 +02:00
parent 08c465eee5
commit 97025a0e57
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hasp_gui.cpp
View File

@ -322,6 +322,16 @@ void guiSetup()
lv_obj_t* mouse_layer = lv_disp_get_layer_sys(NULL); // default display lv_obj_t* mouse_layer = lv_disp_get_layer_sys(NULL); // default display
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
Preferences preferences;
nvs_user_begin(preferences, "gui", true);
// indev_drv.drag_limit = preferences.getUChar(key, LV_INDEV_DEF_DRAG_LIMIT);
// indev_drv.drag_throw = preferences.getUChar(key, LV_INDEV_DEF_DRAG_THROW);
indev_drv.long_press_time = preferences.getUShort(FP_GUI_LONG_TIME, LV_INDEV_DEF_LONG_PRESS_TIME);
indev_drv.long_press_rep_time = preferences.getUShort(FP_GUI_REPEAT_TIME, LV_INDEV_DEF_LONG_PRESS_REP_TIME);
// indev_drv.gesture_limit = preferences.getUChar(key, LV_INDEV_DEF_GESTURE_LIMIT);
// indev_drv.gesture_min_velocity = preferences.getUChar(key, LV_INDEV_DEF_GESTURE_MIN_VELOCITY);
preferences.end();
LV_IMG_DECLARE(mouse_cursor_icon); /*Declare the image file.*/ LV_IMG_DECLARE(mouse_cursor_icon); /*Declare the image file.*/
cursor = lv_img_create(mouse_layer, NULL); /*Create an image object for the cursor */ cursor = lv_img_create(mouse_layer, NULL); /*Create an image object for the cursor */
lv_img_set_src(cursor, &mouse_cursor_icon); /*Set the image source*/ lv_img_set_src(cursor, &mouse_cursor_icon); /*Set the image source*/
@ -393,12 +403,12 @@ static void gui_task(void* args)
{ {
LOG_TRACE(TAG_GUI, "Start to run LVGL"); LOG_TRACE(TAG_GUI, "Start to run LVGL");
while(1) { while(1) {
vTaskDelay(pdMS_TO_TICKS(10));
/* Try to take the semaphore, call lvgl related function on success */ /* Try to take the semaphore, call lvgl related function on success */
if(pdTRUE == xSemaphoreTake(xGuiSemaphore, pdMS_TO_TICKS(10))) { // if(pdTRUE == xSemaphoreTake(xGuiSemaphore, pdMS_TO_TICKS(10))) {
if(pdTRUE == xSemaphoreTake(xGuiSemaphore, portMAX_DELAY)) {
lv_task_handler(); lv_task_handler();
xSemaphoreGive(xGuiSemaphore); xSemaphoreGive(xGuiSemaphore);
vTaskDelay(pdMS_TO_TICKS(5));
} }
} }
} }
@ -418,27 +428,23 @@ esp_err_t gui_setup_lvgl_task()
} }
#endif // HASP_USE_LVGL_TASK #endif // HASP_USE_LVGL_TASK
bool gui_acquire(void) IRAM_ATTR bool gui_acquire(TickType_t timeout)
{ {
#if ESP32 #if ESP32
TaskHandle_t task = xTaskGetCurrentTaskHandle(); TaskHandle_t task = xTaskGetCurrentTaskHandle();
if(g_lvgl_task_handle != task) { if(g_lvgl_task_handle == task) return true;
if(xSemaphoreTake(xGuiSemaphore, pdMS_TO_TICKS(30)) != pdTRUE) { if(xSemaphoreTake(xGuiSemaphore, timeout) != pdTRUE) return false;
return false;
}
}
#endif #endif
return true; return true;
} }
void gui_release(void) IRAM_ATTR void gui_release(void)
{ {
#if ESP32 #if ESP32
TaskHandle_t task = xTaskGetCurrentTaskHandle(); TaskHandle_t task = xTaskGetCurrentTaskHandle();
if(g_lvgl_task_handle != task) { if(g_lvgl_task_handle == task) return;
xSemaphoreGive(xGuiSemaphore); xSemaphoreGive(xGuiSemaphore);
// LOG_VERBOSE(TAG_TFT, F("GIVE")); // LOG_VERBOSE(TAG_TFT, F("GIVE"));
}
#endif #endif
} }

4
src/hasp_gui.h
View File

@ -61,8 +61,8 @@ void gui_flush_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_
void gui_antiburn_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p); void gui_antiburn_cb(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p);
/* ===== Locks ===== */ /* ===== Locks ===== */
bool gui_acquire(void); IRAM_ATTR bool gui_acquire(TickType_t timeout);
void gui_release(void); IRAM_ATTR void gui_release(void);
#ifdef ESP32 #ifdef ESP32
esp_err_t gui_setup_lvgl_task(void); esp_err_t gui_setup_lvgl_task(void);
#endif #endif

1
user_setups/esp32/_esp32.ini
View File

@ -54,6 +54,7 @@ build_flags =
-D HASP_USE_TELNET=1 -D HASP_USE_TELNET=1
;-D HASP_USE_SPIFFS=1 ;-D HASP_USE_SPIFFS=1
-D HASP_USE_LITTLEFS=1 -D HASP_USE_LITTLEFS=1
-D HASP_USE_LVGL_TASK=0 ; Run LVGL in separate task
;-D HASP_USE_EEPROM=1 ;-D HASP_USE_EEPROM=1
-D HASP_USE_CONFIG=1 ; Native application, not library -D HASP_USE_CONFIG=1 ; Native application, not library
-D LV_LOG_TRACE_TIMER=1 -D LV_LOG_TRACE_TIMER=1