1deaf4c426
* feat(board): add support for CYD-2432S028R board and update XPT2046 driver
- Added CONFIG_TT_BOARD_CYD_2432S028R in Kconfig.
- Included support for CYD2432S028R in Boards.h and board.cmake.
- Updated Xpt2046Touch driver to use configuration->spiDevice instead of SPI2_HOST when creating the SPI handle.
- Note: SD card is not working on this board yet.
This commit introduces full support for the CYD-2432S028R board and improves the touchscreen driver flexibility by allowing dynamic SPI device configuration. SD card functionality still needs to be implemented.
* Added a new GitHub Actions job to build firmware for the cyd-2432s028r board
using the existing build-firmware action. This ensures continuous integration
coverage for the new board alongside other supported ESP32 variants.
* Removed unnecessary file
* Refactor CYD-2432S028R board initialization, touch, and SD drivers
- Updated board CMakeLists to use `XPT2046-Bitbang` instead of `XPT2046`.
- Added `YellowSdCard` support and initialized SD card in board configuration.
- Updated SPI pin assignments for touch and SD card to match hardware setup.
- Refactored touch driver to use bit-banged SPI with proper start/stop handling.
- Touch adaptation was based on a merge of:
- https://github.com/NellowTCS/Tactility/blob/main/Drivers/XPT2046-Bitbang/Source/XPT2046-Bitbang.cpp
- https://github.com/ddxfish/XPT2046_Bitbang_Arduino_Library/blob/main/XPT2046_Bitbang.cpp
- Calibration is currently static in code:
Calibration cal = {
.xMin = 100,
.xMax = 1900,
.yMin = 100,
.yMax = 1900
};
This removes the need for manual touchscreen calibration, but code was adjusted to support dynamic calibration in the future.
- Added comments and constants for software SPI touch pins.
- Updated `YellowDisplay` to use new touch driver configuration.
* Refactor XPT2046 touch driver: replace Bitbang with SoftSPI implementation, update CMake and README files
102 lines
2.7 KiB
C++
102 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#include "Tactility/hal/touch/TouchDevice.h"
|
|
#include "Tactility/hal/touch/TouchDriver.h"
|
|
#include <Tactility/TactilityCore.h>
|
|
#include "lvgl.h"
|
|
#include <driver/gpio.h>
|
|
#include <esp_err.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/task.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:
|
|
static Xpt2046SoftSpi* instance;
|
|
std::unique_ptr<Configuration> configuration;
|
|
lv_indev_t* deviceHandle = nullptr;
|
|
|
|
int readSPI(uint8_t command);
|
|
void cleanup();
|
|
bool loadCalibration();
|
|
void saveCalibration();
|
|
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; // zero-arg start
|
|
bool supportsLvgl() const override;
|
|
bool startLvgl(lv_display_t* display) override;
|
|
bool stopLvgl() override;
|
|
bool stop() override;
|
|
bool supportsTouchDriver() override;
|
|
std::shared_ptr<tt::hal::touch::TouchDriver> getTouchDriver() override;
|
|
lv_indev_t* getLvglIndev() override { return deviceHandle; }
|
|
|
|
// Original LVGL-specific start
|
|
bool start(lv_display_t* display);
|
|
|
|
// XPT2046-specific methods
|
|
Point getTouch();
|
|
void calibrate();
|
|
void setCalibration(int xMin, int yMin, int xMax, int yMax);
|
|
bool isTouched();
|
|
|
|
// Static instance access
|
|
static Xpt2046SoftSpi* getInstance() { return instance; }
|
|
};
|