mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-08-20 17:05:06 +00:00
Remove unused driver
This commit is contained in:
Ken Van Hoeylandt
parent
1069032148
commit
b02663b4bf
@ -1,5 +0,0 @@
|
||||
idf_component_register(
|
||||
SRC_DIRS "Source"
|
||||
INCLUDE_DIRS "Source"
|
||||
REQUIRES Tactility driver esp_lvgl_port
|
||||
)
|
||||
@ -1,4 +0,0 @@
|
||||
# XPT2046_SoftSPI Driver
|
||||
|
||||
XPT2046_SoftSPI is a driver for the XPT2046 resistive touchscreen controller that uses SoftSPI.
|
||||
Inspiration from: https://github.com/ddxfish/XPT2046_Bitbang_Arduino_Library/
|
||||
@ -1,237 +0,0 @@
|
||||
#include "Xpt2046SoftSpi.h"
|
||||
|
||||
#include <tactility/log.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <driver/gpio.h>
|
||||
#include <esp_err.h>
|
||||
#include <freertos/FreeRTOS.h>
|
||||
#include <freertos/task.h>
|
||||
#include <rom/ets_sys.h>
|
||||
|
||||
constexpr auto* TAG = "Xpt2046SoftSpi";
|
||||
|
||||
constexpr auto CMD_READ_Y = 0x90;
|
||||
constexpr auto CMD_READ_X = 0xD0;
|
||||
|
||||
constexpr int RAW_MIN_DEFAULT = 100;
|
||||
constexpr int RAW_MAX_DEFAULT = 1900;
|
||||
constexpr int RAW_VALID_MIN = 100;
|
||||
constexpr int RAW_VALID_MAX = 3900;
|
||||
|
||||
Xpt2046SoftSpi::Xpt2046SoftSpi(std::unique_ptr<Configuration> inConfiguration)
|
||||
: configuration(std::move(inConfiguration)) {
|
||||
assert(configuration != nullptr);
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::start() {
|
||||
LOG_I(TAG, "Starting Xpt2046SoftSpi touch driver");
|
||||
|
||||
// Configure GPIO pins
|
||||
gpio_config_t io_conf = {};
|
||||
|
||||
// Configure MOSI, CLK, CS as outputs
|
||||
io_conf.intr_type = GPIO_INTR_DISABLE;
|
||||
io_conf.mode = GPIO_MODE_OUTPUT;
|
||||
io_conf.pin_bit_mask = (1ULL << configuration->mosiPin) |
|
||||
(1ULL << configuration->clkPin) |
|
||||
(1ULL << configuration->csPin);
|
||||
io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
|
||||
io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
|
||||
|
||||
if (gpio_config(&io_conf) != ESP_OK) {
|
||||
LOG_E(TAG, "Failed to configure output pins");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Configure MISO as input
|
||||
io_conf.mode = GPIO_MODE_INPUT;
|
||||
io_conf.pin_bit_mask = (1ULL << configuration->misoPin);
|
||||
io_conf.pull_up_en = GPIO_PULLUP_ENABLE;
|
||||
|
||||
if (gpio_config(&io_conf) != ESP_OK) {
|
||||
LOG_E(TAG, "Failed to configure input pin");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Initialize pin states
|
||||
gpio_set_level(configuration->csPin, 1); // CS high
|
||||
gpio_set_level(configuration->clkPin, 0); // CLK low
|
||||
gpio_set_level(configuration->mosiPin, 0); // MOSI low
|
||||
|
||||
LOG_I(
|
||||
TAG,
|
||||
"GPIO configured: MOSI=%d, MISO=%d, CLK=%d, CS=%d",
|
||||
static_cast<int>(configuration->mosiPin),
|
||||
static_cast<int>(configuration->misoPin),
|
||||
static_cast<int>(configuration->clkPin),
|
||||
static_cast<int>(configuration->csPin)
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::stop() {
|
||||
LOG_I(TAG, "Stopping Xpt2046SoftSpi touch driver");
|
||||
|
||||
// Stop LVLG if needed
|
||||
if (lvglDevice != nullptr) {
|
||||
stopLvgl();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::startLvgl(lv_display_t* display) {
|
||||
(void)display;
|
||||
if (lvglDevice != nullptr) {
|
||||
LOG_E(TAG, "LVGL was already started");
|
||||
return false;
|
||||
}
|
||||
|
||||
lvglDevice = lv_indev_create();
|
||||
if (lvglDevice == nullptr) {
|
||||
LOG_E(TAG, "Failed to create LVGL input device");
|
||||
return false;
|
||||
}
|
||||
|
||||
lv_indev_set_type(lvglDevice, LV_INDEV_TYPE_POINTER);
|
||||
lv_indev_set_read_cb(lvglDevice, touchReadCallback);
|
||||
lv_indev_set_user_data(lvglDevice, this);
|
||||
|
||||
LOG_I(TAG, "Xpt2046SoftSpi touch driver started successfully");
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::stopLvgl() {
|
||||
if (lvglDevice != nullptr) {
|
||||
lv_indev_delete(lvglDevice);
|
||||
lvglDevice = nullptr;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int Xpt2046SoftSpi::readSPI(uint8_t command) {
|
||||
int result = 0;
|
||||
|
||||
// Pull CS low for this transaction
|
||||
gpio_set_level(configuration->csPin, 0);
|
||||
ets_delay_us(1);
|
||||
|
||||
// Send 8-bit command
|
||||
for (int i = 7; i >= 0; i--) {
|
||||
gpio_set_level(configuration->mosiPin, (command & (1 << i)) ? 1 : 0);
|
||||
gpio_set_level(configuration->clkPin, 1);
|
||||
ets_delay_us(1);
|
||||
gpio_set_level(configuration->clkPin, 0);
|
||||
ets_delay_us(1);
|
||||
}
|
||||
|
||||
for (int i = 11; i >= 0; i--) {
|
||||
gpio_set_level(configuration->clkPin, 1);
|
||||
ets_delay_us(1);
|
||||
if (gpio_get_level(configuration->misoPin)) {
|
||||
result |= (1 << i);
|
||||
}
|
||||
gpio_set_level(configuration->clkPin, 0);
|
||||
ets_delay_us(1);
|
||||
}
|
||||
|
||||
// Pull CS high for this transaction
|
||||
gpio_set_level(configuration->csPin, 1);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::readRawPoint(uint16_t& x, uint16_t& y) {
|
||||
constexpr int sampleCount = 8;
|
||||
int totalX = 0;
|
||||
int totalY = 0;
|
||||
int validSamples = 0;
|
||||
|
||||
for (int i = 0; i < sampleCount; i++) {
|
||||
const int rawX = readSPI(CMD_READ_X);
|
||||
const int rawY = readSPI(CMD_READ_Y);
|
||||
|
||||
if (rawX > RAW_VALID_MIN && rawX < RAW_VALID_MAX && rawY > RAW_VALID_MIN && rawY < RAW_VALID_MAX) {
|
||||
totalX += rawX;
|
||||
totalY += rawY;
|
||||
validSamples++;
|
||||
}
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
}
|
||||
|
||||
if (validSamples < 3) {
|
||||
return false;
|
||||
}
|
||||
|
||||
x = static_cast<uint16_t>(totalX / validSamples);
|
||||
y = static_cast<uint16_t>(totalY / validSamples);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::getTouchPoint(Point& point) {
|
||||
uint16_t rawX = 0;
|
||||
uint16_t rawY = 0;
|
||||
if (!readRawPoint(rawX, rawY)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
int mappedX = (static_cast<int>(rawX) - RAW_MIN_DEFAULT) * static_cast<int>(configuration->xMax) /
|
||||
(RAW_MAX_DEFAULT - RAW_MIN_DEFAULT);
|
||||
int mappedY = (static_cast<int>(rawY) - RAW_MIN_DEFAULT) * static_cast<int>(configuration->yMax) /
|
||||
(RAW_MAX_DEFAULT - RAW_MIN_DEFAULT);
|
||||
|
||||
if (configuration->swapXy) {
|
||||
std::swap(mappedX, mappedY);
|
||||
}
|
||||
if (configuration->mirrorX) {
|
||||
mappedX = static_cast<int>(configuration->xMax) - mappedX;
|
||||
}
|
||||
if (configuration->mirrorY) {
|
||||
mappedY = static_cast<int>(configuration->yMax) - mappedY;
|
||||
}
|
||||
|
||||
uint16_t x = static_cast<uint16_t>(std::clamp(mappedX, 0, static_cast<int>(configuration->xMax)));
|
||||
uint16_t y = static_cast<uint16_t>(std::clamp(mappedY, 0, static_cast<int>(configuration->yMax)));
|
||||
|
||||
point.x = x;
|
||||
point.y = y;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Xpt2046SoftSpi::isTouched() {
|
||||
uint16_t x = 0;
|
||||
uint16_t y = 0;
|
||||
return readRawPoint(x, y);
|
||||
}
|
||||
|
||||
void Xpt2046SoftSpi::touchReadCallback(lv_indev_t* indev, lv_indev_data_t* data) {
|
||||
auto* touch = static_cast<Xpt2046SoftSpi*>(lv_indev_get_user_data(indev));
|
||||
if (touch == nullptr) {
|
||||
data->state = LV_INDEV_STATE_RELEASED;
|
||||
return;
|
||||
}
|
||||
|
||||
Point point;
|
||||
if (touch->getTouchPoint(point)) {
|
||||
data->point.x = point.x;
|
||||
data->point.y = point.y;
|
||||
data->state = LV_INDEV_STATE_PRESSED;
|
||||
} else {
|
||||
data->state = LV_INDEV_STATE_RELEASED;
|
||||
}
|
||||
}
|
||||
|
||||
// Return driver instance if any
|
||||
std::shared_ptr<tt::hal::touch::TouchDriver> Xpt2046SoftSpi::getTouchDriver() {
|
||||
assert(lvglDevice == nullptr); // Still attached to LVGL context. Call stopLvgl() first.
|
||||
|
||||
if (touchDriver == nullptr) {
|
||||
touchDriver = std::make_shared<Xpt2046SoftSpiDriver>(this);
|
||||
}
|
||||
|
||||
return touchDriver;
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "Tactility/hal/touch/TouchDevice.h"
|
||||
#include "Tactility/hal/touch/TouchDriver.h"
|
||||
#include "lvgl.h"
|
||||
#include <driver/gpio.h>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#ifndef TFT_WIDTH
|
||||
#define TFT_WIDTH 240
|
||||
#endif
|
||||
|
||||
#ifndef TFT_HEIGHT
|
||||
#define TFT_HEIGHT 320
|
||||
#endif
|
||||
|
||||
struct Point {
|
||||
int x;
|
||||
int y;
|
||||
};
|
||||
|
||||
class Xpt2046SoftSpi : public tt::hal::touch::TouchDevice {
|
||||
public:
|
||||
class Configuration {
|
||||
public:
|
||||
Configuration(
|
||||
gpio_num_t mosiPin,
|
||||
gpio_num_t misoPin,
|
||||
gpio_num_t clkPin,
|
||||
gpio_num_t csPin,
|
||||
uint16_t xMax = TFT_WIDTH,
|
||||
uint16_t yMax = TFT_HEIGHT,
|
||||
bool swapXy = false,
|
||||
bool mirrorX = false,
|
||||
bool mirrorY = false
|
||||
) : mosiPin(mosiPin),
|
||||
misoPin(misoPin),
|
||||
clkPin(clkPin),
|
||||
csPin(csPin),
|
||||
xMax(xMax),
|
||||
yMax(yMax),
|
||||
swapXy(swapXy),
|
||||
mirrorX(mirrorX),
|
||||
mirrorY(mirrorY)
|
||||
{}
|
||||
|
||||
gpio_num_t mosiPin;
|
||||
gpio_num_t misoPin;
|
||||
gpio_num_t clkPin;
|
||||
gpio_num_t csPin;
|
||||
uint16_t xMax;
|
||||
uint16_t yMax;
|
||||
bool swapXy;
|
||||
bool mirrorX;
|
||||
bool mirrorY;
|
||||
};
|
||||
|
||||
private:
|
||||
|
||||
class Xpt2046SoftSpiDriver final : public tt::hal::touch::TouchDriver {
|
||||
Xpt2046SoftSpi* device;
|
||||
public:
|
||||
Xpt2046SoftSpiDriver(Xpt2046SoftSpi* device) : device(device) {}
|
||||
bool getTouchedPoints(uint16_t* x, uint16_t* y, uint16_t* strength, uint8_t* pointCount, uint8_t maxPointCount) override {
|
||||
Point point;
|
||||
if (device->isTouched() && device->getTouchPoint(point)) {
|
||||
*x = point.x;
|
||||
*y = point.y;
|
||||
*pointCount = 1;
|
||||
return true;
|
||||
} else {
|
||||
*pointCount = 0;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
std::unique_ptr<Configuration> configuration;
|
||||
lv_indev_t* lvglDevice = nullptr;
|
||||
std::shared_ptr<tt::hal::touch::TouchDriver> touchDriver;
|
||||
|
||||
int readSPI(uint8_t command);
|
||||
bool readRawPoint(uint16_t& x, uint16_t& y);
|
||||
static void touchReadCallback(lv_indev_t* indev, lv_indev_data_t* data);
|
||||
|
||||
public:
|
||||
explicit Xpt2046SoftSpi(std::unique_ptr<Configuration> inConfiguration);
|
||||
|
||||
// TouchDevice interface
|
||||
std::string getName() const final { return "Xpt2046SoftSpi"; }
|
||||
std::string getDescription() const final { return "Xpt2046 Soft SPI touch driver"; }
|
||||
|
||||
bool start() override;
|
||||
bool stop() override;
|
||||
|
||||
bool supportsLvgl() const override { return true; }
|
||||
bool startLvgl(lv_display_t* display) override;
|
||||
bool stopLvgl() override;
|
||||
|
||||
bool supportsTouchDriver() override { return true; }
|
||||
std::shared_ptr<tt::hal::touch::TouchDriver> getTouchDriver() override;
|
||||
lv_indev_t* getLvglIndev() override { return lvglDevice; }
|
||||
|
||||
// XPT2046-specific methods
|
||||
bool getTouchPoint(Point& point);
|
||||
bool isTouched();
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user