mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-18 19:03:16 +00:00
c98cb2bf10
This commit contains @josemalm32 's implementation for the Guition JC1060P470CIWY (see https://github.com/ByteWelder/Tactility/issues/427) I've added these changes: - Updated the branch for the new logging method - Updated the branch for the PR that I mentioned in the above linked issue - Replaced the manually pasted in esp_lcd_jd9165 driver with the one from the component registry - Updated Spanish to English - Updated all drivers' mutexes/locks - Fixed the display color format - Fixed bug in power deinit - Renamed I2C bus in config - Added device to continuous integration - Renamed several Guition devices from CYD to Guition - Fix for `EspLcdDisplayV2` init for when features are not supported - Pin esp_wifi_remote to version 1.2.3 - Fix in `WifiManage` logging - Fix for `WifiEsp.cpp`'s check for wifi presence - Fix for `WifiEsp`'s scan list logging - Fix for `gcc_soft_float_symbols` in TactiltyC
66 lines
2.2 KiB
C++
66 lines
2.2 KiB
C++
#include "Display.h"
|
|
#include "Jd9165Display.h"
|
|
|
|
#include <Gt911Touch.h>
|
|
#include <PwmBacklight.h>
|
|
#include <Tactility/Logger.h>
|
|
#include <Tactility/Mutex.h>
|
|
|
|
constexpr auto LCD_PIN_RESET = GPIO_NUM_0; // Match P4 EV board reset line
|
|
constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_23;
|
|
constexpr auto LCD_HORIZONTAL_RESOLUTION = 1024;
|
|
constexpr auto LCD_VERTICAL_RESOLUTION = 600;
|
|
|
|
constexpr auto TOUCH_I2C_PORT = I2C_NUM_0;
|
|
constexpr auto TOUCH_I2C_SDA = GPIO_NUM_7;
|
|
constexpr auto TOUCH_I2C_SCL = GPIO_NUM_8;
|
|
constexpr auto TOUCH_PIN_RESET = GPIO_NUM_NC;
|
|
constexpr auto TOUCH_PIN_INTERRUPT = GPIO_NUM_NC;
|
|
|
|
static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
|
|
auto configuration = std::make_unique<Gt911Touch::Configuration>(
|
|
TOUCH_I2C_PORT,
|
|
LCD_HORIZONTAL_RESOLUTION,
|
|
LCD_VERTICAL_RESOLUTION,
|
|
false, // swapXY
|
|
false, // mirrorX
|
|
false, // mirrorY
|
|
TOUCH_PIN_RESET,
|
|
TOUCH_PIN_INTERRUPT
|
|
);
|
|
|
|
return std::make_shared<Gt911Touch>(std::move(configuration));
|
|
}
|
|
|
|
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
|
|
// Initialize PWM backlight
|
|
if (!driver::pwmbacklight::init(LCD_PIN_BACKLIGHT, 20000, LEDC_TIMER_1, LEDC_CHANNEL_0)) {
|
|
tt::Logger("jc1060p470ciwy").warn("Failed to initialize backlight");
|
|
}
|
|
|
|
auto touch = createTouch();
|
|
|
|
auto configuration = std::make_shared<EspLcdConfiguration>(EspLcdConfiguration {
|
|
.horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
|
|
.verticalResolution = LCD_VERTICAL_RESOLUTION,
|
|
.gapX = 0,
|
|
.gapY = 0,
|
|
.monochrome = false,
|
|
.swapXY = false,
|
|
.mirrorX = false,
|
|
.mirrorY = false,
|
|
.invertColor = false,
|
|
.bufferSize = 0, // 0 = default (1/10 of screen)
|
|
.touch = touch,
|
|
.backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
|
|
.resetPin = LCD_PIN_RESET,
|
|
.lvglColorFormat = LV_COLOR_FORMAT_RGB565,
|
|
.lvglSwapBytes = false,
|
|
.rgbElementOrder = LCD_RGB_ELEMENT_ORDER_RGB,
|
|
.bitsPerPixel = 16
|
|
});
|
|
|
|
const auto display = std::make_shared<Jd9165Display>(configuration);
|
|
return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
|
|
}
|