- 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 = "..";`
64 lines
1.6 KiB
C++
64 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include <Tactility/hal/touch/TouchDevice.h>
|
|
|
|
#include <EspLcdTouch.h>
|
|
|
|
class Xpt2046Touch : public EspLcdTouch {
|
|
|
|
public:
|
|
|
|
class Configuration {
|
|
public:
|
|
|
|
Configuration(
|
|
esp_lcd_spi_bus_handle_t spiDevice,
|
|
gpio_num_t spiPinCs,
|
|
uint16_t xMax,
|
|
uint16_t yMax,
|
|
bool swapXy = false,
|
|
bool mirrorX = false,
|
|
bool mirrorY = false
|
|
) : spiDevice(spiDevice),
|
|
spiPinCs(spiPinCs),
|
|
xMax(xMax),
|
|
yMax(yMax),
|
|
swapXy(swapXy),
|
|
mirrorX(mirrorX),
|
|
mirrorY(mirrorY)
|
|
{}
|
|
|
|
esp_lcd_spi_bus_handle_t spiDevice;
|
|
gpio_num_t spiPinCs;
|
|
uint16_t xMax;
|
|
uint16_t yMax;
|
|
bool swapXy;
|
|
bool mirrorX;
|
|
bool mirrorY;
|
|
};
|
|
|
|
private:
|
|
|
|
static Xpt2046Touch* instance;
|
|
|
|
std::unique_ptr<Configuration> configuration;
|
|
|
|
bool createIoHandle(esp_lcd_panel_io_handle_t& outHandle) override;
|
|
|
|
bool createTouchHandle(esp_lcd_panel_io_handle_t ioHandle, const esp_lcd_touch_config_t& configuration, esp_lcd_touch_handle_t& panelHandle) override;
|
|
|
|
esp_lcd_touch_config_t createEspLcdTouchConfig() override;
|
|
|
|
public:
|
|
|
|
explicit Xpt2046Touch(std::unique_ptr<Configuration> inConfiguration) : configuration(std::move(inConfiguration)) {
|
|
assert(configuration != nullptr);
|
|
}
|
|
|
|
std::string getName() const final { return "XPT2046"; }
|
|
|
|
std::string getDescription() const final { return "XPT2046 I2C touch driver"; }
|
|
|
|
bool getVBat(float& outputVbat);
|
|
};
|