adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify LVGL init: move code into Tactility (#208)

Browse Source 
The esp_lvgl_port code was duplicated across all boards, so I moved it into the Tactility subproject to simplify the board implementations.
This commit is contained in:
Ken Van Hoeylandt
2025-02-08 17:06:16 +01:00
committed by GitHub
parent c1f55429b6
commit 8ccba15c25
19 changed files with 49 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Boards/CYD-2432S024C/Source/CYD2432S024C.cpp
-1
View File
@@ -9,7 +9,6 @@
bool twodotfour_lvgl_init();
const tt::hal::Configuration cyd_2432S024c_config = {
.initLvgl = &twodotfour_lvgl_init,
.createDisplay = createDisplay,
.sdcard = createYellowSdCard(),
.power = nullptr,
Boards/CYD-2432S024C/Source/Lvgl.cpp
-26
View File
@@ -1,26 +0,0 @@
#include "esp_lvgl_port.h"
#include <Tactility/Log.h>
#include <Tactility/lvgl/LvglSync.h>
#include <Tactility/Thread.h>
#define TAG "twodotfour_lvgl"
bool twodotfour_lvgl_init() {
const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = static_cast<UBaseType_t>(tt::THREAD_PRIORITY_RENDER),
.task_stack = 8096,
.task_affinity = -1, // core pinning
.task_max_sleep_ms = 500,
.timer_period_ms = 5
};
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "lvgl port init failed");
return false;
}
// Set syncing functions
tt::lvgl::syncSet(&lvgl_port_lock, &lvgl_port_unlock);
return true;
}
Boards/LilygoTdeck/Source/LilygoTdeck.cpp
-2
View File
@@ -10,11 +10,9 @@
#define TDECK_SPI_TRANSFER_SIZE_LIMIT (TDECK_LCD_HORIZONTAL_RESOLUTION * TDECK_LCD_SPI_TRANSFER_HEIGHT * (TDECK_LCD_BITS_PER_PIXEL / 8))
bool tdeck_init_power();
bool tdeck_init_lvgl();
extern const tt::hal::Configuration lilygo_tdeck = {
.initBoot = tdeck_init_power,
.initLvgl = tdeck_init_lvgl,
.createDisplay = createDisplay,
.createKeyboard = createKeyboard,
.sdcard = createTdeckSdCard(),
Boards/LilygoTdeck/Source/Lvgl.cpp
-35
View File
@@ -1,35 +0,0 @@
#include "hal/TdeckDisplay.h"
#include <Tactility/Log.h>
#include <Tactility/Thread.h>
#include <Tactility/lvgl/LvglSync.h>
#include <esp_lvgl_port.h>
#define TAG "tdeck_lvgl"
// LVGL
// The minimum task stack seems to be about 3500, but that crashes the wifi app in some scenarios
// At 8192, it sometimes crashes when wifi-auto enables and is busy connecting and then you open WifiManage
#define TDECK_LVGL_TASK_STACK_DEPTH 9216
bool tdeck_init_lvgl() {
static lv_disp_t* display = nullptr;
const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = static_cast<UBaseType_t>(tt::THREAD_PRIORITY_RENDER),
.task_stack = TDECK_LVGL_TASK_STACK_DEPTH,
.task_affinity = -1, // core pinning
.task_max_sleep_ms = 500,
.timer_period_ms = 5
};
TT_LOG_D(TAG, "LVGL port init");
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "LVGL port init failed");
return false;
}
tt::lvgl::syncSet(&lvgl_port_lock, &lvgl_port_unlock);
return true;
}
Boards/M5stackCore2/Source/InitLvgl.cpp
-31
View File
@@ -1,31 +0,0 @@
#include <Tactility/Log.h>
#include <Tactility/Thread.h>
#include <Tactility/lvgl/LvglSync.h>
#include "esp_lvgl_port.h"
#define TAG "core2"
// LVGL
// The minimum task stack seems to be about 3500, but that crashes the wifi app in some scenarios
// At 4000, it crashes when the fps renderer is available
#define CORE2_LVGL_TASK_STACK_DEPTH 9216
bool initLvgl() {
const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = static_cast<UBaseType_t>(tt::THREAD_PRIORITY_RENDER),
.task_stack = CORE2_LVGL_TASK_STACK_DEPTH,
.task_affinity = -1, // core pinning
.task_max_sleep_ms = 500,
.timer_period_ms = 5
};
TT_LOG_D(TAG, "LVGL port init");
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "LVGL port init failed");
return false;
}
tt::lvgl::syncSet(&lvgl_port_lock, &lvgl_port_unlock);
return true;
}
Boards/M5stackCore2/Source/InitLvgl.h
-3
View File
@@ -1,3 +0,0 @@
#pragma once
bool initLvgl();
Boards/M5stackCore2/Source/M5stackCore2.cpp
-2
View File
@@ -1,6 +1,5 @@
#include "M5stackCore2.h"
#include "InitBoot.h"
#include "InitLvgl.h"
#include "Tactility/lvgl/LvglSync.h"
#include "hal/Core2Display.h"
#include "hal/Core2DisplayConstants.h"
@@ -11,7 +10,6 @@
extern const tt::hal::Configuration m5stack_core2 = {
.initBoot = initBoot,
.initLvgl = initLvgl,
.createDisplay = createDisplay,
.sdcard = createSdCard(),
.power = createPower,
Boards/M5stackCoreS3/Source/InitLvgl.cpp
-31
View File
@@ -1,31 +0,0 @@
#include <Tactility/Log.h>
#include <Tactility/Thread.h>
#include <Tactility/lvgl/LvglSync.h>
#include <esp_lvgl_port.h>
#define TAG "core2"
// LVGL
// The minimum task stack seems to be about 3500, but that crashes the wifi app in some scenarios
// At 4000, it crashes when the fps renderer is available
#define CORE2_LVGL_TASK_STACK_DEPTH 9216
bool initLvgl() {
const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = static_cast<UBaseType_t>(tt::THREAD_PRIORITY_RENDER),
.task_stack = CORE2_LVGL_TASK_STACK_DEPTH,
.task_affinity = -1, // core pinning
.task_max_sleep_ms = 500,
.timer_period_ms = 5
};
TT_LOG_D(TAG, "LVGL port init");
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "LVGL port init failed");
return false;
}
tt::lvgl::syncSet(&lvgl_port_lock, &lvgl_port_unlock);
return true;
}
Boards/M5stackCoreS3/Source/InitLvgl.h
-3
View File
@@ -1,3 +0,0 @@
#pragma once
bool initLvgl();
Boards/M5stackCoreS3/Source/M5stackCoreS3.cpp
-2
View File
@@ -1,6 +1,5 @@
#include "M5stackCoreS3.h"
#include "InitBoot.h"
#include "InitLvgl.h"
#include "Tactility/lvgl/LvglSync.h"
#include "hal/CoreS3Display.h"
#include "hal/CoreS3DisplayConstants.h"
@@ -11,7 +10,6 @@
const tt::hal::Configuration m5stack_cores3 = {
.initBoot = initBoot,
.initLvgl = initLvgl,
.createDisplay = createDisplay,
.sdcard = createSdCard(),
.power = createPower,
Boards/Simulator/Source/hal/Configuration.cpp → Boards/Simulator/Source/Simulator.cpp
+7 -6
View File
@@ -1,10 +1,11 @@
#include <Tactility/hal/Configuration.h>
#include "hal/SimulatorPower.h"
#include "LvglTask.h"
#include "src/lv_init.h"
#include "SdlDisplay.h"
#include "SdlKeyboard.h"
#include "SimulatorSdCard.h"
#include "hal/SdlDisplay.h"
#include "hal/SdlKeyboard.h"
#include "hal/SimulatorPower.h"
#include "hal/SimulatorSdCard.h"
#include <src/lv_init.h> // LVGL
#include <Tactility/hal/Configuration.h>
#define TAG "hardware"
Boards/UnPhone/Source/Lvgl.cpp
-32
View File
@@ -1,32 +0,0 @@
#include <Tactility/Log.h>
#include <Tactility/Thread.h>
#include <Tactility/lvgl/LvglSync.h>
#include <esp_lvgl_port.h>
#define TAG "unphone_lvgl"
// LVGL
// The minimum task stack seems to be about 3500, but that crashes the wifi app in some scenarios
// At 8192, it sometimes crashes when wifi-auto enables and is busy connecting and then you open WifiManage
#define UNPHONE_LVGL_TASK_STACK_DEPTH 9216
bool unPhoneInitLvgl() {
static lv_disp_t* display = nullptr;
const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = static_cast<UBaseType_t>(tt::THREAD_PRIORITY_RENDER),
.task_stack = UNPHONE_LVGL_TASK_STACK_DEPTH,
.task_affinity = -1, // core pinning
.task_max_sleep_ms = 500,
.timer_period_ms = 5
};
TT_LOG_D(TAG, "LVGL port init");
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "LVGL port init failed");
return false;
}
tt::lvgl::syncSet(&lvgl_port_lock, &lvgl_port_unlock);
return true;
}
Boards/UnPhone/Source/UnPhone.cpp
-2
View File
@@ -9,11 +9,9 @@
#define UNPHONE_SPI_TRANSFER_SIZE_LIMIT (UNPHONE_LCD_HORIZONTAL_RESOLUTION * UNPHONE_LCD_SPI_TRANSFER_HEIGHT * LV_COLOR_DEPTH / 8)
bool unPhoneInitPower();
bool unPhoneInitLvgl();
extern const tt::hal::Configuration unPhone = {
.initBoot = unPhoneInitPower,
.initLvgl = unPhoneInitLvgl,
.createDisplay = createDisplay,
.sdcard = createUnPhoneSdCard(),
.power = unPhoneGetPower,