mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-19 03:13:14 +00:00
d875ade8cb
- Refactored `TouchDevice`: it can now start/stop LVGL separately, and it has an optional `TouchDriver` interface - Refactored `DisplayDevice`: it can now start/stop LVGL separately, and it has an optional `DisplayDriver` interface - Updated all boards and drivers for above changes - LVGL can now be stopped and (re)started on the fly - Fixed issues with restarting Gui and Statusbar services - Refactored `Gui` service to be class and renamed `Gui` to `GuiService` - Fixed `Statusbar` service: forgot to deregister one of the icons - Updated `esp_lcd_st7701` to v1.1.3 - `lv_textarea_create()` now automatically registers the hardware keyboard hooks (by wrapping the function) - Fixed and updated `tactility.py` - Cleanup of a lot of code - `BootInitLvglBegin` and `BootInitLvglEnd` are replaced by `LvglStarted` and `LvglStopped`. - Introduced `tt::service::State` which is accessible via `tt::service::getState()` (and internally via `ServiceInstance`) - Started replacing `#define TAG` with `constexpr auto TAG = "..";`
103 lines
2.6 KiB
C++
103 lines
2.6 KiB
C++
#include "EspLcdDisplay.h"
|
|
#include "EspLcdDisplayDriver.h"
|
|
|
|
#include <assert.h>
|
|
#include <esp_lvgl_port_disp.h>
|
|
#include <Tactility/Check.h>
|
|
#include <Tactility/LogEsp.h>
|
|
#include <Tactility/hal/touch/TouchDevice.h>
|
|
|
|
constexpr const char* TAG = "EspLcdDispDrv";
|
|
|
|
EspLcdDisplay::~EspLcdDisplay() {
|
|
if (displayDriver != nullptr && displayDriver.use_count() > 1) {
|
|
tt_crash("DisplayDriver is still in use. This will cause memory access violations.");
|
|
}
|
|
}
|
|
|
|
bool EspLcdDisplay::start() {
|
|
if (!createIoHandle(ioHandle)) {
|
|
TT_LOG_E(TAG, "Failed to create IO handle");
|
|
return false;
|
|
}
|
|
|
|
if (!createPanelHandle(ioHandle, panelHandle)) {
|
|
TT_LOG_E(TAG, "Failed to create panel handle");
|
|
esp_lcd_panel_io_del(ioHandle);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool EspLcdDisplay::stop() {
|
|
if (lvglDisplay != nullptr) {
|
|
stopLvgl();
|
|
lvglDisplay = nullptr;
|
|
}
|
|
|
|
if (panelHandle != nullptr && esp_lcd_panel_del(panelHandle) != ESP_OK) {
|
|
return false;
|
|
}
|
|
|
|
if (ioHandle != nullptr && esp_lcd_panel_io_del(ioHandle) != ESP_OK) {
|
|
return false;
|
|
}
|
|
|
|
if (displayDriver != nullptr && displayDriver.use_count() > 1) {
|
|
TT_LOG_W(TAG, "DisplayDriver is still in use.");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool EspLcdDisplay::startLvgl() {
|
|
assert(lvglDisplay == nullptr);
|
|
|
|
if (displayDriver != nullptr && displayDriver.use_count() > 1) {
|
|
TT_LOG_W(TAG, "DisplayDriver is still in use.");
|
|
}
|
|
|
|
lvglPortDisplayConfig = getLvglPortDisplayConfig(ioHandle, panelHandle);
|
|
|
|
if (isRgbPanel()) {
|
|
auto rgb_config = getLvglPortDisplayRgbConfig(ioHandle, panelHandle);
|
|
lvglDisplay = lvgl_port_add_disp_rgb(&lvglPortDisplayConfig, &rgb_config);
|
|
} else {
|
|
lvglDisplay = lvgl_port_add_disp(&lvglPortDisplayConfig);
|
|
}
|
|
|
|
auto touch_device = getTouchDevice();
|
|
if (touch_device != nullptr) {
|
|
touch_device->startLvgl(lvglDisplay);
|
|
}
|
|
|
|
return lvglDisplay != nullptr;
|
|
}
|
|
|
|
bool EspLcdDisplay::stopLvgl() {
|
|
if (lvglDisplay == nullptr) {
|
|
return false;
|
|
}
|
|
|
|
auto touch_device = getTouchDevice();
|
|
if (touch_device != nullptr) {
|
|
touch_device->stopLvgl();
|
|
}
|
|
|
|
lvgl_port_remove_disp(lvglDisplay);
|
|
lvglDisplay = nullptr;
|
|
return true;
|
|
}
|
|
|
|
std::shared_ptr<display::DisplayDriver> EspLcdDisplay::getDisplayDriver() {
|
|
assert(lvglDisplay == nullptr); // Still attached to LVGL context. Call stopLvgl() first.
|
|
if (displayDriver == nullptr) {
|
|
displayDriver = std::make_shared<EspLcdDisplayDriver>(
|
|
panelHandle,
|
|
lvglPortDisplayConfig
|
|
);
|
|
}
|
|
return displayDriver;
|
|
}
|