mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-22 08:25:06 +00:00
Compare commits
6 Commits
ebf9a81395
...
4c5b0b8b99
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c5b0b8b99 | ||
|
|
ea070784fc | ||
|
|
230f082460 | ||
|
|
81322b4e02 | ||
|
|
25a39e5bc6 | ||
|
|
e1dc59098e |
11
.github/workflows/build-firmware.yml
vendored
11
.github/workflows/build-firmware.yml
vendored
@ -27,15 +27,6 @@ jobs:
|
||||
with:
|
||||
board_id: cyd-2432s028r
|
||||
arch: esp32
|
||||
cyd-e32r28t:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: "Build"
|
||||
uses: ./.github/actions/build-firmware
|
||||
with:
|
||||
board_id: cyd-e32r28t
|
||||
arch: esp32
|
||||
cyd-2432s032c:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@ -188,4 +179,4 @@ jobs:
|
||||
uses: ./.github/actions/build-firmware
|
||||
with:
|
||||
board_id: waveshare-s3-touch-43
|
||||
arch: esp32s3
|
||||
arch: esp32s3
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,7 +7,6 @@ build-sim/
|
||||
cmake-build-*/
|
||||
CMakeCache.txt
|
||||
*.cbp
|
||||
CMakeFiles
|
||||
|
||||
release/
|
||||
|
||||
@ -18,5 +17,4 @@ managed_components/
|
||||
dependencies.lock
|
||||
|
||||
.vscode/
|
||||
.gitpod.yml
|
||||
|
||||
|
||||
@ -25,4 +25,4 @@ else ()
|
||||
|
||||
add_definitions(-D_Nullable=)
|
||||
add_definitions(-D_Nonnull=)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@ -15,8 +15,6 @@ menu "Tactility App"
|
||||
bool "CYD 2432S024C"
|
||||
config TT_BOARD_CYD_2432S028R
|
||||
bool "CYD 2432S028R"
|
||||
config TT_BOARD_CYD_E32R28T
|
||||
bool "CYD E32R28T"
|
||||
config TT_BOARD_CYD_2432S032C
|
||||
bool "CYD 2432S032C"
|
||||
config TT_BOARD_CYD_8048S043C
|
||||
|
||||
@ -17,9 +17,6 @@
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_2432S028R)
|
||||
#include "CYD2432S028R.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_2432s028r_config
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_E32R28T)
|
||||
#include "E32R28T.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_e32r28t_config
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_2432S032C)
|
||||
#include "CYD2432S032C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_2432S032c_config
|
||||
|
||||
@ -28,4 +28,4 @@ void app_main() {
|
||||
tt::run(config);
|
||||
}
|
||||
|
||||
} // extern
|
||||
} // extern
|
||||
|
||||
@ -2,5 +2,5 @@
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
// Resistive touch version of the 2.8" yellow board
|
||||
// Resitive touch version of the 2.8" yellow board
|
||||
extern const tt::hal::Configuration cyd_2432s028r_config;
|
||||
|
||||
@ -32,7 +32,4 @@ public:
|
||||
void setBacklightDuty(uint8_t backlightDuty) override;
|
||||
|
||||
bool supportsBacklightDuty() const override { return true; }
|
||||
|
||||
// TODO: Find out why it crashes
|
||||
bool supportsDisplayDriver() const override { return false; }
|
||||
};
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
|
||||
|
||||
idf_component_register(
|
||||
SRCS ${SOURCE_FILES}
|
||||
INCLUDE_DIRS "Source"
|
||||
REQUIRES Tactility esp_lvgl_port ILI934x XPT2046SoftSPI PwmBacklight driver vfs fatfs
|
||||
)
|
||||
@ -1,73 +0,0 @@
|
||||
#include "E32R28T.h"
|
||||
#include "devices/SdCard.h"
|
||||
#include "devices/Display.h"
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <PwmBacklight.h>
|
||||
|
||||
#define CYD_SPI_TRANSFER_SIZE_LIMIT (240 * 320 / 4 * 2)
|
||||
|
||||
static bool initBoot() {
|
||||
return driver::pwmbacklight::init(CYD_BACKLIGHT_PIN);
|
||||
}
|
||||
|
||||
static tt::hal::DeviceVector createDevices() {
|
||||
return {
|
||||
createDisplay(),
|
||||
createSdCard()
|
||||
};
|
||||
}
|
||||
|
||||
const tt::hal::Configuration cyd_e32r28t_config = {
|
||||
.initBoot = initBoot,
|
||||
.createDevices = createDevices,
|
||||
.i2c = {},
|
||||
.spi = {
|
||||
tt::hal::spi::Configuration {
|
||||
.device = SPI2_HOST,
|
||||
.dma = SPI_DMA_CH_AUTO,
|
||||
.config = {
|
||||
.mosi_io_num = GPIO_NUM_13,
|
||||
.miso_io_num = GPIO_NUM_12,
|
||||
.sclk_io_num = GPIO_NUM_14,
|
||||
.quadwp_io_num = GPIO_NUM_NC,
|
||||
.quadhd_io_num = GPIO_NUM_NC,
|
||||
.data4_io_num = GPIO_NUM_NC,
|
||||
.data5_io_num = GPIO_NUM_NC,
|
||||
.data6_io_num = GPIO_NUM_NC,
|
||||
.data7_io_num = GPIO_NUM_NC,
|
||||
.data_io_default_level = false,
|
||||
.max_transfer_sz = CYD_SPI_TRANSFER_SIZE_LIMIT,
|
||||
.flags = 0,
|
||||
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
.intr_flags = 0
|
||||
},
|
||||
.initMode = tt::hal::spi::InitMode::ByTactility,
|
||||
.isMutable = false,
|
||||
.lock = tt::lvgl::getSyncLock()
|
||||
},
|
||||
tt::hal::spi::Configuration {
|
||||
.device = SPI3_HOST,
|
||||
.dma = SPI_DMA_CH_AUTO,
|
||||
.config = {
|
||||
.mosi_io_num = GPIO_NUM_23,
|
||||
.miso_io_num = GPIO_NUM_19,
|
||||
.sclk_io_num = GPIO_NUM_18,
|
||||
.quadwp_io_num = GPIO_NUM_NC,
|
||||
.quadhd_io_num = GPIO_NUM_NC,
|
||||
.data4_io_num = GPIO_NUM_NC,
|
||||
.data5_io_num = GPIO_NUM_NC,
|
||||
.data6_io_num = GPIO_NUM_NC,
|
||||
.data7_io_num = GPIO_NUM_NC,
|
||||
.data_io_default_level = false,
|
||||
.max_transfer_sz = CYD_SPI_TRANSFER_SIZE_LIMIT,
|
||||
.flags = 0,
|
||||
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
.intr_flags = 0
|
||||
},
|
||||
.initMode = tt::hal::spi::InitMode::ByTactility,
|
||||
.isMutable = false,
|
||||
.lock = tt::lvgl::getSyncLock()
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
@ -1,6 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
// Resistive touch version of the waveshare 2.8" yellow board
|
||||
extern const tt::hal::Configuration cyd_e32r28t_config;
|
||||
@ -1,41 +0,0 @@
|
||||
#include "Display.h"
|
||||
|
||||
#include <Xpt2046SoftSpi.h>
|
||||
#include <Ili934xDisplay.h>
|
||||
#include <PwmBacklight.h>
|
||||
#include <Tactility/hal/touch/TouchDevice.h>
|
||||
|
||||
static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
|
||||
auto config = std::make_unique<Xpt2046SoftSpi::Configuration>(
|
||||
CYD_TOUCH_MOSI_PIN,
|
||||
CYD_TOUCH_MISO_PIN,
|
||||
CYD_TOUCH_SCK_PIN,
|
||||
CYD_TOUCH_CS_PIN,
|
||||
CYD_DISPLAY_HORIZONTAL_RESOLUTION,
|
||||
CYD_DISPLAY_VERTICAL_RESOLUTION,
|
||||
false,
|
||||
true,
|
||||
false
|
||||
);
|
||||
|
||||
return std::make_shared<Xpt2046SoftSpi>(std::move(config));
|
||||
}
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
|
||||
auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
|
||||
CYD_DISPLAY_SPI_HOST,
|
||||
CYD_DISPLAY_PIN_CS,
|
||||
CYD_DISPLAY_PIN_DC,
|
||||
CYD_DISPLAY_HORIZONTAL_RESOLUTION,
|
||||
CYD_DISPLAY_VERTICAL_RESOLUTION,
|
||||
createTouch(),
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
0,
|
||||
LCD_RGB_ELEMENT_ORDER_BGR
|
||||
);
|
||||
configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
|
||||
return std::make_shared<Ili934xDisplay>(std::move(configuration));
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/display/DisplayDevice.h>
|
||||
#include <memory>
|
||||
|
||||
// Display
|
||||
#define CYD_DISPLAY_SPI_HOST SPI2_HOST
|
||||
#define CYD_DISPLAY_PIN_CS GPIO_NUM_15
|
||||
#define CYD_DISPLAY_PIN_DC GPIO_NUM_2
|
||||
#define CYD_DISPLAY_HORIZONTAL_RESOLUTION 240
|
||||
#define CYD_DISPLAY_VERTICAL_RESOLUTION 320
|
||||
#define CYD_DISPLAY_DRAW_BUFFER_HEIGHT (CYD_DISPLAY_VERTICAL_RESOLUTION / 10)
|
||||
#define CYD_DISPLAY_DRAW_BUFFER_SIZE (CYD_DISPLAY_HORIZONTAL_RESOLUTION * CYD_DISPLAY_DRAW_BUFFER_HEIGHT)
|
||||
|
||||
// Touch (Software SPI)
|
||||
#define CYD_TOUCH_MISO_PIN GPIO_NUM_39
|
||||
#define CYD_TOUCH_MOSI_PIN GPIO_NUM_32
|
||||
#define CYD_TOUCH_SCK_PIN GPIO_NUM_25
|
||||
#define CYD_TOUCH_CS_PIN GPIO_NUM_33
|
||||
#define CYD_TOUCH_IRQ_PIN GPIO_NUM_36
|
||||
|
||||
// Backlight
|
||||
#define CYD_BACKLIGHT_PIN GPIO_NUM_21
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
|
||||
@ -1,21 +0,0 @@
|
||||
#include "SdCard.h"
|
||||
#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
|
||||
|
||||
using tt::hal::sdcard::SpiSdCardDevice;
|
||||
|
||||
std::shared_ptr<SdCardDevice> createSdCard() {
|
||||
auto configuration = std::make_unique<SpiSdCardDevice::Config>(
|
||||
GPIO_NUM_5,
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
GPIO_NUM_NC,
|
||||
SdCardDevice::MountBehaviour::AtBoot,
|
||||
std::make_shared<tt::Mutex>(),
|
||||
std::vector<gpio_num_t>(),
|
||||
SPI3_HOST
|
||||
);
|
||||
|
||||
return std::make_shared<SpiSdCardDevice>(
|
||||
std::move(configuration)
|
||||
);
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
||||
|
||||
using tt::hal::sdcard::SdCardDevice;
|
||||
|
||||
std::shared_ptr<SdCardDevice> createSdCard();
|
||||
0
Buildscripts/Flashing/flash.ps1
Executable file → Normal file
0
Buildscripts/Flashing/flash.ps1
Executable file → Normal file
@ -24,9 +24,7 @@ function(INIT_TACTILITY_GLOBALS SDKCONFIG_FILE)
|
||||
if (board_id STREQUAL "cyd-2432s024c")
|
||||
set(TACTILITY_BOARD_PROJECT CYD-2432S024C)
|
||||
elseif (board_id STREQUAL "cyd-2432s028r")
|
||||
set(TACTILITY_BOARD_PROJECT CYD-2432S028R)
|
||||
elseif (board_id STREQUAL "cyd-e32r28t")
|
||||
set(TACTILITY_BOARD_PROJECT CYD-E32R28T)
|
||||
set(TACTILITY_BOARD_PROJECT CYD-2432S028R)
|
||||
elseif (board_id STREQUAL "cyd-2432s032c")
|
||||
set(TACTILITY_BOARD_PROJECT CYD-2432S032C)
|
||||
elseif (board_id STREQUAL "cyd-4848s040c")
|
||||
|
||||
0
Buildscripts/build.ps1
Executable file → Normal file
0
Buildscripts/build.ps1
Executable file → Normal file
0
Buildscripts/release.ps1
Executable file → Normal file
0
Buildscripts/release.ps1
Executable file → Normal file
@ -8,7 +8,7 @@
|
||||
#include <esp_lvgl_port_disp.h>
|
||||
#include <Tactility/Check.h>
|
||||
|
||||
class EspLcdDisplay : public tt::hal::display::DisplayDevice {
|
||||
class EspLcdDisplay : tt::hal::display::DisplayDevice {
|
||||
|
||||
esp_lcd_panel_io_handle_t _Nullable ioHandle = nullptr;
|
||||
esp_lcd_panel_handle_t _Nullable panelHandle = nullptr;
|
||||
@ -58,7 +58,8 @@ public:
|
||||
|
||||
// region DisplayDriver
|
||||
|
||||
bool supportsDisplayDriver() const override { return true; }
|
||||
// TODO: Find out why it crashes
|
||||
bool supportsDisplayDriver() const override { return false; }
|
||||
|
||||
/** @return a NativeDisplay instance if this device supports it */
|
||||
std::shared_ptr<tt::hal::display::DisplayDriver> _Nullable getDisplayDriver() final;
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
# Software defaults
|
||||
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3072
|
||||
CONFIG_LV_FONT_MONTSERRAT_14=y
|
||||
CONFIG_LV_FONT_MONTSERRAT_18=y
|
||||
CONFIG_LV_USE_USER_DATA=y
|
||||
CONFIG_LV_USE_FS_STDIO=y
|
||||
CONFIG_LV_FS_STDIO_LETTER=65
|
||||
CONFIG_LV_FS_STDIO_PATH=""
|
||||
CONFIG_LV_FS_STDIO_CACHE_SIZE=4096
|
||||
CONFIG_LV_USE_LODEPNG=y
|
||||
CONFIG_LV_USE_BUILTIN_MALLOC=n
|
||||
CONFIG_LV_USE_CLIB_MALLOC=y
|
||||
CONFIG_LV_USE_MSGBOX=n
|
||||
CONFIG_LV_USE_SPINNER=n
|
||||
CONFIG_LV_USE_WIN=n
|
||||
CONFIG_LV_USE_SNAPSHOT=y
|
||||
CONFIG_FREERTOS_HZ=1000
|
||||
CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
|
||||
CONFIG_FREERTOS_SMP=n
|
||||
CONFIG_FREERTOS_UNICORE=n
|
||||
CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
|
||||
CONFIG_FREERTOS_USE_TRACE_FACILITY=y
|
||||
CONFIG_PARTITION_TABLE_CUSTOM=y
|
||||
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
|
||||
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
|
||||
CONFIG_FATFS_LFN_HEAP=y
|
||||
CONFIG_FATFS_VOLUME_COUNT=3
|
||||
|
||||
# Hardware: Main
|
||||
CONFIG_TT_BOARD_CYD_E32R28T=y
|
||||
CONFIG_TT_BOARD_NAME="CYD E32R28T"
|
||||
CONFIG_TT_BOARD_ID="cyd-e32r28t"
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
|
||||
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
|
||||
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
|
||||
CONFIG_FLASHMODE_QIO=y
|
||||
|
||||
# LVGL
|
||||
CONFIG_LV_DISP_DEF_REFR_PERIOD=10
|
||||
CONFIG_LV_DPI_DEF=130 # Adjusted for 2.8" 240x320 (~130 DPI)
|
||||
CONFIG_LVGL_BUFFER_WIDTH=240
|
||||
CONFIG_LVGL_BUFFER_HEIGHT=40
|
||||
CONFIG_LVGL_COLOR_DEPTH=16
|
||||
|
||||
# Drivers
|
||||
CONFIG_DISPLAY_DRIVER_ILI9341=y
|
||||
CONFIG_TOUCH_DRIVER_XPT2046=y
|
||||
CONFIG_TOUCH_CALIBRATION=y
|
||||
CONFIG_SD_CARD_ENABLE=y
|
||||
|
||||
# Fix for IRAM
|
||||
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
|
||||
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
|
||||
CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
|
||||
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
|
||||
Loading…
x
Reference in New Issue
Block a user