- 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 = "..";`
56 lines
2.1 KiB
C++
56 lines
2.1 KiB
C++
#include "Gt911Touch.h"
|
|
|
|
#include <Tactility/Log.h>
|
|
#include <Tactility/hal/i2c/I2c.h>
|
|
|
|
#include <esp_lcd_touch_gt911.h>
|
|
#include <esp_err.h>
|
|
|
|
#define TAG "GT911"
|
|
|
|
bool Gt911Touch::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
|
|
esp_lcd_panel_io_i2c_config_t io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG();
|
|
|
|
/**
|
|
* When the interrupt pin is low, the address is 0x5D. Otherwise it is 0x14.
|
|
* There is not reset pin, and the current driver fails when you only specify the interrupt pin.
|
|
* Because of that, we don't use the interrupt pin and we'll simply scan the bus instead:
|
|
*/
|
|
if (tt::hal::i2c::masterHasDeviceAtAddress(configuration->port, ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS)) {
|
|
io_config.dev_addr = ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS;
|
|
} else if (tt::hal::i2c::masterHasDeviceAtAddress(configuration->port, ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS_BACKUP)) {
|
|
io_config.dev_addr = ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS_BACKUP;
|
|
} else {
|
|
TT_LOG_E(TAG, "No device found on I2C bus");
|
|
return false;
|
|
}
|
|
|
|
return esp_lcd_new_panel_io_i2c(configuration->port, &io_config, &outHandle) == ESP_OK;
|
|
}
|
|
|
|
bool Gt911Touch::createTouchHandle(esp_lcd_panel_io_handle_t ioHandle, const esp_lcd_touch_config_t& configuration, esp_lcd_touch_handle_t& panelHandle) {
|
|
return esp_lcd_touch_new_i2c_gt911(ioHandle, &configuration, &panelHandle) == ESP_OK;
|
|
}
|
|
|
|
esp_lcd_touch_config_t Gt911Touch::createEspLcdTouchConfig() {
|
|
return {
|
|
.x_max = configuration->xMax,
|
|
.y_max = configuration->yMax,
|
|
.rst_gpio_num = configuration->pinReset,
|
|
.int_gpio_num = configuration->pinInterrupt,
|
|
.levels = {
|
|
.reset = configuration->pinResetLevel,
|
|
.interrupt = configuration->pinInterruptLevel,
|
|
},
|
|
.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
|
|
};
|
|
}
|