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 = "..";`
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
#include "Xpt2046Touch.h"
|
|
|
|
#include <Tactility/Log.h>
|
|
#include <Tactility/lvgl/LvglSync.h>
|
|
|
|
#include <esp_err.h>
|
|
#include <esp_lcd_touch_xpt2046.h>
|
|
#include <esp_lvgl_port.h>
|
|
|
|
Xpt2046Touch* Xpt2046Touch::instance = nullptr;
|
|
|
|
bool Xpt2046Touch::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
|
|
const esp_lcd_panel_io_spi_config_t io_config = ESP_LCD_TOUCH_IO_SPI_XPT2046_CONFIG(configuration->spiPinCs);
|
|
return esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &outHandle) == ESP_OK;
|
|
}
|
|
|
|
bool Xpt2046Touch::createTouchHandle(esp_lcd_panel_io_handle_t ioHandle, const esp_lcd_touch_config_t& config, esp_lcd_touch_handle_t& panelHandle) {
|
|
return esp_lcd_touch_new_spi_xpt2046(ioHandle, &config, &panelHandle) == ESP_OK;
|
|
}
|
|
|
|
esp_lcd_touch_config_t Xpt2046Touch::createEspLcdTouchConfig() {
|
|
return {
|
|
.x_max = configuration->xMax,
|
|
.y_max = configuration->yMax,
|
|
.rst_gpio_num = GPIO_NUM_NC,
|
|
.int_gpio_num = GPIO_NUM_NC,
|
|
.levels = {
|
|
.reset = 0,
|
|
.interrupt = 0,
|
|
},
|
|
.flags = {
|
|
.swap_xy = configuration->swapXy,
|
|
.mirror_x = configuration->mirrorX,
|
|
.mirror_y = configuration->mirrorY,
|
|
},
|
|
.process_coordinates = nullptr,
|
|
.interrupt_callback = nullptr,
|
|
.user_data = nullptr,
|
|
.driver_data = nullptr
|
|
};
|
|
}
|
|
|
|
bool Xpt2046Touch::getVBat(float& outputVbat) {
|
|
auto touch_handle = getTouchHandle();
|
|
if (touch_handle == nullptr) {
|
|
return false;
|
|
}
|
|
|
|
// Shares the SPI bus with the display, so we have to sync/lock as this method might be called from anywhere
|
|
if (!tt::lvgl::lock(50 / portTICK_PERIOD_MS)) {
|
|
return false;
|
|
}
|
|
|
|
esp_lcd_touch_xpt2046_read_battery_level(touch_handle, &outputVbat);
|
|
tt::lvgl::unlock();
|
|
return true;
|
|
}
|