Hal refactored (#99)
This commit is contained in:
committed by
GitHub
parent
0188ce721c
commit
33bb742dfb
@@ -10,12 +10,10 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
||||
)
|
||||
endif()
|
||||
|
||||
# T-Deck is an S3 platform
|
||||
if("${IDF_TARGET}" STREQUAL "esp32s3")
|
||||
list(APPEND BOARD_COMPONENTS
|
||||
LilygoTdeck
|
||||
M5stackCoreS3
|
||||
WaveshareS3Touch
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@ menu "Tactility App"
|
||||
bool "M5Stack Core2"
|
||||
config TT_BOARD_M5STACK_CORES3
|
||||
bool "M5Stack CoreS3"
|
||||
config TT_BOARD_WAVESHARE_S3_TOUCH
|
||||
bool "Waveshare S3 Touch LCD 4.3\""
|
||||
help
|
||||
Select a board/hardware configuration.
|
||||
Use TT_BOARD_CUSTOM if you will manually configure the board in your project.
|
||||
|
||||
+4
-18
@@ -5,10 +5,10 @@
|
||||
|
||||
// Supported hardware:
|
||||
#if defined(CONFIG_TT_BOARD_LILYGO_TDECK)
|
||||
#include "lilygo_tdeck.h"
|
||||
#include "LilygoTdeck.h"
|
||||
#define TT_BOARD_HARDWARE &lilygo_tdeck
|
||||
#elif defined(CONFIG_TT_BOARD_YELLOW_BOARD_24_CAP)
|
||||
#include "yellow_board.h"
|
||||
#include "YellowBoard.h"
|
||||
#define TT_BOARD_HARDWARE &yellow_board_24inch_cap
|
||||
#elif defined(CONFIG_TT_BOARD_M5STACK_CORE2)
|
||||
#include "M5stackCore2.h"
|
||||
@@ -16,9 +16,6 @@
|
||||
#elif defined(CONFIG_TT_BOARD_M5STACK_CORES3)
|
||||
#include "M5stackCoreS3.h"
|
||||
#define TT_BOARD_HARDWARE &m5stack_cores3
|
||||
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH)
|
||||
#include "waveshare_s3_touch.h"
|
||||
#define TT_BOARD_HARDWARE &waveshare_s3_touch
|
||||
#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.
|
||||
@@ -28,18 +25,7 @@
|
||||
|
||||
#include "Simulator.h"
|
||||
|
||||
#define TT_BOARD_HARDWARE &sim_hardware
|
||||
|
||||
extern "C" {
|
||||
void app_main();
|
||||
}
|
||||
|
||||
int main_stub(); // Main function logic from Simulator board project
|
||||
|
||||
// Actual main that passes on app_main (to be executed in a FreeRTOS task) and bootstraps FreeRTOS
|
||||
int main() {
|
||||
setMainForSim(app_main);
|
||||
return main_stub();
|
||||
}
|
||||
extern tt::hal::Configuration hardware;
|
||||
#define TT_BOARD_HARDWARE &hardware
|
||||
|
||||
#endif // ESP_PLATFORM
|
||||
+1
-1
@@ -25,7 +25,7 @@ void app_main() {
|
||||
.auto_start_app_id = nullptr
|
||||
};
|
||||
|
||||
tt::init(&config);
|
||||
tt::init(config);
|
||||
|
||||
tt::service::wifi::wifi_main(nullptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user