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 = "..";`
93 lines
2.0 KiB
C++
93 lines
2.0 KiB
C++
#include "EspLcdTouch.h"
|
|
|
|
#include <EspLcdTouchDriver.h>
|
|
#include <esp_lvgl_port_touch.h>
|
|
#include <Tactility/LogEsp.h>
|
|
|
|
constexpr const char* TAG = "EspLcdTouch";
|
|
|
|
bool EspLcdTouch::start() {
|
|
if (!createIoHandle(ioHandle) != ESP_OK) {
|
|
TT_LOG_E(TAG, "Touch IO failed");
|
|
return false;
|
|
}
|
|
|
|
config = createEspLcdTouchConfig();
|
|
|
|
if (!createTouchHandle(ioHandle, config, touchHandle)) {
|
|
TT_LOG_E(TAG, "Driver init failed");
|
|
esp_lcd_panel_io_del(ioHandle);
|
|
ioHandle = nullptr;
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool EspLcdTouch::stop() {
|
|
if (lvglDevice != nullptr) {
|
|
stopLvgl();
|
|
}
|
|
|
|
if (ioHandle != nullptr) {
|
|
esp_lcd_panel_io_del(ioHandle);
|
|
ioHandle = nullptr;
|
|
}
|
|
|
|
if (touchHandle != nullptr) {
|
|
esp_lcd_touch_del(touchHandle);
|
|
touchHandle = nullptr;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool EspLcdTouch::startLvgl(lv_disp_t* display) {
|
|
if (lvglDevice != nullptr) {
|
|
return false;
|
|
}
|
|
|
|
if (touchDriver != nullptr && touchDriver.use_count() > 1) {
|
|
TT_LOG_W(TAG, "TouchDriver is still in use.");
|
|
}
|
|
|
|
const lvgl_port_touch_cfg_t touch_cfg = {
|
|
.disp = display,
|
|
.handle = touchHandle,
|
|
};
|
|
|
|
TT_LOG_I(TAG, "Adding touch to LVGL");
|
|
lvglDevice = lvgl_port_add_touch(&touch_cfg);
|
|
if (lvglDevice == nullptr) {
|
|
TT_LOG_E(TAG, "Adding touch failed");
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool EspLcdTouch::stopLvgl() {
|
|
if (lvglDevice == nullptr) {
|
|
return false;
|
|
}
|
|
|
|
lvgl_port_remove_touch(lvglDevice);
|
|
lvglDevice = nullptr;
|
|
|
|
return true;
|
|
}
|
|
|
|
std::shared_ptr<tt::hal::touch::TouchDriver> _Nullable EspLcdTouch::getTouchDriver() {
|
|
assert(lvglDevice == nullptr); // Still attached to LVGL context. Call stopLvgl() first.
|
|
|
|
if (touchHandle == nullptr) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (touchDriver == nullptr) {
|
|
touchDriver = std::make_shared<EspLcdTouchDriver>(touchHandle);
|
|
}
|
|
|
|
return touchDriver;
|
|
}
|