Shadowtrance board implementations (#241)
Adapted from pull request https://github.com/ByteWelder/Tactility/pull/238 - JC2432W328C - ST7789 - CST820 (816) 240x320 - 2.8 inch - ESP32-8048S043C - ST7262 - GT911 800x480 - 4.3 inch - JC8048W550C - ST7262 - GT911 800x480 - 5 inch
This commit is contained in:
Ken Van Hoeylandt
committed by
GitHub
GitHub
parent
85a6ad3bbe
commit
778e003d4d
@@ -0,0 +1,79 @@
|
||||
#include "CYD8048S043C.h"
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "hal/YellowDisplay.h"
|
||||
#include "hal/YellowDisplayConstants.h"
|
||||
#include "hal/YellowSdCard.h"
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
const Configuration cyd_8048s043c_config = {
|
||||
.createDisplay = createDisplay,
|
||||
.sdcard = createYellowSdCard(),
|
||||
.power = nullptr,
|
||||
.i2c = {
|
||||
//Touch
|
||||
i2c::Configuration {
|
||||
.name = "Internal",
|
||||
.port = I2C_NUM_0,
|
||||
.initMode = i2c::InitMode::ByTactility,
|
||||
.isMutable = true,
|
||||
.config = (i2c_config_t) {
|
||||
.mode = I2C_MODE_MASTER,
|
||||
.sda_io_num = GPIO_NUM_19,
|
||||
.scl_io_num = GPIO_NUM_20,
|
||||
.sda_pullup_en = true,
|
||||
.scl_pullup_en = true,
|
||||
.master = {
|
||||
.clk_speed = 400000
|
||||
},
|
||||
.clk_flags = 0
|
||||
}
|
||||
},
|
||||
//P4 header, JST SH 1.0, GND / 3.3V / IO17 / IO18
|
||||
i2c::Configuration {
|
||||
.name = "External",
|
||||
.port = I2C_NUM_1,
|
||||
.initMode = i2c::InitMode::ByTactility,
|
||||
.isMutable = true,
|
||||
.config = (i2c_config_t) {
|
||||
.mode = I2C_MODE_MASTER,
|
||||
.sda_io_num = GPIO_NUM_17,
|
||||
.scl_io_num = GPIO_NUM_18,
|
||||
.sda_pullup_en = true,
|
||||
.scl_pullup_en = true,
|
||||
.master = {
|
||||
.clk_speed = 400000
|
||||
},
|
||||
.clk_flags = 0
|
||||
}
|
||||
}
|
||||
},
|
||||
.spi {
|
||||
//SD Card
|
||||
spi::Configuration {
|
||||
.device = SPI2_HOST,
|
||||
.dma = SPI_DMA_CH_AUTO,
|
||||
.config = {
|
||||
.mosi_io_num = GPIO_NUM_11,
|
||||
.miso_io_num = GPIO_NUM_13,
|
||||
.sclk_io_num = GPIO_NUM_12,
|
||||
.quadwp_io_num = -1,
|
||||
.quadhd_io_num = -1,
|
||||
.data4_io_num = 0,
|
||||
.data5_io_num = 0,
|
||||
.data6_io_num = 0,
|
||||
.data7_io_num = 0,
|
||||
.data_io_default_level = false,
|
||||
.max_transfer_sz = 8192,
|
||||
.flags = 0,
|
||||
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
.intr_flags = 0
|
||||
},
|
||||
.initMode = spi::InitMode::ByTactility,
|
||||
.isMutable = false,
|
||||
.lock = nullptr
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
// Capacitive touch version of the 4.3" yellow board
|
||||
extern const tt::hal::Configuration cyd_8048s043c_config;
|
||||
@@ -0,0 +1,220 @@
|
||||
#include "YellowDisplay.h"
|
||||
#include "YellowDisplayConstants.h"
|
||||
|
||||
#include <Gt911Touch.h>
|
||||
#include <Tactility/Log.h>
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <esp_lcd_panel_commands.h>
|
||||
|
||||
#include <driver/gpio.h>
|
||||
#include <driver/ledc.h>
|
||||
#include <esp_err.h>
|
||||
#include <esp_lcd_panel_rgb.h>
|
||||
#include <esp_lcd_panel_ops.h>
|
||||
#include <esp_lvgl_port.h>
|
||||
|
||||
#define TAG "yellow_display"
|
||||
|
||||
static bool isBacklightInitialized = false;
|
||||
|
||||
static bool initBacklight() {
|
||||
ledc_timer_config_t ledc_timer = {
|
||||
.speed_mode = CYD8048S043_LCD_BACKLIGHT_LEDC_MODE,
|
||||
.duty_resolution = CYD8048S043_LCD_BACKLIGHT_LEDC_DUTY_RES,
|
||||
.timer_num = CYD8048S043_LCD_BACKLIGHT_LEDC_TIMER,
|
||||
.freq_hz = CYD8048S043_LCD_BACKLIGHT_LEDC_FREQUENCY,
|
||||
.clk_cfg = LEDC_AUTO_CLK,
|
||||
.deconfigure = false
|
||||
};
|
||||
|
||||
if (ledc_timer_config(&ledc_timer) != ESP_OK) {
|
||||
TT_LOG_E(TAG, "Backlight led timer config failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool setBacklight(uint8_t duty) {
|
||||
ledc_channel_config_t ledc_channel = {
|
||||
.gpio_num = CYD8048S043_LCD_PIN_BACKLIGHT,
|
||||
.speed_mode = CYD8048S043_LCD_BACKLIGHT_LEDC_MODE,
|
||||
.channel = CYD8048S043_LCD_BACKLIGHT_LEDC_CHANNEL,
|
||||
.intr_type = LEDC_INTR_DISABLE,
|
||||
.timer_sel = CYD8048S043_LCD_BACKLIGHT_LEDC_TIMER,
|
||||
.duty = duty,
|
||||
.hpoint = 0,
|
||||
.sleep_mode = LEDC_SLEEP_MODE_NO_ALIVE_NO_PD,
|
||||
.flags = {
|
||||
.output_invert = false
|
||||
}
|
||||
};
|
||||
|
||||
if (ledc_channel_config(&ledc_channel) != ESP_OK) {
|
||||
TT_LOG_E(TAG, "Backlight init failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool YellowDisplay::start() {
|
||||
TT_LOG_I(TAG, "Starting");
|
||||
|
||||
const esp_lcd_rgb_panel_config_t panel_config = {
|
||||
.clk_src = LCD_CLK_SRC_DEFAULT,
|
||||
.timings = {
|
||||
.pclk_hz = 16000000,
|
||||
.h_res = CYD8048S043_LCD_HORIZONTAL_RESOLUTION,
|
||||
.v_res = CYD8048S043_LCD_VERTICAL_RESOLUTION,
|
||||
|
||||
.hsync_pulse_width = 4,
|
||||
.hsync_back_porch = 8,
|
||||
.hsync_front_porch = 8,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 8,
|
||||
.vsync_front_porch = 8,
|
||||
.flags = {
|
||||
.hsync_idle_low = false,
|
||||
.vsync_idle_low = false,
|
||||
.de_idle_high = false,
|
||||
.pclk_active_neg = true,
|
||||
.pclk_idle_high = false
|
||||
}
|
||||
},
|
||||
.data_width = 16,
|
||||
.bits_per_pixel = 0,
|
||||
.num_fbs = 2,
|
||||
.bounce_buffer_size_px = CYD8048S043_LCD_HORIZONTAL_RESOLUTION * 10,
|
||||
.sram_trans_align = 8,
|
||||
.psram_trans_align = 64,
|
||||
|
||||
.hsync_gpio_num = CYD8048S043_LCD_PIN_HSYNC,
|
||||
.vsync_gpio_num = CYD8048S043_LCD_PIN_VSYNC,
|
||||
.de_gpio_num = CYD8048S043_LCD_PIN_DE,
|
||||
.pclk_gpio_num = CYD8048S043_LCD_PIN_PCLK,
|
||||
.disp_gpio_num = CYD8048S043_LCD_PIN_DISP_EN,
|
||||
.data_gpio_nums = {
|
||||
CYD8048S043_LCD_PIN_DATA0,
|
||||
CYD8048S043_LCD_PIN_DATA1,
|
||||
CYD8048S043_LCD_PIN_DATA2,
|
||||
CYD8048S043_LCD_PIN_DATA3,
|
||||
CYD8048S043_LCD_PIN_DATA4,
|
||||
CYD8048S043_LCD_PIN_DATA5,
|
||||
CYD8048S043_LCD_PIN_DATA6,
|
||||
CYD8048S043_LCD_PIN_DATA7,
|
||||
CYD8048S043_LCD_PIN_DATA8,
|
||||
CYD8048S043_LCD_PIN_DATA9,
|
||||
CYD8048S043_LCD_PIN_DATA10,
|
||||
CYD8048S043_LCD_PIN_DATA11,
|
||||
CYD8048S043_LCD_PIN_DATA12,
|
||||
CYD8048S043_LCD_PIN_DATA13,
|
||||
CYD8048S043_LCD_PIN_DATA14,
|
||||
CYD8048S043_LCD_PIN_DATA15
|
||||
},
|
||||
.flags = {
|
||||
.disp_active_low = false,
|
||||
.refresh_on_demand = false,
|
||||
.fb_in_psram = true,
|
||||
.double_fb = true,
|
||||
.no_fb = false,
|
||||
.bb_invalidate_cache = false
|
||||
}
|
||||
};
|
||||
|
||||
if (esp_lcd_new_rgb_panel(&panel_config, &panelHandle) != ESP_OK) {
|
||||
TT_LOG_E(TAG, "Failed to create panel");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (esp_lcd_panel_reset(panelHandle) != ESP_OK) {
|
||||
TT_LOG_E(TAG, "Failed to reset panel");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (esp_lcd_panel_init(panelHandle) != ESP_OK) {
|
||||
TT_LOG_E(TAG, "Failed to init panel");
|
||||
return false;
|
||||
}
|
||||
|
||||
const lvgl_port_display_cfg_t disp_cfg = {
|
||||
.io_handle = ioHandle,
|
||||
.panel_handle = panelHandle,
|
||||
.control_handle = nullptr,
|
||||
.buffer_size = CYD8048S043_LCD_DRAW_BUFFER_SIZE,
|
||||
.double_buffer = true,
|
||||
.trans_size = 0,
|
||||
.hres = CYD8048S043_LCD_HORIZONTAL_RESOLUTION,
|
||||
.vres = CYD8048S043_LCD_VERTICAL_RESOLUTION,
|
||||
.monochrome = false,
|
||||
.rotation = {
|
||||
.swap_xy = false,
|
||||
.mirror_x = false,
|
||||
.mirror_y = false,
|
||||
},
|
||||
.color_format = LV_COLOR_FORMAT_RGB565,
|
||||
.flags = {
|
||||
.buff_dma = false,
|
||||
.buff_spiram = true,
|
||||
.sw_rotate = false,
|
||||
.swap_bytes = false,
|
||||
.full_refresh = false,
|
||||
.direct_mode = false
|
||||
}
|
||||
};
|
||||
|
||||
const lvgl_port_display_rgb_cfg_t rgb_cfg = {
|
||||
.flags = {
|
||||
.bb_mode = true,
|
||||
.avoid_tearing = false
|
||||
}
|
||||
};
|
||||
|
||||
displayHandle = lvgl_port_add_disp_rgb(&disp_cfg, &rgb_cfg);
|
||||
TT_LOG_I(TAG, "Finished");
|
||||
return displayHandle != nullptr;
|
||||
}
|
||||
|
||||
bool YellowDisplay::stop() {
|
||||
assert(displayHandle != nullptr);
|
||||
|
||||
lvgl_port_remove_disp(displayHandle);
|
||||
|
||||
if (esp_lcd_panel_del(panelHandle) != ESP_OK) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (esp_lcd_panel_io_del(ioHandle) != ESP_OK) {
|
||||
return false;
|
||||
}
|
||||
|
||||
displayHandle = nullptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable YellowDisplay::createTouch() {
|
||||
// Note for future changes: Reset pin is 38 and interrupt pin is 18
|
||||
// or INT = NC, schematic and other info floating around is kinda conflicting...
|
||||
auto configuration = std::make_unique<Gt911Touch::Configuration>(
|
||||
I2C_NUM_0,
|
||||
800,
|
||||
480
|
||||
);
|
||||
|
||||
return std::make_shared<Gt911Touch>(std::move(configuration));
|
||||
}
|
||||
|
||||
void YellowDisplay::setBacklightDuty(uint8_t backlightDuty) {
|
||||
if (!isBacklightInitialized) {
|
||||
tt_check(initBacklight());
|
||||
isBacklightInitialized = true;
|
||||
}
|
||||
|
||||
if (!setBacklight(backlightDuty)) {
|
||||
TT_LOG_E(TAG, "Failed to configure display backlight");
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
|
||||
return std::make_shared<YellowDisplay>();
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
#pragma once
|
||||
|
||||
#include "Tactility/hal/display/DisplayDevice.h"
|
||||
#include <esp_lcd_types.h>
|
||||
#include <lvgl.h>
|
||||
|
||||
class YellowDisplay : public tt::hal::display::DisplayDevice {
|
||||
|
||||
private:
|
||||
|
||||
esp_lcd_panel_io_handle_t ioHandle = nullptr;
|
||||
esp_lcd_panel_handle_t panelHandle = nullptr;
|
||||
lv_display_t* displayHandle = nullptr;
|
||||
|
||||
public:
|
||||
|
||||
std::string getName() const final { return "ST7262"; }
|
||||
std::string getDescription() const final { return "RGB Display"; }
|
||||
|
||||
bool start() override;
|
||||
|
||||
bool stop() override;
|
||||
|
||||
std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
|
||||
|
||||
void setBacklightDuty(uint8_t backlightDuty) override;
|
||||
bool supportsBacklightDuty() const override { return true; }
|
||||
|
||||
lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
|
||||
};
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
|
||||
@@ -0,0 +1,42 @@
|
||||
#pragma once
|
||||
|
||||
// Display backlight (PWM)
|
||||
#define CYD8048S043_LCD_BACKLIGHT_LEDC_TIMER LEDC_TIMER_0
|
||||
#define CYD8048S043_LCD_BACKLIGHT_LEDC_MODE LEDC_LOW_SPEED_MODE
|
||||
#define CYD8048S043_LCD_BACKLIGHT_LEDC_CHANNEL LEDC_CHANNEL_0
|
||||
#define CYD8048S043_LCD_BACKLIGHT_LEDC_DUTY_RES LEDC_TIMER_8_BIT
|
||||
#define CYD8048S043_LCD_BACKLIGHT_LEDC_FREQUENCY (1000)
|
||||
|
||||
#define CYD8048S043_LCD_PIN_BACKLIGHT GPIO_NUM_2
|
||||
|
||||
// Display pins
|
||||
#define CYD8048S043_LCD_PIN_HSYNC GPIO_NUM_39 // HSYNC
|
||||
#define CYD8048S043_LCD_PIN_VSYNC GPIO_NUM_41 // VSYNC
|
||||
#define CYD8048S043_LCD_PIN_DE GPIO_NUM_40 // DE
|
||||
#define CYD8048S043_LCD_PIN_PCLK GPIO_NUM_42 // DCLK
|
||||
|
||||
#define CYD8048S043_LCD_PIN_DATA0 GPIO_NUM_8 // B3
|
||||
#define CYD8048S043_LCD_PIN_DATA1 GPIO_NUM_3 // B4
|
||||
#define CYD8048S043_LCD_PIN_DATA2 GPIO_NUM_46 // B5
|
||||
#define CYD8048S043_LCD_PIN_DATA3 GPIO_NUM_9 // B6
|
||||
#define CYD8048S043_LCD_PIN_DATA4 GPIO_NUM_1 // B7
|
||||
|
||||
#define CYD8048S043_LCD_PIN_DATA5 GPIO_NUM_5 // G2
|
||||
#define CYD8048S043_LCD_PIN_DATA6 GPIO_NUM_6 // G3
|
||||
#define CYD8048S043_LCD_PIN_DATA7 GPIO_NUM_7 // G4
|
||||
#define CYD8048S043_LCD_PIN_DATA8 GPIO_NUM_15 // G5
|
||||
#define CYD8048S043_LCD_PIN_DATA9 GPIO_NUM_16 // G6
|
||||
#define CYD8048S043_LCD_PIN_DATA10 GPIO_NUM_4 // G7
|
||||
|
||||
#define CYD8048S043_LCD_PIN_DATA11 GPIO_NUM_45 // R3
|
||||
#define CYD8048S043_LCD_PIN_DATA12 GPIO_NUM_48 // R4
|
||||
#define CYD8048S043_LCD_PIN_DATA13 GPIO_NUM_47 // R5
|
||||
#define CYD8048S043_LCD_PIN_DATA14 GPIO_NUM_21 // R6
|
||||
#define CYD8048S043_LCD_PIN_DATA15 GPIO_NUM_14 // R7
|
||||
|
||||
#define CYD8048S043_LCD_PIN_DISP_EN GPIO_NUM_NC // not connected
|
||||
|
||||
// Display
|
||||
#define CYD8048S043_LCD_HORIZONTAL_RESOLUTION 800
|
||||
#define CYD8048S043_LCD_VERTICAL_RESOLUTION 480
|
||||
#define CYD8048S043_LCD_DRAW_BUFFER_SIZE (CYD8048S043_LCD_HORIZONTAL_RESOLUTION * CYD8048S043_LCD_VERTICAL_RESOLUTION)
|
||||
@@ -0,0 +1,31 @@
|
||||
#include "YellowSdCard.h"
|
||||
|
||||
#define TAG "cyd8048s043c_sdcard"
|
||||
|
||||
#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
|
||||
#define SDCARD_SPI_HOST SPI2_HOST
|
||||
#define SDCARD_PIN_CS GPIO_NUM_10
|
||||
|
||||
using tt::hal::sdcard::SpiSdCardDevice;
|
||||
|
||||
std::shared_ptr<SdCardDevice> createYellowSdCard() {
|
||||
auto* configuration = new SpiSdCardDevice::Config(
|
||||
SDCARD_PIN_CS,
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
SdCardDevice::MountBehaviour::AtBoot,
|
||||
std::make_shared<tt::Mutex>(),
|
||||
std::vector<gpio_num_t>(),
|
||||
SDCARD_SPI_HOST
|
||||
);
|
||||
|
||||
auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
|
||||
std::unique_ptr<SpiSdCardDevice::Config>(configuration)
|
||||
);
|
||||
|
||||
return std::shared_ptr<SdCardDevice>(sdcard);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "Tactility/hal/sdcard/SdCardDevice.h"
|
||||
|
||||
using tt::hal::sdcard::SdCardDevice;
|
||||
|
||||
std::shared_ptr<SdCardDevice> createYellowSdCard();
|
||||
|
||||
Reference in New Issue
Block a user