diff --git a/variants/heltec_t096/target.h b/variants/heltec_t096/target.h index a71aeda16..c99361596 100644 --- a/variants/heltec_t096/target.h +++ b/variants/heltec_t096/target.h @@ -12,9 +12,9 @@ #ifdef DISPLAY_CLASS #include #include +#include #else #include "helpers/ui/NullDisplayDriver.h" -#include #endif extern T096Board board; diff --git a/variants/heltec_t1/target.h b/variants/heltec_t1/target.h index 57ead9c04..6cf78c37b 100644 --- a/variants/heltec_t1/target.h +++ b/variants/heltec_t1/target.h @@ -12,9 +12,9 @@ #ifdef DISPLAY_CLASS #include #include +#include #else #include "helpers/ui/NullDisplayDriver.h" -#include #endif extern T1Board board; diff --git a/variants/lilygo_t3_stm32/platformio.ini b/variants/lilygo_t3_stm32/platformio.ini index 33ca0b405..e17fb96d7 100644 --- a/variants/lilygo_t3_stm32/platformio.ini +++ b/variants/lilygo_t3_stm32/platformio.ini @@ -26,17 +26,20 @@ build_flags = ${stm32_base.build_flags} build_src_filter = ${stm32_base.build_src_filter} +<../variants/lilygo_t3_stm32> + + + lib_deps = ${stm32_base.lib_deps} adafruit/Adafruit SSD1306 @ ^2.5.13 [env:LilyGo_T3_STM32_repeater] extends = lilygo_t3_stm32 build_flags = ${lilygo_t3_stm32.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"T3 STM32 Repeater"' -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${lilygo_t3_stm32.build_src_filter} +<../examples/simple_repeater/*.cpp> + + [env:LilyGo_T3_STM32_companion_radio_usb] extends = lilygo_t3_stm32 diff --git a/variants/lilygo_t3_stm32/target.cpp b/variants/lilygo_t3_stm32/target.cpp index b7a14c482..5b6b822a9 100644 --- a/variants/lilygo_t3_stm32/target.cpp +++ b/variants/lilygo_t3_stm32/target.cpp @@ -17,6 +17,7 @@ SensorManager sensors; DISPLAY_CLASS display; // PH3 is also BOOT0: the board's button is active high with an external pull-down. MomentaryButton user_btn(PIN_USER_BTN, 1000, false); +UITask ui_task(&board, &display); static const uint32_t rfswitch_pins[] = { PB2, PB6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC diff --git a/variants/lilygo_t3_stm32/target.h b/variants/lilygo_t3_stm32/target.h index 2db3173bb..597ea800b 100644 --- a/variants/lilygo_t3_stm32/target.h +++ b/variants/lilygo_t3_stm32/target.h @@ -11,6 +11,7 @@ #endif #include #include +#include class LilyGoT3STM32Board : public STM32Board { public: @@ -31,6 +32,7 @@ extern SensorManager sensors; #endif extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; bool radio_init(); mesh::LocalIdentity radio_new_identity(); diff --git a/variants/muzi_base/target.h b/variants/muzi_base/target.h index 6914b1fb7..ca644ae6f 100644 --- a/variants/muzi_base/target.h +++ b/variants/muzi_base/target.h @@ -26,6 +26,8 @@ extern MomentaryButton joystick_left; extern MomentaryButton joystick_right; extern MomentaryButton back_btn; + #include + extern UITask ui_task; #elif defined(DISPLAY_CLASS) #include "helpers/ui/NullDisplayDriver.h" extern DISPLAY_CLASS display;