Merge develop into main (#361)
This commit is contained in:
Ken Van Hoeylandt
committed by
GitHub
GitHub
parent
5777a1381b
commit
2cb413c3d1
@@ -0,0 +1,28 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
file(GLOB_RECURSE SOURCE_FILES "Source/*.c*")
|
||||
|
||||
if (DEFINED ENV{ESP_IDF_VERSION})
|
||||
# Read board id/project
|
||||
include("../Buildscripts/board.cmake")
|
||||
init_tactility_globals("../sdkconfig")
|
||||
get_property(TACTILITY_BOARD_PROJECT GLOBAL PROPERTY TACTILITY_BOARD_PROJECT)
|
||||
|
||||
idf_component_register(
|
||||
SRCS ${SOURCE_FILES}
|
||||
REQUIRES ${BOARD_COMPONENTS}
|
||||
REQUIRES Tactility TactilityC ${TACTILITY_BOARD_PROJECT}
|
||||
)
|
||||
else ()
|
||||
|
||||
add_executable(AppSim ${SOURCE_FILES})
|
||||
target_link_libraries(AppSim
|
||||
PRIVATE Tactility
|
||||
PRIVATE TactilityCore
|
||||
PRIVATE Simulator
|
||||
PRIVATE SDL2::SDL2-static SDL2-static
|
||||
)
|
||||
|
||||
add_definitions(-D_Nullable=)
|
||||
add_definitions(-D_Nonnull=)
|
||||
endif ()
|
||||
@@ -0,0 +1,74 @@
|
||||
# Kconfig file for Tactility example app
|
||||
menu "Tactility App"
|
||||
config TT_BOARD_NAME
|
||||
string "Board Name"
|
||||
default ""
|
||||
config TT_BOARD_ID
|
||||
string "Board ID"
|
||||
default ""
|
||||
choice
|
||||
prompt "Board"
|
||||
default TT_BOARD_CUSTOM
|
||||
config TT_BOARD_CUSTOM
|
||||
bool "Custom"
|
||||
config TT_BOARD_CYD_2432S024C
|
||||
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
|
||||
bool "CYD 8048S043C"
|
||||
config TT_BOARD_CYD_JC2432W328C
|
||||
bool "CYD JC2432W328C"
|
||||
config TT_BOARD_CYD_JC8048W550C
|
||||
bool "CYD JC8048W550C"
|
||||
config TT_BOARD_CYD_4848S040C
|
||||
bool "CYD 4848S040C"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_28
|
||||
bool "Elecrow CrowPanel Advance 2.8"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_35
|
||||
bool "Elecrow CrowPanel Advance 3.5"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_ADVANCE_50
|
||||
bool "Elecrow CrowPanel Advance 5.0"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_BASIC_28
|
||||
bool "Elecrow CrowPanel Basic 2.8"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_BASIC_35
|
||||
bool "Elecrow CrowPanel Basic 3.5"
|
||||
config TT_BOARD_ELECROW_CROWPANEL_BASIC_50
|
||||
bool "Elecrow CrowPanel Basic 5.0"
|
||||
config TT_BOARD_LILYGO_TDECK
|
||||
bool "LilyGo T-Deck"
|
||||
config TT_BOARD_LILYGO_TLORA_PAGER
|
||||
bool "LilyGo T-Lora Pager"
|
||||
config TT_BOARD_M5STACK_CARDPUTER
|
||||
bool "M5Stack Cardputer"
|
||||
config TT_BOARD_M5STACK_CORE2
|
||||
bool "M5Stack Core2"
|
||||
config TT_BOARD_M5STACK_CORES3
|
||||
bool "M5Stack CoreS3"
|
||||
config TT_BOARD_UNPHONE
|
||||
bool "unPhone"
|
||||
config TT_BOARD_WAVESHARE_S3_TOUCH_43
|
||||
bool "Waveshare ESP32 S3 Touch LCD 4.3"
|
||||
config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147
|
||||
bool "Waveshare ESP32 S3 Touch LCD 1.47"
|
||||
config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128
|
||||
bool "Waveshare ESP32 S3 Touch LCD 1.28"
|
||||
config TT_BOARD_WAVESHARE_S3_LCD_13
|
||||
bool "Waveshare ESP32 S3 LCD 1.3"
|
||||
help
|
||||
Select a board/hardware configuration.
|
||||
Use TT_BOARD_CUSTOM if you will manually configure the board in your project.
|
||||
endchoice
|
||||
|
||||
config TT_SPLASH_DURATION
|
||||
int "Splash Duration (ms)"
|
||||
default 1000
|
||||
range 0 3000
|
||||
help
|
||||
The minimum time to show the splash screen in milliseconds.
|
||||
When set to 0, startup will continue to desktop as soon as boot operations are finished.
|
||||
endmenu
|
||||
@@ -0,0 +1,92 @@
|
||||
#pragma once
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include <sdkconfig.h>
|
||||
|
||||
// Supported hardware:
|
||||
#if defined(CONFIG_TT_BOARD_LILYGO_TDECK)
|
||||
#include "LilygoTdeck.h"
|
||||
#define TT_BOARD_HARDWARE &lilygo_tdeck
|
||||
#elif defined(CONFIG_TT_BOARD_LILYGO_TLORA_PAGER)
|
||||
#include "LilygoTloraPager.h"
|
||||
#define TT_BOARD_HARDWARE &lilygo_tlora_pager
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_2432S024C)
|
||||
#include "CYD2432S024C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_2432s024c_config
|
||||
#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
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_28))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_advance_28
|
||||
#include "CrowPanelAdvance28.h"
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_35))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_advance_35
|
||||
#include "CrowPanelAdvance35.h"
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_50))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_advance_50
|
||||
#include "CrowPanelAdvance50.h"
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_28))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_basic_28
|
||||
#include "CrowPanelBasic28.h"
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_35))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_basic_35
|
||||
#include "CrowPanelBasic35.h"
|
||||
#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_50))
|
||||
#define TT_BOARD_HARDWARE &crowpanel_basic_50
|
||||
#include "CrowPanelBasic50.h"
|
||||
#elif defined(CONFIG_TT_BOARD_M5STACK_CARDPUTER)
|
||||
#include "M5stackCardputer.h"
|
||||
#define TT_BOARD_HARDWARE &m5stack_cardputer
|
||||
#elif defined(CONFIG_TT_BOARD_M5STACK_CORE2)
|
||||
#include "M5stackCore2.h"
|
||||
#define TT_BOARD_HARDWARE &m5stack_core2
|
||||
#elif defined(CONFIG_TT_BOARD_M5STACK_CORES3)
|
||||
#include "M5stackCoreS3.h"
|
||||
#define TT_BOARD_HARDWARE &m5stack_cores3
|
||||
#elif defined(CONFIG_TT_BOARD_UNPHONE)
|
||||
#include "UnPhone.h"
|
||||
#define TT_BOARD_HARDWARE &unPhone
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_JC2432W328C)
|
||||
#include "JC2432W328C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_jc2432w328c_config
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_8048S043C)
|
||||
#include "CYD8048S043C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_8048s043c_config
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_JC8048W550C)
|
||||
#include "JC8048W550C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_jc8048w550c_config
|
||||
#elif defined(CONFIG_TT_BOARD_CYD_4848S040C)
|
||||
#include "CYD4848S040C.h"
|
||||
#define TT_BOARD_HARDWARE &cyd_4848s040c_config
|
||||
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_43)
|
||||
#include "WaveshareS3Touch43.h"
|
||||
#define TT_BOARD_HARDWARE &waveshare_s3_touch_43
|
||||
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147)
|
||||
#include "WaveshareS3TouchLcd147.h"
|
||||
#define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_147
|
||||
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128)
|
||||
#include "WaveshareS3TouchLcd128.h"
|
||||
#define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_128
|
||||
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_LCD_13)
|
||||
#include "WaveshareS3Lcd13.h"
|
||||
#define TT_BOARD_HARDWARE &waveshare_s3_lcd_13
|
||||
#else
|
||||
#define TT_BOARD_HARDWARE NULL
|
||||
#error Replace TT_BOARD_HARDWARE in main.c with your own. Or copy one of the ./sdkconfig.board.* files into ./sdkconfig.
|
||||
#endif
|
||||
|
||||
#else // else simulator
|
||||
|
||||
#include "Simulator.h"
|
||||
|
||||
extern tt::hal::Configuration hardware;
|
||||
#define TT_BOARD_HARDWARE &hardware
|
||||
|
||||
#endif // ESP_PLATFORM
|
||||
@@ -0,0 +1,28 @@
|
||||
#include "Boards.h"
|
||||
#include <Tactility/Tactility.h>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include "tt_init.h"
|
||||
#endif
|
||||
|
||||
extern const tt::app::AppManifest hello_world_app;
|
||||
|
||||
extern "C" {
|
||||
|
||||
void app_main() {
|
||||
static const tt::Configuration config = {
|
||||
/**
|
||||
* Auto-select a board based on the ./sdkconfig.board.* file
|
||||
* that you copied to ./sdkconfig before you opened this project.
|
||||
*/
|
||||
.hardware = TT_BOARD_HARDWARE
|
||||
};
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
tt_init_tactility_c(); // ELF bindings for side-loading on ESP32
|
||||
#endif
|
||||
|
||||
tt::run(config);
|
||||
}
|
||||
|
||||
} // extern
|
||||
@@ -0,0 +1,23 @@
|
||||
dependencies:
|
||||
espressif/esp_lcd_ili9341: "2.0.1"
|
||||
atanisoft/esp_lcd_ili9488: "1.0.10"
|
||||
espressif/esp_lcd_touch: "1.1.2"
|
||||
atanisoft/esp_lcd_touch_xpt2046: "1.0.5"
|
||||
espressif/esp_lcd_touch_cst816s: "1.0.3"
|
||||
espressif/esp_lcd_touch_gt911: "1.1.3"
|
||||
espressif/esp_lcd_touch_ft5x06: "1.0.6~1"
|
||||
espressif/esp_io_expander: "1.0.1"
|
||||
espressif/esp_io_expander_tca95xx_16bit: "1.0.1"
|
||||
espressif/esp_lcd_st7701:
|
||||
version: "1.1.3"
|
||||
rules:
|
||||
- if: "target in [esp32s3, esp32p4]"
|
||||
espressif/esp_lcd_st7796:
|
||||
version: "1.3.4"
|
||||
espressif/esp_lcd_gc9a01: "2.0.3"
|
||||
espressif/esp_lcd_panel_io_additions: "1.0.1"
|
||||
espressif/esp_tinyusb:
|
||||
version: "1.7.6~1"
|
||||
rules:
|
||||
- if: "target == esp32s3"
|
||||
idf: '5.5'
|
||||
Reference in New Issue
Block a user