mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-08-20 17:05:06 +00:00
Fix for build
This commit is contained in:
parent
b02663b4bf
commit
f1e96d2ef5
@ -1,23 +0,0 @@
|
|||||||
#include "devices/Display.h"
|
|
||||||
#include "devices/Power.h"
|
|
||||||
|
|
||||||
#include <Tactility/hal/Configuration.h>
|
|
||||||
#include <PwmBacklight.h>
|
|
||||||
|
|
||||||
using namespace tt::hal;
|
|
||||||
|
|
||||||
static bool initBoot() {
|
|
||||||
return driver::pwmbacklight::init(DISPLAY_BACKLIGHT_PIN);
|
|
||||||
}
|
|
||||||
|
|
||||||
static tt::hal::DeviceVector createDevices() {
|
|
||||||
return {
|
|
||||||
createPower(),
|
|
||||||
createDisplay(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
|
||||||
.initBoot = initBoot,
|
|
||||||
.createDevices = createDevices
|
|
||||||
};
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
#include "Display.h"
|
|
||||||
|
|
||||||
#include <Xpt2046Touch.h>
|
|
||||||
#include <St7789Display.h>
|
|
||||||
#include <PwmBacklight.h>
|
|
||||||
#include <Tactility/hal/touch/TouchDevice.h>
|
|
||||||
|
|
||||||
// Create the XPT2046 touch device (hardware/esp_lcd driver)
|
|
||||||
static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
|
|
||||||
auto config = std::make_unique<Xpt2046Touch::Configuration>(
|
|
||||||
DISPLAY_SPI_HOST, // spi device / bus (SPI2_HOST)
|
|
||||||
TOUCH_CS_PIN, // touch CS (IO33)
|
|
||||||
(uint16_t)DISPLAY_HORIZONTAL_RESOLUTION, // x max
|
|
||||||
(uint16_t)DISPLAY_VERTICAL_RESOLUTION, // y max
|
|
||||||
false, // swapXy
|
|
||||||
true, // mirrorX
|
|
||||||
true // mirrorY
|
|
||||||
);
|
|
||||||
|
|
||||||
return std::make_shared<Xpt2046Touch>(std::move(config));
|
|
||||||
}
|
|
||||||
|
|
||||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
|
|
||||||
// Create the ST7789 panel configuration
|
|
||||||
St7789Display::Configuration panel_configuration = {
|
|
||||||
.horizontalResolution = DISPLAY_HORIZONTAL_RESOLUTION,
|
|
||||||
.verticalResolution = DISPLAY_VERTICAL_RESOLUTION,
|
|
||||||
.gapX = 0,
|
|
||||||
.gapY = 0,
|
|
||||||
.swapXY = false,
|
|
||||||
.mirrorX = false,
|
|
||||||
.mirrorY = false,
|
|
||||||
.invertColor = false,
|
|
||||||
.bufferSize = DISPLAY_DRAW_BUFFER_SIZE, // 0 -> default 1/10 screen
|
|
||||||
.touch = createTouch(),
|
|
||||||
.backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
|
|
||||||
.resetPin = GPIO_NUM_NC,
|
|
||||||
.lvglSwapBytes = false,
|
|
||||||
.rgbElementOrder = LCD_RGB_ELEMENT_ORDER_BGR // BGR for this display
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create the SPI configuration (from EspLcdSpiDisplay base class)
|
|
||||||
auto spi_configuration = std::make_shared<EspLcdSpiDisplay::SpiConfiguration>(EspLcdSpiDisplay::SpiConfiguration {
|
|
||||||
.spiHostDevice = DISPLAY_SPI_HOST,
|
|
||||||
.csPin = DISPLAY_PIN_CS,
|
|
||||||
.dcPin = DISPLAY_PIN_DC,
|
|
||||||
.pixelClockFrequency = 40'000'000,
|
|
||||||
.transactionQueueDepth = 10
|
|
||||||
});
|
|
||||||
|
|
||||||
return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include <Tactility/hal/display/DisplayDevice.h>
|
|
||||||
#include "driver/gpio.h"
|
|
||||||
#include "driver/spi_common.h"
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
// Display (ST7789P3 on this board)
|
|
||||||
constexpr auto DISPLAY_SPI_HOST = SPI2_HOST;
|
|
||||||
constexpr auto DISPLAY_PIN_CS = GPIO_NUM_15;
|
|
||||||
constexpr auto DISPLAY_PIN_DC = GPIO_NUM_2;
|
|
||||||
constexpr auto DISPLAY_HORIZONTAL_RESOLUTION = 240;
|
|
||||||
constexpr auto DISPLAY_VERTICAL_RESOLUTION = 320;
|
|
||||||
constexpr auto DISPLAY_DRAW_BUFFER_HEIGHT = (DISPLAY_VERTICAL_RESOLUTION / 10);
|
|
||||||
constexpr auto DISPLAY_DRAW_BUFFER_SIZE = (DISPLAY_HORIZONTAL_RESOLUTION * DISPLAY_DRAW_BUFFER_HEIGHT);
|
|
||||||
constexpr auto DISPLAY_BACKLIGHT_PIN = GPIO_NUM_27;
|
|
||||||
|
|
||||||
// Touch (XPT2046, resistive, shared SPI with display)
|
|
||||||
constexpr auto TOUCH_MISO_PIN = GPIO_NUM_12;
|
|
||||||
constexpr auto TOUCH_MOSI_PIN = GPIO_NUM_13;
|
|
||||||
constexpr auto TOUCH_SCK_PIN = GPIO_NUM_14;
|
|
||||||
constexpr auto TOUCH_CS_PIN = GPIO_NUM_33;
|
|
||||||
constexpr auto TOUCH_IRQ_PIN = GPIO_NUM_36;
|
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
#include "Power.h"
|
|
||||||
|
|
||||||
#include <ChargeFromAdcVoltage.h>
|
|
||||||
#include <EstimatedPower.h>
|
|
||||||
|
|
||||||
std::shared_ptr<tt::hal::power::PowerDevice> createPower() {
|
|
||||||
ChargeFromAdcVoltage::Configuration configuration;
|
|
||||||
// 2.0 ratio, but +.11 added as display voltage sag compensation.
|
|
||||||
configuration.adcMultiplier = 2.11;
|
|
||||||
|
|
||||||
return std::make_shared<EstimatedPower>(configuration);
|
|
||||||
}
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <Tactility/hal/power/PowerDevice.h>
|
|
||||||
|
|
||||||
std::shared_ptr<tt::hal::power::PowerDevice> createPower();
|
|
||||||
@ -17,9 +17,11 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
#include <sdkconfig.h>
|
#include <sdkconfig.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_TT_TOUCH_CALIBRATION_REQUIRED)
|
#ifdef CONFIG_TT_TOUCH_CALIBRATION_REQUIRED
|
||||||
#include <Tactility/app/touchcalibration/TouchCalibration.h>
|
#include <Tactility/app/touchcalibration/TouchCalibration.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user