Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions Drivers/XPT2046/Source/Xpt2046Touch.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
#include "Xpt2046Touch.h"

#include <Tactility/settings/TouchCalibrationSettings.h>
#include <Tactility/lvgl/LvglSync.h>

#include <algorithm>
#include <esp_err.h>
#include <esp_lcd_touch_xpt2046.h>

static void processCoordinates(esp_lcd_touch_handle_t tp, uint16_t* x, uint16_t* y, uint16_t* strength, uint8_t* pointCount, uint8_t maxPointCount) {
(void)strength;
if (tp == nullptr || x == nullptr || y == nullptr || pointCount == nullptr || *pointCount == 0) {
return;
}

auto* config = static_cast<Xpt2046Touch::Configuration*>(tp->config.user_data);
if (config == nullptr) {
return;
}

const auto settings = tt::settings::touch::getActive();
const auto points = std::min<uint8_t>(*pointCount, maxPointCount);
for (uint8_t i = 0; i < points; i++) {
tt::settings::touch::applyCalibration(settings, config->xMax, config->yMax, x[i], y[i]);
}
}

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(configuration->spiDevice, &io_config, &outHandle) == ESP_OK;
Expand All @@ -29,9 +49,9 @@ esp_lcd_touch_config_t Xpt2046Touch::createEspLcdTouchConfig() {
.mirror_x = configuration->mirrorX,
.mirror_y = configuration->mirrorY,
},
.process_coordinates = nullptr,
.process_coordinates = processCoordinates,
.interrupt_callback = nullptr,
.user_data = nullptr,
.user_data = configuration.get(),
.driver_data = nullptr
};
}
4 changes: 3 additions & 1 deletion Drivers/XPT2046/Source/Xpt2046Touch.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@ class Xpt2046Touch : public EspLcdTouch {

std::string getName() const final { return "XPT2046"; }

std::string getDescription() const final { return "XPT2046 I2C touch driver"; }
std::string getDescription() const final { return "XPT2046 SPI touch driver"; }

bool supportsCalibration() const override { return true; }
};
Loading
Loading