diff --git a/variants/dfrobot_lorawan_esp32s3/platformio.ini b/variants/dfrobot_lorawan_esp32s3/platformio.ini index 0f69e2761..f7861cc34 100644 --- a/variants/dfrobot_lorawan_esp32s3/platformio.ini +++ b/variants/dfrobot_lorawan_esp32s3/platformio.ini @@ -52,7 +52,7 @@ extends = DFRobot_LoRaWAN_ESP32S3 build_flags = ${DFRobot_LoRaWAN_ESP32S3.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_ROTATION=3 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -67,7 +67,7 @@ build_src_filter = ${DFRobot_LoRaWAN_ESP32S3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${DFRobot_LoRaWAN_ESP32S3.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/dfrobot_lorawan_esp32s3/target.cpp b/variants/dfrobot_lorawan_esp32s3/target.cpp index bf7235166..e2f20359f 100644 --- a/variants/dfrobot_lorawan_esp32s3/target.cpp +++ b/variants/dfrobot_lorawan_esp32s3/target.cpp @@ -19,6 +19,7 @@ SensorManager sensors; DISPLAY_CLASS display(&board.periph_power); // Active-low button, internal pull-up. MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/dfrobot_lorawan_esp32s3/target.h b/variants/dfrobot_lorawan_esp32s3/target.h index 07cec79ba..377377434 100644 --- a/variants/dfrobot_lorawan_esp32s3/target.h +++ b/variants/dfrobot_lorawan_esp32s3/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern DFRobotLoRaBoard board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini index 1ab3d3fb1..ad95efb58 100644 --- a/variants/ebyte_eora_s3/platformio.ini +++ b/variants/ebyte_eora_s3/platformio.ini @@ -98,7 +98,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -109,7 +109,7 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,7 +118,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -132,7 +132,7 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/ebyte_eora_s3/target.cpp b/variants/ebyte_eora_s3/target.cpp index 91d851ff3..f66fc224a 100644 --- a/variants/ebyte_eora_s3/target.cpp +++ b/variants/ebyte_eora_s3/target.cpp @@ -19,6 +19,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/ebyte_eora_s3/target.h b/variants/ebyte_eora_s3/target.h index b64694f5d..6ee9d3e2c 100644 --- a/variants/ebyte_eora_s3/target.h +++ b/variants/ebyte_eora_s3/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ESP32Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini index 326e3f705..6ec90ff4f 100644 --- a/variants/gat562_30s_mesh_kit/platformio.ini +++ b/variants/gat562_30s_mesh_kit/platformio.ini @@ -70,7 +70,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -79,7 +79,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + + lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} @@ -93,7 +93,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -106,7 +106,7 @@ build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/gat562_30s_mesh_kit/target.cpp b/variants/gat562_30s_mesh_kit/target.cpp index 96e38a79e..3cbdfbb1a 100644 --- a/variants/gat562_30s_mesh_kit/target.cpp +++ b/variants/gat562_30s_mesh_kit/target.cpp @@ -15,6 +15,7 @@ GAT56230SMeshKitBoard board; MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false); MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false); MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif diff --git a/variants/gat562_30s_mesh_kit/target.h b/variants/gat562_30s_mesh_kit/target.h index d526a5d03..6cd99be49 100644 --- a/variants/gat562_30s_mesh_kit/target.h +++ b/variants/gat562_30s_mesh_kit/target.h @@ -10,12 +10,14 @@ #ifdef DISPLAY_CLASS #include + #include extern DISPLAY_CLASS display; #include extern MomentaryButton user_btn; extern MomentaryButton joystick_left; extern MomentaryButton joystick_right; extern MomentaryButton back_btn; + extern UITask ui_task; #endif extern GAT56230SMeshKitBoard board; diff --git a/variants/gat562_mesh_evb_pro/target.cpp b/variants/gat562_mesh_evb_pro/target.cpp index 0aac297a0..215bdc793 100644 --- a/variants/gat562_mesh_evb_pro/target.cpp +++ b/variants/gat562_mesh_evb_pro/target.cpp @@ -12,8 +12,8 @@ GAT562EVBProBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, false); - MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif diff --git a/variants/gat562_mesh_evb_pro/target.h b/variants/gat562_mesh_evb_pro/target.h index 9111704fc..c09d89ab7 100644 --- a/variants/gat562_mesh_evb_pro/target.h +++ b/variants/gat562_mesh_evb_pro/target.h @@ -10,11 +10,13 @@ #ifdef DISPLAY_CLASS #include + #include extern DISPLAY_CLASS display; #include extern MomentaryButton user_btn; extern MomentaryButton back_btn; + extern UITask ui_task; #endif extern GAT562EVBProBoard board; diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini index 1141cee62..1a8ea3e06 100644 --- a/variants/gat562_mesh_tracker_pro/platformio.ini +++ b/variants/gat562_mesh_tracker_pro/platformio.ini @@ -66,7 +66,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -75,7 +75,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -101,7 +101,7 @@ build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/gat562_mesh_tracker_pro/target.cpp b/variants/gat562_mesh_tracker_pro/target.cpp index 225aa1619..e2f8fa83a 100644 --- a/variants/gat562_mesh_tracker_pro/target.cpp +++ b/variants/gat562_mesh_tracker_pro/target.cpp @@ -15,6 +15,7 @@ GAT562MeshTrackerProBoard board; MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false); MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false); MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif diff --git a/variants/gat562_mesh_tracker_pro/target.h b/variants/gat562_mesh_tracker_pro/target.h index 0d3b7d76e..52b31b35f 100644 --- a/variants/gat562_mesh_tracker_pro/target.h +++ b/variants/gat562_mesh_tracker_pro/target.h @@ -10,7 +10,9 @@ #ifdef DISPLAY_CLASS #include + #include extern DISPLAY_CLASS display; + extern UITask ui_task; #include extern MomentaryButton user_btn; extern MomentaryButton joystick_left; diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini index d8ca30527..22ea721bc 100644 --- a/variants/gat562_mesh_watch13/platformio.ini +++ b/variants/gat562_mesh_watch13/platformio.ini @@ -66,7 +66,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Watch13.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -81,7 +81,7 @@ build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${GAT562_Mesh_Watch13.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/gat562_mesh_watch13/target.cpp b/variants/gat562_mesh_watch13/target.cpp index 95bcf6dc2..679a63f0e 100644 --- a/variants/gat562_mesh_watch13/target.cpp +++ b/variants/gat562_mesh_watch13/target.cpp @@ -12,6 +12,7 @@ GAT56MeshWatch13Board board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif diff --git a/variants/gat562_mesh_watch13/target.h b/variants/gat562_mesh_watch13/target.h index 9ed5cda71..412ee2118 100644 --- a/variants/gat562_mesh_watch13/target.h +++ b/variants/gat562_mesh_watch13/target.h @@ -10,6 +10,8 @@ #ifdef DISPLAY_CLASS #include + #include + extern UITask ui_task; extern DISPLAY_CLASS display; #include extern MomentaryButton user_btn; diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini index 021938190..bc9251cba 100644 --- a/variants/heltec_e213/platformio.ini +++ b/variants/heltec_e213/platformio.ini @@ -45,7 +45,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -57,7 +57,7 @@ build_src_filter = ${Heltec_E213_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -67,7 +67,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -78,7 +78,7 @@ build_src_filter = ${Heltec_E213_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_e213/target.cpp b/variants/heltec_e213/target.cpp index 6914769d9..6ec3c2b27 100644 --- a/variants/heltec_e213/target.cpp +++ b/variants/heltec_e213/target.cpp @@ -20,6 +20,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_e213/target.h b/variants/heltec_e213/target.h index 6f2c291bb..71b62813e 100644 --- a/variants/heltec_e213/target.h +++ b/variants/heltec_e213/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif extern HeltecE213Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini index c7cd5f21e..d12761f76 100644 --- a/variants/heltec_e290/platformio.ini +++ b/variants/heltec_e290/platformio.ini @@ -39,7 +39,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -51,7 +51,7 @@ build_src_filter = ${Heltec_E290_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -61,7 +61,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -72,7 +72,7 @@ build_src_filter = ${Heltec_E290_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_e290/target.cpp b/variants/heltec_e290/target.cpp index f23279548..41457ebdc 100644 --- a/variants/heltec_e290/target.cpp +++ b/variants/heltec_e290/target.cpp @@ -20,6 +20,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_e290/target.h b/variants/heltec_e290/target.h index d78521fcf..b93e03fc6 100644 --- a/variants/heltec_e290/target.h +++ b/variants/heltec_e290/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif extern HeltecE290Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp index 9e7fb04d1..315ddbd64 100644 --- a/variants/heltec_mesh_solar/target.cpp +++ b/variants/heltec_mesh_solar/target.cpp @@ -18,6 +18,7 @@ SolarExternalWatchdog external_watchdog; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_mesh_solar/target.h b/variants/heltec_mesh_solar/target.h index 97550a005..31ddbee05 100644 --- a/variants/heltec_mesh_solar/target.h +++ b/variants/heltec_mesh_solar/target.h @@ -11,6 +11,7 @@ #include #ifdef DISPLAY_CLASS #include + #include #endif class SolarSensorManager : public SensorManager { @@ -47,6 +48,7 @@ extern SolarExternalWatchdog external_watchdog; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_rc32/platformio.ini b/variants/heltec_rc32/platformio.ini index 2f07c021b..70d51df95 100644 --- a/variants/heltec_rc32/platformio.ini +++ b/variants/heltec_rc32/platformio.ini @@ -127,7 +127,7 @@ lib_deps = extends = Heltec_RC32 build_flags = ${Heltec_RC32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -138,7 +138,7 @@ build_src_filter = ${Heltec_RC32.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -148,7 +148,7 @@ lib_deps = extends = Heltec_RC32 build_flags = ${Heltec_RC32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -162,7 +162,7 @@ build_src_filter = ${Heltec_RC32.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -172,7 +172,7 @@ lib_deps = extends = Heltec_RC32 build_flags = ${Heltec_RC32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 @@ -188,7 +188,7 @@ build_src_filter = ${Heltec_RC32.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -274,7 +274,7 @@ lib_deps = extends = Heltec_RC32_with_display build_flags = ${Heltec_RC32_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D UI_HAS_ROTARY_INPUT -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -283,7 +283,7 @@ build_src_filter = ${Heltec_RC32_with_display.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -293,7 +293,7 @@ lib_deps = extends = Heltec_RC32_with_display build_flags = ${Heltec_RC32_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D UI_HAS_ROTARY_INPUT -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -305,7 +305,7 @@ build_src_filter = ${Heltec_RC32_with_display.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -315,7 +315,7 @@ lib_deps = extends = Heltec_RC32_with_display build_flags = ${Heltec_RC32_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D UI_HAS_ROTARY_INPUT -D MAX_CONTACTS=350 @@ -329,7 +329,7 @@ build_src_filter = ${Heltec_RC32_with_display.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_RC32_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_rc32/target.cpp b/variants/heltec_rc32/target.cpp index e095baab8..242e17129 100644 --- a/variants/heltec_rc32/target.cpp +++ b/variants/heltec_rc32/target.cpp @@ -35,6 +35,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); static HeltecRC32RotaryInput rotaryInputImpl(&board.periph_power); RotaryInput& rotary_input = rotaryInputImpl; #endif + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_rc32/target.h b/variants/heltec_rc32/target.h index 04cb6d94a..02ceca616 100644 --- a/variants/heltec_rc32/target.h +++ b/variants/heltec_rc32/target.h @@ -18,6 +18,7 @@ #else #include #endif +#include #endif extern HeltecRC32Board board; @@ -31,6 +32,7 @@ extern EnvironmentSensorManager sensors; #if defined(UI_HAS_ROTARY_INPUT) extern RotaryInput& rotary_input; #endif + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_rc52/platformio.ini b/variants/heltec_rc52/platformio.ini index d65264945..4d1b132bc 100644 --- a/variants/heltec_rc52/platformio.ini +++ b/variants/heltec_rc52/platformio.ini @@ -66,7 +66,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${heltec_rc52.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -76,7 +76,7 @@ build_src_filter = ${heltec_rc52.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_rc52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -87,7 +87,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${heltec_rc52.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -95,7 +95,7 @@ build_src_filter = ${heltec_rc52.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_rc52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -146,7 +146,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${heltec_rc52_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_BUZZER=5 -D UI_HAS_ROTARY_INPUT -D MAX_CONTACTS=350 @@ -158,7 +158,7 @@ build_src_filter = ${heltec_rc52_with_display.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_rc52_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -170,7 +170,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${heltec_rc52_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_BUZZER=5 -D UI_HAS_ROTARY_INPUT -D MAX_CONTACTS=350 @@ -180,7 +180,7 @@ build_src_filter = ${heltec_rc52_with_display.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_rc52_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_rc52/target.cpp b/variants/heltec_rc52/target.cpp index dc5652d80..d6437dea8 100644 --- a/variants/heltec_rc52/target.cpp +++ b/variants/heltec_rc52/target.cpp @@ -39,6 +39,7 @@ MomentaryButton user_btn(PIN_USER_BTN, 1000, true); static HeltecRC52RotaryInput rotaryInputImpl(&board.periph_power); RotaryInput& rotary_input = rotaryInputImpl; #endif +UITask ui_task(&board, &display); #endif bool radio_init() diff --git a/variants/heltec_rc52/target.h b/variants/heltec_rc52/target.h index efb7fdcb3..0d93e929e 100644 --- a/variants/heltec_rc52/target.h +++ b/variants/heltec_rc52/target.h @@ -19,6 +19,7 @@ #else #include #endif +#include #endif extern HeltecRC52Board board; @@ -32,6 +33,7 @@ extern MomentaryButton user_btn; #if defined(UI_HAS_ROTARY_INPUT) extern RotaryInput& rotary_input; #endif +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini index 1f572fc9b..be344629d 100644 --- a/variants/heltec_t096/platformio.ini +++ b/variants/heltec_t096/platformio.ini @@ -125,7 +125,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -137,7 +137,7 @@ build_flags = build_src_filter = ${Heltec_t096.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -148,7 +148,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -159,7 +159,7 @@ build_flags = build_src_filter = ${Heltec_t096.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_t096/target.cpp b/variants/heltec_t096/target.cpp index d0c2c07e1..91e5e0fcc 100644 --- a/variants/heltec_t096/target.cpp +++ b/variants/heltec_t096/target.cpp @@ -33,6 +33,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_t096/target.h b/variants/heltec_t096/target.h index 137d8db5e..a71aeda16 100644 --- a/variants/heltec_t096/target.h +++ b/variants/heltec_t096/target.h @@ -14,6 +14,7 @@ #include #else #include "helpers/ui/NullDisplayDriver.h" +#include #endif extern T096Board board; @@ -24,6 +25,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_t1/platformio.ini b/variants/heltec_t1/platformio.ini index 28ed67edb..5e9ca1888 100644 --- a/variants/heltec_t1/platformio.ini +++ b/variants/heltec_t1/platformio.ini @@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -75,7 +75,7 @@ build_src_filter = ${Heltec_t1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -87,7 +87,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -97,7 +97,7 @@ build_src_filter = ${Heltec_t1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_t1/target.cpp b/variants/heltec_t1/target.cpp index 1d9c8baaf..05bccae74 100644 --- a/variants/heltec_t1/target.cpp +++ b/variants/heltec_t1/target.cpp @@ -32,6 +32,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_t1/target.h b/variants/heltec_t1/target.h index ffd9434fa..57ead9c04 100644 --- a/variants/heltec_t1/target.h +++ b/variants/heltec_t1/target.h @@ -14,6 +14,7 @@ #include #else #include "helpers/ui/NullDisplayDriver.h" +#include #endif extern T1Board board; @@ -24,6 +25,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini index e795bc7fa..756747cc5 100644 --- a/variants/heltec_t114/platformio.ini +++ b/variants/heltec_t114/platformio.ini @@ -98,7 +98,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -111,7 +111,7 @@ build_src_filter = ${Heltec_t114.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -122,7 +122,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -131,7 +131,7 @@ build_src_filter = ${Heltec_t114.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -212,7 +212,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -224,7 +224,7 @@ build_flags = build_src_filter = ${Heltec_t114_with_display.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -235,7 +235,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -246,7 +246,7 @@ build_flags = build_src_filter = ${Heltec_t114_with_display.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_t114/target.cpp b/variants/heltec_t114/target.cpp index dc62f83bb..2f12ad42b 100644 --- a/variants/heltec_t114/target.cpp +++ b/variants/heltec_t114/target.cpp @@ -32,6 +32,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_t114/target.h b/variants/heltec_t114/target.h index 5aac84dbe..d5cfd30e5 100644 --- a/variants/heltec_t114/target.h +++ b/variants/heltec_t114/target.h @@ -16,6 +16,7 @@ #else #include "helpers/ui/NullDisplayDriver.h" #endif +#include #endif extern T114Board board; @@ -26,6 +27,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini index 283553937..6e1f28933 100644 --- a/variants/heltec_t190/platformio.ini +++ b/variants/heltec_t190/platformio.ini @@ -52,7 +52,7 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -61,7 +61,7 @@ build_flags = build_src_filter = ${Heltec_T190_base.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,7 +70,7 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -78,7 +78,7 @@ build_flags = build_src_filter = ${Heltec_T190_base.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_t190/target.cpp b/variants/heltec_t190/target.cpp index 6a2eab7d8..24ba3825a 100644 --- a/variants/heltec_t190/target.cpp +++ b/variants/heltec_t190/target.cpp @@ -20,6 +20,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_t190/target.h b/variants/heltec_t190/target.h index cde63220a..97828dbf0 100644 --- a/variants/heltec_t190/target.h +++ b/variants/heltec_t190/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif extern HeltecT190Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_tower_v2/platformio.ini b/variants/heltec_tower_v2/platformio.ini index 207e0a508..45791ae73 100644 --- a/variants/heltec_tower_v2/platformio.ini +++ b/variants/heltec_tower_v2/platformio.ini @@ -59,7 +59,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -72,7 +72,7 @@ build_src_filter = ${Heltec_tower_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -83,7 +83,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -96,7 +96,7 @@ build_src_filter = ${Heltec_tower_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_tower_v2/target.cpp b/variants/heltec_tower_v2/target.cpp index ae627a0b5..df4dbea1b 100644 --- a/variants/heltec_tower_v2/target.cpp +++ b/variants/heltec_tower_v2/target.cpp @@ -20,6 +20,7 @@ TowerV2ExternalWatchdog external_watchdog; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_tower_v2/target.h b/variants/heltec_tower_v2/target.h index 0b9de40ca..b0c0acee2 100644 --- a/variants/heltec_tower_v2/target.h +++ b/variants/heltec_tower_v2/target.h @@ -13,6 +13,7 @@ #ifdef DISPLAY_CLASS #include #include "helpers/ui/NullDisplayDriver.h" +#include #endif class TowerV2ExternalWatchdog : public ExternalWatchdogManager { @@ -33,6 +34,7 @@ extern TowerV2ExternalWatchdog external_watchdog; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index 3affd8ae0..ec5df6c37 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -54,7 +54,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -69,7 +69,7 @@ build_src_filter = ${Heltec_tracker_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + + lib_deps = ${Heltec_tracker_base.lib_deps} @@ -80,7 +80,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -94,7 +94,7 @@ build_src_filter = ${Heltec_tracker_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + + lib_deps = ${Heltec_tracker_base.lib_deps} diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp index 67f98306c..e8208a78c 100644 --- a/variants/heltec_tracker/target.cpp +++ b/variants/heltec_tracker/target.cpp @@ -41,6 +41,7 @@ HWTSensorManager sensors = HWTSensorManager(nmea); #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index f6fea6371..d369a2ed5 100644 --- a/variants/heltec_tracker/target.h +++ b/variants/heltec_tracker/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif class HWTSensorManager : public SensorManager { @@ -38,6 +39,7 @@ extern HWTSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini index 5fd9edabe..0192a0485 100644 --- a/variants/heltec_tracker_v2/platformio.ini +++ b/variants/heltec_tracker_v2/platformio.ini @@ -136,7 +136,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -147,7 +147,7 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -156,7 +156,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -172,7 +172,7 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -181,7 +181,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -198,7 +198,7 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_tracker_v2/target.cpp b/variants/heltec_tracker_v2/target.cpp index 12b01bcc6..1472979ff 100644 --- a/variants/heltec_tracker_v2/target.cpp +++ b/variants/heltec_tracker_v2/target.cpp @@ -28,6 +28,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_tracker_v2/target.h b/variants/heltec_tracker_v2/target.h index 240d9d4c5..1e4b0f041 100644 --- a/variants/heltec_tracker_v2/target.h +++ b/variants/heltec_tracker_v2/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern HeltecTrackerV2Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index 6435936eb..ab38578e5 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -133,7 +133,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -145,7 +145,7 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -154,7 +154,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -168,7 +168,7 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -177,7 +177,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 @@ -194,7 +194,7 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_v2/target.cpp b/variants/heltec_v2/target.cpp index 585b0a377..30cdb7cf2 100644 --- a/variants/heltec_v2/target.cpp +++ b/variants/heltec_v2/target.cpp @@ -19,6 +19,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_v2/target.h b/variants/heltec_v2/target.h index cdffc18a1..cf2ca366e 100644 --- a/variants/heltec_v2/target.h +++ b/variants/heltec_v2/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern HeltecV2Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 95629b41c..bb1064874 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -65,6 +65,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index 69ac9ad89..772293a7d 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -183,7 +183,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -194,7 +194,7 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -203,7 +203,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -221,7 +221,7 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -230,7 +230,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D ENABLE_ESP_MDNS -D MAX_CONTACTS=350 @@ -248,7 +248,7 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -354,7 +354,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7789LCDDisplay @@ -365,7 +365,7 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -374,7 +374,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=ST7789LCDDisplay -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -391,7 +391,7 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -400,7 +400,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -417,7 +417,7 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_v4/target.cpp b/variants/heltec_v4/target.cpp index 0f87c6b3b..b562b7387 100644 --- a/variants/heltec_v4/target.cpp +++ b/variants/heltec_v4/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display(NULL); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_v4/target.h b/variants/heltec_v4/target.h index 5d668186b..9e3defb66 100644 --- a/variants/heltec_v4/target.h +++ b/variants/heltec_v4/target.h @@ -15,6 +15,7 @@ #include #endif #include + #include #endif extern HeltecV4Board board; @@ -25,6 +26,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_v4_r8/platformio.ini b/variants/heltec_v4_r8/platformio.ini index e22ca8f54..6c39b5077 100644 --- a/variants/heltec_v4_r8/platformio.ini +++ b/variants/heltec_v4_r8/platformio.ini @@ -134,7 +134,7 @@ lib_deps = extends = heltec_v4_r8_oled build_flags = ${heltec_v4_r8_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -143,7 +143,7 @@ build_src_filter = ${heltec_v4_r8_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -152,7 +152,7 @@ lib_deps = extends = heltec_v4_r8_oled build_flags = ${heltec_v4_r8_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -167,7 +167,7 @@ build_src_filter = ${heltec_v4_r8_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -176,7 +176,7 @@ lib_deps = extends = heltec_v4_r8_oled build_flags = ${heltec_v4_r8_oled.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -191,7 +191,7 @@ build_src_filter = ${heltec_v4_r8_oled.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -263,7 +263,7 @@ lib_deps = extends = heltec_v4_r8_tft build_flags = ${heltec_v4_r8_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7789LCDDisplay @@ -272,7 +272,7 @@ build_src_filter = ${heltec_v4_r8_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -281,7 +281,7 @@ lib_deps = extends = heltec_v4_r8_tft build_flags = ${heltec_v4_r8_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=ST7789LCDDisplay -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -294,7 +294,7 @@ build_src_filter = ${heltec_v4_r8_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -303,7 +303,7 @@ lib_deps = extends = heltec_v4_r8_tft build_flags = ${heltec_v4_r8_tft.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -318,7 +318,7 @@ build_src_filter = ${heltec_v4_r8_tft.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${heltec_v4_r8_tft.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_v4_r8/target.cpp b/variants/heltec_v4_r8/target.cpp index 27e9f4686..0e0456674 100644 --- a/variants/heltec_v4_r8/target.cpp +++ b/variants/heltec_v4_r8/target.cpp @@ -28,6 +28,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display(&board.periph_power); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_v4_r8/target.h b/variants/heltec_v4_r8/target.h index 2d1d7a5bb..d7555d932 100644 --- a/variants/heltec_v4_r8/target.h +++ b/variants/heltec_v4_r8/target.h @@ -15,6 +15,7 @@ #include #endif #include + #include #endif extern HeltecV4R8Board board; @@ -25,6 +26,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini index 56f95b2f9..fea00c2c7 100644 --- a/variants/heltec_wireless_paper/platformio.ini +++ b/variants/heltec_wireless_paper/platformio.ini @@ -47,7 +47,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -60,7 +60,7 @@ build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,7 +70,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -80,7 +80,7 @@ build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/heltec_wireless_paper/target.cpp b/variants/heltec_wireless_paper/target.cpp index be21695ec..41e353efc 100644 --- a/variants/heltec_wireless_paper/target.cpp +++ b/variants/heltec_wireless_paper/target.cpp @@ -20,6 +20,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/heltec_wireless_paper/target.h b/variants/heltec_wireless_paper/target.h index 720667818..c272a2f08 100644 --- a/variants/heltec_wireless_paper/target.h +++ b/variants/heltec_wireless_paper/target.h @@ -16,6 +16,7 @@ public: #ifdef DISPLAY_CLASS #include #include +#include #endif extern HeltecWirelessPaperBoard board; @@ -26,6 +27,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini index 1c6f17c24..40e20d705 100644 --- a/variants/ikoka_handheld_nrf/platformio.ini +++ b/variants/ikoka_handheld_nrf/platformio.ini @@ -44,7 +44,7 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D QSPIFLASH=1 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new build_src_filter = ${ikoka_handheld_nrf.build_src_filter} + +<../examples/companion_radio/ui-new/UITask.cpp> diff --git a/variants/ikoka_handheld_nrf/target.cpp b/variants/ikoka_handheld_nrf/target.cpp index 6c53c5e32..561e19bd7 100644 --- a/variants/ikoka_handheld_nrf/target.cpp +++ b/variants/ikoka_handheld_nrf/target.cpp @@ -16,6 +16,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif diff --git a/variants/ikoka_handheld_nrf/target.h b/variants/ikoka_handheld_nrf/target.h index 18f7c9c5e..d071259c7 100644 --- a/variants/ikoka_handheld_nrf/target.h +++ b/variants/ikoka_handheld_nrf/target.h @@ -12,8 +12,11 @@ #ifdef DISPLAY_CLASS #include #include + #include + extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini index 87c6240ee..b65dc035c 100644 --- a/variants/ikoka_nano_nrf/platformio.ini +++ b/variants/ikoka_nano_nrf/platformio.ini @@ -82,7 +82,7 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -90,7 +90,7 @@ build_flags = build_src_filter = ${ikoka_nano_nrf.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -103,7 +103,7 @@ build_flags = ${ikoka_nano_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D QSPIFLASH=1 -D ENABLE_USB_INTERFACE ; -D MESH_PACKET_LOGGING=1 @@ -111,7 +111,7 @@ build_flags = build_src_filter = ${ikoka_nano_nrf.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/ikoka_nano_nrf/target.cpp b/variants/ikoka_nano_nrf/target.cpp index baf02c3d1..9058cf861 100644 --- a/variants/ikoka_nano_nrf/target.cpp +++ b/variants/ikoka_nano_nrf/target.cpp @@ -7,6 +7,7 @@ IkokaNanoNRFBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; // MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/ikoka_nano_nrf/target.h b/variants/ikoka_nano_nrf/target.h index 30ee5cb69..006bd738d 100644 --- a/variants/ikoka_nano_nrf/target.h +++ b/variants/ikoka_nano_nrf/target.h @@ -12,8 +12,11 @@ #ifdef DISPLAY_CLASS #include #include + #include + extern DISPLAY_CLASS display; // extern MomentaryButton user_btn; + extern UITask ui_task; #endif extern IkokaNanoNRFBoard board; diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini index c8184fc40..b108c066e 100644 --- a/variants/ikoka_stick_nrf/platformio.ini +++ b/variants/ikoka_stick_nrf/platformio.ini @@ -88,7 +88,7 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 @@ -96,7 +96,7 @@ build_flags = build_src_filter = ${ikoka_stick_nrf.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,7 +109,7 @@ build_flags = ${ikoka_stick_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D QSPIFLASH=1 -D ENABLE_USB_INTERFACE ; -D MESH_PACKET_LOGGING=1 @@ -117,7 +117,7 @@ build_flags = build_src_filter = ${ikoka_stick_nrf.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/ikoka_stick_nrf/target.cpp b/variants/ikoka_stick_nrf/target.cpp index bb140505a..9b3d47183 100644 --- a/variants/ikoka_stick_nrf/target.cpp +++ b/variants/ikoka_stick_nrf/target.cpp @@ -7,6 +7,7 @@ IkokaStickNRFBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/ikoka_stick_nrf/target.h b/variants/ikoka_stick_nrf/target.h index 46b05e8b2..792f3e3e9 100644 --- a/variants/ikoka_stick_nrf/target.h +++ b/variants/ikoka_stick_nrf/target.h @@ -12,8 +12,11 @@ #ifdef DISPLAY_CLASS #include #include + #include + extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif extern IkokaStickNRFBoard board; diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini index 11dc214b0..cfc71050a 100644 --- a/variants/keepteen_lt1/platformio.ini +++ b/variants/keepteen_lt1/platformio.ini @@ -62,7 +62,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -73,7 +73,7 @@ build_src_filter = ${KeepteenLT1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -83,7 +83,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -97,7 +97,7 @@ build_src_filter = ${KeepteenLT1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 diff --git a/variants/keepteen_lt1/target.cpp b/variants/keepteen_lt1/target.cpp index dd7c6741b..0436f7e2b 100644 --- a/variants/keepteen_lt1/target.cpp +++ b/variants/keepteen_lt1/target.cpp @@ -22,6 +22,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/keepteen_lt1/target.h b/variants/keepteen_lt1/target.h index 5b73bb668..e8f67ebd7 100644 --- a/variants/keepteen_lt1/target.h +++ b/variants/keepteen_lt1/target.h @@ -9,6 +9,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif #include @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_t3_stm32/platformio.ini b/variants/lilygo_t3_stm32/platformio.ini index 39e059b70..33ca0b405 100644 --- a/variants/lilygo_t3_stm32/platformio.ini +++ b/variants/lilygo_t3_stm32/platformio.ini @@ -41,13 +41,13 @@ build_src_filter = ${lilygo_t3_stm32.build_src_filter} [env:LilyGo_T3_STM32_companion_radio_usb] extends = lilygo_t3_stm32 build_flags = ${lilygo_t3_stm32.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D ENABLE_USB_INTERFACE build_src_filter = ${lilygo_t3_stm32.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${lilygo_t3_stm32.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 966235c66..d186c99d8 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -136,7 +136,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -147,7 +147,7 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -156,7 +156,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -170,7 +170,7 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_t3s3/target.cpp b/variants/lilygo_t3s3/target.cpp index 34df31c3b..8c02015e5 100644 --- a/variants/lilygo_t3s3/target.cpp +++ b/variants/lilygo_t3s3/target.cpp @@ -14,6 +14,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h index 965cdd1a2..224acd84a 100644 --- a/variants/lilygo_t3s3/target.h +++ b/variants/lilygo_t3s3/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ESP32Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index c6497dcb1..b71f02f6b 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -134,7 +134,7 @@ extends = LilyGo_T3S3_sx1276 upload_speed = 115200 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -143,7 +143,7 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -152,7 +152,7 @@ lib_deps = extends = LilyGo_T3S3_sx1276 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -166,7 +166,7 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_t3s3_sx1276/target.cpp b/variants/lilygo_t3s3_sx1276/target.cpp index 770db4a77..7a4d3e8fd 100644 --- a/variants/lilygo_t3s3_sx1276/target.cpp +++ b/variants/lilygo_t3s3_sx1276/target.cpp @@ -19,6 +19,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_t3s3_sx1276/target.h b/variants/lilygo_t3s3_sx1276/target.h index c5fbff628..e1c400dbf 100644 --- a/variants/lilygo_t3s3_sx1276/target.h +++ b/variants/lilygo_t3s3_sx1276/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern LilygoT3S3SX1276Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_t_impulse_plus/platformio.ini b/variants/lilygo_t_impulse_plus/platformio.ini index 0ed5b9a42..8fd01b1f2 100644 --- a/variants/lilygo_t_impulse_plus/platformio.ini +++ b/variants/lilygo_t_impulse_plus/platformio.ini @@ -49,7 +49,7 @@ extends = LilyGo_T_Impulse_Plus build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -62,7 +62,7 @@ build_flags = build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T_Impulse_Plus.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_t_impulse_plus/target.cpp b/variants/lilygo_t_impulse_plus/target.cpp index b6b0c82cf..53474976e 100644 --- a/variants/lilygo_t_impulse_plus/target.cpp +++ b/variants/lilygo_t_impulse_plus/target.cpp @@ -23,6 +23,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_t_impulse_plus/target.h b/variants/lilygo_t_impulse_plus/target.h index ff168fbed..89bb7efe8 100644 --- a/variants/lilygo_t_impulse_plus/target.h +++ b/variants/lilygo_t_impulse_plus/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern TImpulsePlusBoard board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini index ab9c9e67c..74d180baa 100644 --- a/variants/lilygo_tbeam_1w/platformio.ini +++ b/variants/lilygo_tbeam_1w/platformio.ini @@ -109,7 +109,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D PERSISTANT_GPS=1 @@ -119,7 +119,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -129,7 +129,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -142,7 +142,7 @@ build_flags = build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -152,7 +152,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -168,7 +168,7 @@ build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tbeam_1w/target.cpp b/variants/lilygo_tbeam_1w/target.cpp index db11747f8..89f566100 100644 --- a/variants/lilygo_tbeam_1w/target.cpp +++ b/variants/lilygo_tbeam_1w/target.cpp @@ -6,6 +6,7 @@ TBeam1WBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif static SPIClass spi; diff --git a/variants/lilygo_tbeam_1w/target.h b/variants/lilygo_tbeam_1w/target.h index d6cd61b4c..edf8bca0e 100644 --- a/variants/lilygo_tbeam_1w/target.h +++ b/variants/lilygo_tbeam_1w/target.h @@ -11,8 +11,11 @@ #ifdef DISPLAY_CLASS #include #include + #include + extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif extern TBeam1WBoard board; diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 62ac09f87..650b630cf 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -45,7 +45,7 @@ extends = LilyGo_TBeam_SX1262 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -60,7 +60,7 @@ build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index b97dda41e..ec9b0e933 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/variants/lilygo_tbeam_SX1262/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h index c532a73af..109a57bbb 100644 --- a/variants/lilygo_tbeam_SX1262/target.h +++ b/variants/lilygo_tbeam_SX1262/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern TBeamBoard board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini index f5f490479..ebfbaa3f3 100644 --- a/variants/lilygo_tbeam_SX1276/platformio.ini +++ b/variants/lilygo_tbeam_SX1276/platformio.ini @@ -43,7 +43,7 @@ extends = LilyGo_TBeam_SX1276 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1276.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -56,7 +56,7 @@ build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tbeam_SX1276/target.cpp b/variants/lilygo_tbeam_SX1276/target.cpp index be7c8287f..061a9260f 100644 --- a/variants/lilygo_tbeam_SX1276/target.cpp +++ b/variants/lilygo_tbeam_SX1276/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_tbeam_SX1276/target.h b/variants/lilygo_tbeam_SX1276/target.h index 0d56f88f8..aa6099664 100644 --- a/variants/lilygo_tbeam_SX1276/target.h +++ b/variants/lilygo_tbeam_SX1276/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern LilygoTBeamSX1276Board board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index 18a828025..d57dcaea8 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -126,7 +126,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -140,7 +140,7 @@ build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -149,7 +149,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -166,7 +166,7 @@ build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp index 86b9116c3..02b39b46a 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp +++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp @@ -6,6 +6,7 @@ TBeamBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif static SPIClass spi; diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.h b/variants/lilygo_tbeam_supreme_SX1262/target.h index 25caa7116..b2c8b9362 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.h +++ b/variants/lilygo_tbeam_supreme_SX1262/target.h @@ -13,6 +13,8 @@ extern DISPLAY_CLASS display; #include extern MomentaryButton user_btn; + #include + extern UITask ui_task; #endif extern TBeamBoard board; diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini index 00571db93..83631c302 100644 --- a/variants/lilygo_tdeck/platformio.ini +++ b/variants/lilygo_tdeck/platformio.ini @@ -67,7 +67,7 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -76,7 +76,7 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -85,7 +85,7 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -94,7 +94,7 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tdeck/target.cpp b/variants/lilygo_tdeck/target.cpp index 4084a73bc..74026a260 100644 --- a/variants/lilygo_tdeck/target.cpp +++ b/variants/lilygo_tdeck/target.cpp @@ -21,6 +21,7 @@ EnvironmentSensorManager sensors(gps); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_tdeck/target.h b/variants/lilygo_tdeck/target.h index 9d35af9b1..5e52afdf1 100644 --- a/variants/lilygo_tdeck/target.h +++ b/variants/lilygo_tdeck/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif #include "helpers/sensors/EnvironmentSensorManager.h" #include "helpers/sensors/MicroNMEALocationProvider.h" @@ -22,6 +23,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini index 2c2a3e430..db47ef386 100644 --- a/variants/lilygo_techo/platformio.ini +++ b/variants/lilygo_techo/platformio.ini @@ -92,7 +92,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D EINK_REFRESH_LOOP -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -108,7 +108,7 @@ build_flags = build_src_filter = ${LilyGo_T-Echo.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -120,7 +120,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D EINK_REFRESH_LOOP -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -131,7 +131,7 @@ build_flags = -D ENABLE_USB_INTERFACE build_src_filter = ${LilyGo_T-Echo.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_techo/target.cpp b/variants/lilygo_techo/target.cpp index 394d79c5c..6cb6a69f2 100644 --- a/variants/lilygo_techo/target.cpp +++ b/variants/lilygo_techo/target.cpp @@ -25,6 +25,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); MomentaryButton backlight_btn(BACKLIGHT_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_techo/target.h b/variants/lilygo_techo/target.h index a1668f031..dea948fe6 100644 --- a/variants/lilygo_techo/target.h +++ b/variants/lilygo_techo/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern TechoBoard board; @@ -23,6 +24,7 @@ extern EnvironmentSensorManager sensors; extern DISPLAY_CLASS display; extern MomentaryButton user_btn; extern MomentaryButton backlight_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index 2a92eb9be..37790decc 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/variants/lilygo_techo_lite/platformio.ini @@ -78,7 +78,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo-Lite.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D QSPIFLASH=1 @@ -93,7 +93,7 @@ build_flags = build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,7 +109,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo-Lite.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -119,7 +119,7 @@ build_flags = ; -D QSPIFLASH=1 build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -136,7 +136,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -181,7 +181,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper diff --git a/variants/lilygo_techo_lite/target.cpp b/variants/lilygo_techo_lite/target.cpp index 6d199fff8..1fd0b6223 100644 --- a/variants/lilygo_techo_lite/target.cpp +++ b/variants/lilygo_techo_lite/target.cpp @@ -23,6 +23,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_techo_lite/target.h b/variants/lilygo_techo_lite/target.h index 2b8a1783f..b0cdcf4eb 100644 --- a/variants/lilygo_techo_lite/target.h +++ b/variants/lilygo_techo_lite/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern TechoBoard board; @@ -22,6 +23,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index dc60b6f75..2e69c5da7 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -74,7 +74,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D ENABLE_USB_INTERFACE @@ -83,7 +83,7 @@ build_flags = build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -92,7 +92,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -104,7 +104,7 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -131,7 +131,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -144,7 +144,7 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tlora_v2_1/target.cpp b/variants/lilygo_tlora_v2_1/target.cpp index 8c1201615..9b02845a3 100644 --- a/variants/lilygo_tlora_v2_1/target.cpp +++ b/variants/lilygo_tlora_v2_1/target.cpp @@ -15,6 +15,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/lilygo_tlora_v2_1/target.h b/variants/lilygo_tlora_v2_1/target.h index fa954b329..7d109c456 100644 --- a/variants/lilygo_tlora_v2_1/target.h +++ b/variants/lilygo_tlora_v2_1/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern LilyGoTLoraBoard board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini index a6f823dbf..78edbab56 100644 --- a/variants/mesh_pocket/platformio.ini +++ b/variants/mesh_pocket/platformio.ini @@ -24,6 +24,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/mesh_pocket> + + + lib_deps = ${nrf52_base.lib_deps} adafruit/Adafruit EPD @ 4.6.1 @@ -38,8 +39,10 @@ upload_protocol = nrfutil extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} +<../examples/simple_repeater> + + build_flags = ${Mesh_pocket.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Heltec_Mesh_Pocket Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -52,8 +55,10 @@ build_flags = extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} +<../examples/simple_room_server> + + build_flags = ${Mesh_pocket.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Heltec_Mesh_Pocket Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -68,7 +73,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -77,11 +82,10 @@ build_flags = ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 - build_src_filter = ${Mesh_pocket.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -92,7 +96,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D AUTO_OFF_MILLIS=0 @@ -104,12 +108,15 @@ build_flags = build_src_filter = ${Mesh_pocket.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Mesh_pocket_kiss_modem] extends = Mesh_pocket +build_flags = + ${Mesh_pocket.build_flags} + -U DISPLAY_CLASS build_src_filter = ${Mesh_pocket.build_src_filter} +<../examples/kiss_modem/> diff --git a/variants/mesh_pocket/target.cpp b/variants/mesh_pocket/target.cpp index ee8f944de..47ad2de3b 100644 --- a/variants/mesh_pocket/target.cpp +++ b/variants/mesh_pocket/target.cpp @@ -17,6 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/mesh_pocket/target.h b/variants/mesh_pocket/target.h index 244fe7d2d..466d9a700 100644 --- a/variants/mesh_pocket/target.h +++ b/variants/mesh_pocket/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif extern HeltecMeshPocket board; @@ -21,6 +22,7 @@ extern AutoDiscoverRTCClock rtc_clock; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index 5e35251cc..b4ec065ad 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -30,6 +30,7 @@ build_src_filter = ${esp32_base.build_src_filter} +<../variants/meshadventurer> + + + + lib_deps = ${esp32_base.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 @@ -39,8 +40,10 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/simple_repeater> + + build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -85,8 +88,10 @@ extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + +<../examples/simple_repeater> + + build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -107,8 +112,10 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/simple_repeater> + + build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -154,8 +161,10 @@ extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + +<../examples/simple_repeater> + + build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -176,10 +185,10 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -198,10 +207,10 @@ extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -237,6 +246,7 @@ lib_deps = extends = Meshadventurer build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -249,6 +259,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/simple_room_server> + + lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -257,10 +268,10 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -279,10 +290,10 @@ extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -318,6 +329,7 @@ lib_deps = extends = Meshadventurer build_flags = ${Meshadventurer.build_flags} + -I src/helpers/ui/server -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -330,6 +342,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/simple_room_server> + + lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -342,6 +355,7 @@ build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 + -U DISPLAY_CLASS [env:Meshadventurer_sx1268_kiss_modem] extends = Meshadventurer @@ -351,3 +365,4 @@ build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 + -U DISPLAY_CLASS diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp index 1ccfe1510..24a4b6f12 100644 --- a/variants/meshadventurer/target.cpp +++ b/variants/meshadventurer/target.cpp @@ -18,6 +18,7 @@ MASensorManager sensors = MASensorManager(nmea); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/meshadventurer/target.h b/variants/meshadventurer/target.h index 9581d422c..1f7ab8721 100644 --- a/variants/meshadventurer/target.h +++ b/variants/meshadventurer/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif class MASensorManager : public SensorManager { @@ -38,6 +39,7 @@ extern MASensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif diff --git a/variants/meshnology_w12/platformio.ini b/variants/meshnology_w12/platformio.ini index ffab9d57c..bb5f21c09 100644 --- a/variants/meshnology_w12/platformio.ini +++ b/variants/meshnology_w12/platformio.ini @@ -44,6 +44,7 @@ build_flags = build_src_filter = ${esp32_base.build_src_filter} +<../variants/meshnology_w12> + + + lib_deps = ${esp32_base.lib_deps} ${sensor_base.lib_deps} @@ -52,6 +53,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Meshnology W12 Repeater"' -D ADVERT_LAT=0.0 @@ -63,6 +65,7 @@ build_flags = build_src_filter = ${meshnology_w12.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${meshnology_w12.lib_deps} ${esp32_ota.lib_deps} @@ -72,6 +75,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 @@ -86,6 +90,7 @@ build_src_filter = ${meshnology_w12.build_src_filter} + + +<../examples/simple_repeater> + + lib_deps = ${meshnology_w12.lib_deps} ${esp32_ota.lib_deps} @@ -94,6 +99,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Meshnology W12 Room"' -D ADVERT_LAT=0.0 @@ -105,6 +111,7 @@ build_flags = build_src_filter = ${meshnology_w12.build_src_filter} + +<../examples/simple_room_server> + + lib_deps = ${meshnology_w12.lib_deps} ${esp32_ota.lib_deps} @@ -127,7 +134,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -137,7 +144,7 @@ build_src_filter = ${meshnology_w12.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${meshnology_w12.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -146,7 +153,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -161,7 +168,7 @@ build_src_filter = ${meshnology_w12.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${meshnology_w12.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -170,7 +177,7 @@ lib_deps = extends = meshnology_w12 build_flags = ${meshnology_w12.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -187,7 +194,7 @@ build_src_filter = ${meshnology_w12.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${meshnology_w12.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,7 +209,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D ENV_PIN_SDA=3 -D ENV_PIN_SCL=4 - -D DISPLAY_CLASS=SSD1306Display + ; -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${meshnology_w12.build_src_filter} diff --git a/variants/meshnology_w12/target.cpp b/variants/meshnology_w12/target.cpp index a3d6089ff..969c1fc20 100644 --- a/variants/meshnology_w12/target.cpp +++ b/variants/meshnology_w12/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display(NULL); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif const uint32_t rfswitch_dios[] = { diff --git a/variants/meshnology_w12/target.h b/variants/meshnology_w12/target.h index 1bf8876b2..9cfce3d2d 100644 --- a/variants/meshnology_w12/target.h +++ b/variants/meshnology_w12/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern MeshnologyW12Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini index c0a3c5f94..a4741de79 100644 --- a/variants/meshtiny/platformio.ini +++ b/variants/meshtiny/platformio.ini @@ -29,7 +29,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -41,7 +41,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Meshtiny.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -50,7 +50,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -64,7 +64,7 @@ build_flags = build_src_filter = ${Meshtiny.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/meshtiny/target.cpp b/variants/meshtiny/target.cpp index 50d678266..25eded160 100644 --- a/variants/meshtiny/target.cpp +++ b/variants/meshtiny/target.cpp @@ -14,11 +14,12 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS -DISPLAY_CLASS display; + DISPLAY_CLASS display; MomentaryButton user_btn(ENCODER_PRESS, 1000, true, true); MomentaryButton joystick_left(ENCODER_LEFT, 1000, true, true); MomentaryButton joystick_right(ENCODER_RIGHT, 1000, true, true); MomentaryButton back_btn(PIN_SIDE_BUTTON, 1000, true, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/meshtiny/target.h b/variants/meshtiny/target.h index 3987e18c2..066eae921 100644 --- a/variants/meshtiny/target.h +++ b/variants/meshtiny/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif #include @@ -24,6 +25,7 @@ extern MomentaryButton user_btn; extern MomentaryButton joystick_left; extern MomentaryButton joystick_right; extern MomentaryButton back_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini index 1743e7199..3a7bc05ea 100644 --- a/variants/minewsemi_me25ls01/platformio.ini +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -42,7 +42,7 @@ extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -58,7 +58,7 @@ build_flags = ${me25ls01.build_flags} build_src_filter = ${me25ls01.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + [env:Minewsemi_me25ls01_repeater] extends = me25ls01 @@ -73,10 +73,8 @@ build_flags = ${me25ls01.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 - -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} +<../examples/simple_repeater> - + [env:Minewsemi_me25ls01_room_server] extends = me25ls01 @@ -92,7 +90,6 @@ build_flags = ${me25ls01.build_flags} -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -D MAX_NEIGHBOURS=50 - -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} +<../examples/simple_room_server> @@ -110,7 +107,7 @@ build_flags = ${me25ls01.build_flags} -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' -D MAX_NEIGHBOURS=50 - -D DISPLAY_CLASS=NullDisplayDriver +; -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} +<../examples/simple_secure_chat/main.cpp> @@ -119,7 +116,7 @@ extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ;-D BLE_PIN_CODE=123456 @@ -133,7 +130,7 @@ build_flags = ${me25ls01.build_flags} build_src_filter = ${me25ls01.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + [env:Minewsemi_me25ls01_kiss_modem] extends = me25ls01 diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp index 8d9a6e072..38d78a9d5 100644 --- a/variants/minewsemi_me25ls01/target.cpp +++ b/variants/minewsemi_me25ls01/target.cpp @@ -20,6 +20,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/minewsemi_me25ls01/target.h b/variants/minewsemi_me25ls01/target.h index db44058c8..a82565e01 100644 --- a/variants/minewsemi_me25ls01/target.h +++ b/variants/minewsemi_me25ls01/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern MinewsemiME25LS01Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/muzi_base/platformio.ini b/variants/muzi_base/platformio.ini index 72a3ecac2..5fea77978 100644 --- a/variants/muzi_base/platformio.ini +++ b/variants/muzi_base/platformio.ini @@ -35,6 +35,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + + +<../variants/muzi_base> + + debug_tool = jlink upload_protocol = nrfutil lib_deps = @@ -73,7 +74,7 @@ build_flags = ${muzi_base_common.build_flags} [env:muzi_base_duo_repeater] extends = muzi_base_duo build_flags = ${muzi_base_duo.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/server -D ADVERT_NAME='"Muzi Base Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -83,12 +84,13 @@ build_flags = ${muzi_base_duo.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${muzi_base_duo.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${muzi_base_duo.lib_deps} [env:muzi_base_duo_room_server] extends = muzi_base_duo build_flags = ${muzi_base_duo.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/server -D ADVERT_NAME='"Muzi Base Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -98,6 +100,7 @@ build_flags = ${muzi_base_duo.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${muzi_base_duo.build_src_filter} +<../examples/simple_room_server> + + lib_deps = ${muzi_base_duo.lib_deps} [env:muzi_base_duo_companion_radio_usb] @@ -105,7 +108,7 @@ extends = muzi_base_duo board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${muzi_base_duo.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -115,7 +118,7 @@ build_flags = ${muzi_base_duo.build_flags} build_src_filter = ${muzi_base_duo.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_duo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -124,7 +127,7 @@ extends = muzi_base_duo board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${muzi_base_duo.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -140,7 +143,7 @@ build_src_filter = ${muzi_base_duo.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_duo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -180,7 +183,7 @@ board_upload.maximum_size = 708608 build_flags = ${muzi_base_duo_superIO.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D BLE_PIN_CODE=123456 -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 @@ -190,7 +193,7 @@ build_flags = ${muzi_base_duo_superIO.build_flags} build_src_filter = ${muzi_base_duo_superIO.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_duo_superIO.lib_deps} @@ -200,7 +203,7 @@ lib_deps = [env:muzi_base_uno_repeater] extends = muzi_base_uno build_flags = ${muzi_base_uno.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/server -D ADVERT_NAME='"Muzi Base Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -210,12 +213,13 @@ build_flags = ${muzi_base_uno.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${muzi_base_uno.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${muzi_base_uno.lib_deps} [env:muzi_base_uno_room_server] extends = muzi_base_uno build_flags = ${muzi_base_uno.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/server -D ADVERT_NAME='"Muzi Base Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -225,6 +229,7 @@ build_flags = ${muzi_base_uno.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${muzi_base_uno.build_src_filter} +<../examples/simple_room_server> + + lib_deps = ${muzi_base_uno.lib_deps} [env:muzi_base_uno_companion_radio_usb] @@ -232,7 +237,7 @@ extends = muzi_base_uno board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${muzi_base_uno.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -242,7 +247,7 @@ build_flags = ${muzi_base_uno.build_flags} build_src_filter = ${muzi_base_uno.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_uno.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -251,7 +256,7 @@ extends = muzi_base_uno board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${muzi_base_uno.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -267,7 +272,7 @@ build_src_filter = ${muzi_base_uno.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_uno.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -307,7 +312,7 @@ board_upload.maximum_size = 708608 build_flags = ${muzi_base_uno_superIO.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D BLE_PIN_CODE=123456 -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 @@ -317,6 +322,6 @@ build_flags = ${muzi_base_uno_superIO.build_flags} build_src_filter = ${muzi_base_uno_superIO.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${muzi_base_uno_superIO.lib_deps} diff --git a/variants/muzi_base/target.cpp b/variants/muzi_base/target.cpp index 6653ada19..6f9fcdad4 100644 --- a/variants/muzi_base/target.cpp +++ b/variants/muzi_base/target.cpp @@ -71,6 +71,7 @@ void MuziBaseSensorManager::loop() { MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false); MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false); MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif #if defined(USE_LR1121) diff --git a/variants/muzi_base/target.h b/variants/muzi_base/target.h index 0c143e1bc..6914b1fb7 100644 --- a/variants/muzi_base/target.h +++ b/variants/muzi_base/target.h @@ -30,6 +30,8 @@ #include "helpers/ui/NullDisplayDriver.h" extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + #include + extern UITask ui_task; #endif extern MuziBaseBoard board; diff --git a/variants/muziworks_r1_neo/R1NeoBoard.h b/variants/muziworks_r1_neo/R1NeoBoard.h index c56f1f5c2..3dffa3015 100644 --- a/variants/muziworks_r1_neo/R1NeoBoard.h +++ b/variants/muziworks_r1_neo/R1NeoBoard.h @@ -6,8 +6,6 @@ #include "NullDisplayDriver.h" #include "MomentaryButton.h" -#define DISPLAY_CLASS NullDisplayDriver - class R1NeoBoard : public NRF52BoardDCDC { protected: #ifdef NRF52_POWER_MANAGEMENT diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini index fb51c04d9..834fd5e97 100644 --- a/variants/muziworks_r1_neo/platformio.ini +++ b/variants/muziworks_r1_neo/platformio.ini @@ -9,7 +9,6 @@ build_flags = ${nrf52_base.build_flags} -D R1Neo -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper - -D DISPLAY_CLASS=NullDisplayDriver -D LORA_TX_POWER=22 -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 @@ -63,16 +62,17 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE + -D DISPLAY_CLASS=NullDisplayDriver ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -84,20 +84,21 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ENV_INCLUDE_GPS=1 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 + -D DISPLAY_CLASS=NullDisplayDriver ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -121,7 +122,7 @@ lib_deps = extends = R1Neo build_flags = ${R1Neo.build_flags} - -D DISPLAY_CLASS=SSD1306Display +; -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"R1 Neo Sensor"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 diff --git a/variants/muziworks_r1_neo/target.cpp b/variants/muziworks_r1_neo/target.cpp index 3081de2c1..57f21acca 100644 --- a/variants/muziworks_r1_neo/target.cpp +++ b/variants/muziworks_r1_neo/target.cpp @@ -9,6 +9,7 @@ WRAPPER_CLASS radio_driver(radio, board); #ifdef DISPLAY_CLASS NullDisplayDriver display; + UITask ui_task(&board, &display); #endif #ifdef PIN_USER_BTN diff --git a/variants/muziworks_r1_neo/target.h b/variants/muziworks_r1_neo/target.h index 5bf3f2685..a16122d53 100644 --- a/variants/muziworks_r1_neo/target.h +++ b/variants/muziworks_r1_neo/target.h @@ -12,8 +12,14 @@ extern R1NeoBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern EnvironmentSensorManager sensors; + +#ifdef DISPLAY_CLASS +#include + extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; +#endif bool radio_init(); mesh::LocalIdentity radio_new_identity(); diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index b817b3e99..fbc12ea04 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -17,6 +17,7 @@ build_flags = ${nrf52_base.build_flags} build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/nano_g2_ultra> + + debug_tool = jlink upload_protocol = nrfutil lib_deps = ${nrf52_base.lib_deps} @@ -28,6 +29,7 @@ lib_deps = ${nrf52_base.lib_deps} extends = Nano_G2_Ultra build_flags = ${Nano_G2_Ultra.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SH1106Display -D ADVERT_NAME='"Nano G2 Repeater"' -D ADVERT_LAT=0.0 @@ -39,11 +41,13 @@ build_flags = build_src_filter = ${Nano_G2_Ultra.build_src_filter} + +<../examples/simple_repeater> + + [env:Nano_G2_Ultra_room_server] extends = Nano_G2_Ultra build_flags = ${Nano_G2_Ultra.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SH1106Display -D ADVERT_NAME='"Nano G2 Room"' -D ADVERT_LAT=0.0 @@ -55,6 +59,7 @@ build_flags = build_src_filter = ${Nano_G2_Ultra.build_src_filter} + +<../examples/simple_room_server> + + [env:Nano_G2_Ultra_companion_radio_ble] extends = Nano_G2_Ultra @@ -63,7 +68,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -80,7 +85,7 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -92,7 +97,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -107,7 +112,7 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index fedc48e7f..68230fa2a 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -21,6 +21,7 @@ NanoG2UltraSensorManager sensors = NanoG2UltraSensorManager(nmea, gps_driver); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); +UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index d540b9ecc..78c511f3b 100644 --- a/variants/nano_g2_ultra/target.h +++ b/variants/nano_g2_ultra/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include +#include #endif #include @@ -43,6 +44,7 @@ extern NanoG2UltraSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; +extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index 0f8d31de8..52e7f78fc 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/variants/nibble_screen_connect/platformio.ini @@ -29,6 +29,7 @@ build_flags = -D SX126X_RX_BOOSTED_GAIN=1 build_src_filter = ${esp32_base.build_src_filter} +<../variants/nibble_screen_connect> + + lib_deps = ${esp32_base.lib_deps} adafruit/Adafruit SSD1306 @ ^2.5.13 @@ -38,6 +39,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Nibble Repeater"' -D ADVERT_LAT=0.0 @@ -47,6 +49,7 @@ build_flags = build_src_filter = ${nibble_screen_connect_base.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -55,6 +58,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 @@ -66,6 +70,7 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + +<../examples/simple_repeater> + + lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -86,6 +91,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Nibble Room"' -D ADVERT_LAT=0.0 @@ -95,6 +101,7 @@ build_flags = build_src_filter = ${nibble_screen_connect_base.build_src_filter} + +<../examples/simple_room_server> + + lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -103,7 +110,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -112,7 +119,7 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -121,7 +128,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -133,7 +140,7 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -142,7 +149,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 @@ -157,7 +164,7 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/nibble_screen_connect/target.cpp b/variants/nibble_screen_connect/target.cpp index ceb9fe49c..79ea63486 100644 --- a/variants/nibble_screen_connect/target.cpp +++ b/variants/nibble_screen_connect/target.cpp @@ -14,6 +14,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/nibble_screen_connect/target.h b/variants/nibble_screen_connect/target.h index dcbcf8e1d..c91cfc73c 100644 --- a/variants/nibble_screen_connect/target.h +++ b/variants/nibble_screen_connect/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ESP32Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/nibble_zero_connect/platformio.ini b/variants/nibble_zero_connect/platformio.ini index c7e7b0765..4fe43d0e1 100644 --- a/variants/nibble_zero_connect/platformio.ini +++ b/variants/nibble_zero_connect/platformio.ini @@ -27,6 +27,7 @@ build_flags = -D SX126X_RX_BOOSTED_GAIN=1 build_src_filter = ${esp32_base.build_src_filter} +<../variants/nibble_zero_connect> + + lib_deps = ${esp32_base.lib_deps} adafruit/Adafruit SSD1306 @ ^2.5.13 @@ -35,6 +36,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Nibble Repeater"' -D ADVERT_LAT=0.0 @@ -44,6 +46,7 @@ build_flags = build_src_filter = ${nibble_zero_connect_base.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -52,6 +55,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 @@ -63,6 +67,7 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + +<../examples/simple_repeater> + + lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -83,6 +88,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Nibble Room"' -D ADVERT_LAT=0.0 @@ -92,6 +98,7 @@ build_flags = build_src_filter = ${nibble_zero_connect_base.build_src_filter} + +<../examples/simple_room_server> + + lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -100,7 +107,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -109,7 +116,7 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,7 +125,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -130,7 +137,7 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -139,7 +146,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 @@ -153,7 +160,7 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/nibble_zero_connect/target.cpp b/variants/nibble_zero_connect/target.cpp index d53b6a1c3..5200ca39f 100644 --- a/variants/nibble_zero_connect/target.cpp +++ b/variants/nibble_zero_connect/target.cpp @@ -14,6 +14,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/nibble_zero_connect/target.h b/variants/nibble_zero_connect/target.h index 87c55f0f2..2d45bff20 100644 --- a/variants/nibble_zero_connect/target.h +++ b/variants/nibble_zero_connect/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ESP32Board board; @@ -20,6 +21,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index da27c2fab..41cd725b7 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -27,6 +27,7 @@ build_flags = ${nrf52_base.build_flags} build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/promicro> + + lib_deps= ${nrf52_base.lib_deps} adafruit/Adafruit SSD1306 @ ^2.5.13 adafruit/Adafruit INA3221 Library @ ^1.0.1 @@ -43,8 +44,10 @@ build_src_filter = ${Promicro.build_src_filter} +<../examples/simple_repeater> + + + + build_flags = ${Promicro.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"ProMicro Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -63,8 +66,10 @@ build_src_filter = ${Promicro.build_src_filter} + + + + + build_flags = ${Promicro.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -87,7 +92,9 @@ build_src_filter = ${Promicro.build_src_filter} +<../examples/simple_room_server> + + + + build_flags = ${Promicro.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"ProMicro Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -117,7 +124,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -128,7 +135,7 @@ build_src_filter = ${Promicro.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -138,7 +145,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -152,7 +159,7 @@ build_src_filter = ${Promicro.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -165,7 +172,7 @@ build_flags = -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' - -D DISPLAY_CLASS=SSD1306Display +; -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Promicro.build_src_filter} diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp index 5758d9cda..cebfc22b8 100644 --- a/variants/promicro/target.cpp +++ b/variants/promicro/target.cpp @@ -22,6 +22,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/promicro/target.h b/variants/promicro/target.h index e577ab4e9..8a953a919 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/target.h @@ -9,6 +9,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif #include @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini index d181388b0..2146a6b2e 100644 --- a/variants/rak3112/platformio.ini +++ b/variants/rak3112/platformio.ini @@ -133,7 +133,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -141,7 +141,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -150,7 +150,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -164,7 +164,7 @@ build_src_filter = ${rak3112.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -173,7 +173,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -187,7 +187,7 @@ build_src_filter = ${rak3112.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/rak3112/target.cpp b/variants/rak3112/target.cpp index 9b1d11a01..34e9be588 100644 --- a/variants/rak3112/target.cpp +++ b/variants/rak3112/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/rak3112/target.h b/variants/rak3112/target.h index f93cd5399..0ce8e4fb3 100644 --- a/variants/rak3112/target.h +++ b/variants/rak3112/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern RAK3112Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini index d157e4b1d..97f1e6da9 100644 --- a/variants/rak3401/platformio.ini +++ b/variants/rak3401/platformio.ini @@ -18,6 +18,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + + + + + lib_deps = ${nrf52_base.lib_deps} ${sensor_base.lib_deps} @@ -28,6 +29,7 @@ lib_deps = extends = rak3401 build_flags = ${rak3401.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"RAK3401 1W Repeater"' -D ADVERT_LAT=0.0 @@ -39,11 +41,13 @@ build_flags = build_src_filter = ${rak3401.build_src_filter} + +<../examples/simple_repeater> + + [env:RAK_3401_room_server] extends = rak3401 build_flags = ${rak3401.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=SSD1306Display -D ADVERT_NAME='"Test Room"' -D ADVERT_LAT=0.0 @@ -55,6 +59,7 @@ build_flags = build_src_filter = ${rak3401.build_src_filter} + +<../examples/simple_room_server> + + [env:RAK_3401_companion_radio_usb] extends = rak3401 @@ -62,7 +67,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -72,7 +77,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -83,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -96,7 +101,7 @@ build_flags = build_src_filter = ${rak3401.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/rak3401/target.cpp b/variants/rak3401/target.cpp index a9316558d..cc71cbcfa 100644 --- a/variants/rak3401/target.cpp +++ b/variants/rak3401/target.cpp @@ -17,6 +17,7 @@ RAK3401Board board; #if defined(PIN_USER_BTN_ANA) MomentaryButton analog_btn(PIN_USER_BTN_ANA, 1000, 20); #endif + UITask ui_task(&board, &display); #endif RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/rak3401/target.h b/variants/rak3401/target.h index 00653e90e..e235eca04 100644 --- a/variants/rak3401/target.h +++ b/variants/rak3401/target.h @@ -16,6 +16,8 @@ #if defined(PIN_USER_BTN_ANA) extern MomentaryButton analog_btn; #endif + #include + extern UITask ui_task; #endif extern RAK3401Board board; diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index c5d94d51f..eaf73c7b0 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -31,6 +31,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + + + + + lib_deps = ${nrf52_base.lib_deps} ${sensor_base.lib_deps} @@ -43,6 +44,7 @@ lib_deps = extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"RAK4631 Repeater"' -D ADVERT_LAT=0.0 @@ -54,6 +56,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_repeater> + + ; Lets `gps off`, periodic mode and shutdown cut the power to a serial GPS (RAK12501). ; WB_IO2 switches the shared 3V3_S slot rail, so this also powers down any other slot module. @@ -67,6 +70,7 @@ build_flags = extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"RAK4631 Repeater"' -D ADVERT_LAT=0.0 @@ -78,6 +82,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -86,6 +91,7 @@ lib_deps = extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 @@ -104,11 +110,13 @@ build_src_filter = ${rak4631.build_src_filter} + + +<../examples/simple_repeater> + + [env:RAK_4631_repeater_bridge_rs232_serial2] extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"RS232 Bridge"' -D ADVERT_LAT=0.0 @@ -127,11 +135,13 @@ build_src_filter = ${rak4631.build_src_filter} + + +<../examples/simple_repeater> + + [env:RAK_4631_room_server] extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"Test Room"' -D ADVERT_LAT=0.0 @@ -143,11 +153,13 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_room_server> + + [env:RAK_4631_room_server_ethernet] extends = rak4631 build_flags = ${rak4631.build_flags} + -I src/helpers/ui/server -D DISPLAY_CLASS=AutoDetectDisplay -D ADVERT_NAME='"RAK4631 Room Server"' -D ADVERT_LAT=0.0 @@ -159,6 +171,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + +<../examples/simple_room_server> + + lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -169,7 +182,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=AutoDetectDisplay @@ -180,7 +193,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -194,7 +207,7 @@ build_unflags = -D EXTRAFS=1 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=AutoDetectDisplay @@ -208,7 +221,7 @@ build_flags = ; -D ETHERNET_DEBUG_LOGGING=1 build_src_filter = ${rak4631.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + + + lib_deps = @@ -223,7 +236,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=AutoDetectDisplay @@ -237,7 +250,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/rak4631/target.cpp b/variants/rak4631/target.cpp index 813cb807f..385dcec22 100644 --- a/variants/rak4631/target.cpp +++ b/variants/rak4631/target.cpp @@ -15,6 +15,7 @@ RAK4631Board board; #if defined(PIN_USER_BTN_ANA) MomentaryButton analog_btn(PIN_USER_BTN_ANA, 1000, 20); #endif + UITask ui_task(&board, &display); #endif RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h index c04cd4e48..1cc6f30a3 100644 --- a/variants/rak4631/target.h +++ b/variants/rak4631/target.h @@ -16,6 +16,8 @@ #if defined(PIN_USER_BTN_ANA) extern MomentaryButton analog_btn; #endif + #include + extern UITask ui_task; #endif extern RAK4631Board board; diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini index d61401871..56395cb04 100644 --- a/variants/rak_wismesh_tag/platformio.ini +++ b/variants/rak_wismesh_tag/platformio.ini @@ -18,7 +18,6 @@ build_flags = ${nrf52_base.build_flags} -D P_LORA_MOSI=PIN_SPI_MOSI -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper - -D DISPLAY_CLASS=NullDisplayDriver -D LORA_TX_POWER=22 -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 @@ -68,7 +67,8 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig + -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -77,7 +77,7 @@ build_flags = build_src_filter = ${rak_wismesh_tag.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -89,7 +89,8 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig + -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -102,7 +103,7 @@ build_src_filter = ${rak_wismesh_tag.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/rak_wismesh_tag/target.cpp b/variants/rak_wismesh_tag/target.cpp index 3e80ae639..364e33c35 100644 --- a/variants/rak_wismesh_tag/target.cpp +++ b/variants/rak_wismesh_tag/target.cpp @@ -11,6 +11,7 @@ RAKWismeshTagBoard board; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/rak_wismesh_tag/target.h b/variants/rak_wismesh_tag/target.h index fbe18d2d1..3d2f9fc11 100644 --- a/variants/rak_wismesh_tag/target.h +++ b/variants/rak_wismesh_tag/target.h @@ -13,6 +13,8 @@ extern DISPLAY_CLASS display; #include extern MomentaryButton user_btn; + #include + extern UITask ui_task; #endif extern RAKWismeshTagBoard board; diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini index a5952d6e3..280e3a534 100644 --- a/variants/sensecap_indicator-espnow/platformio.ini +++ b/variants/sensecap_indicator-espnow/platformio.ini @@ -36,14 +36,14 @@ lib_deps=${esp32_base.lib_deps} extends = SenseCapIndicator-ESPNow build_flags = ${SenseCapIndicator-ESPNow.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter} - +<../examples/companion_radio/ui-new/*.cpp> + + +<../examples/companion_radio/*.cpp> lib_deps = ${SenseCapIndicator-ESPNow.lib_deps} diff --git a/variants/sensecap_indicator-espnow/target.cpp b/variants/sensecap_indicator-espnow/target.cpp index 4895447c0..1bd46dd66 100644 --- a/variants/sensecap_indicator-espnow/target.cpp +++ b/variants/sensecap_indicator-espnow/target.cpp @@ -20,6 +20,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef PIN_USER_BTN MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); #endif + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/sensecap_indicator-espnow/target.h b/variants/sensecap_indicator-espnow/target.h index dab4575e5..206d0e688 100644 --- a/variants/sensecap_indicator-espnow/target.h +++ b/variants/sensecap_indicator-espnow/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include "SCIndicatorDisplay.h" #include + #include #endif extern ESP32Board board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index c4fd344dd..66e58ccb8 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -37,6 +37,7 @@ build_src_filter = ${esp32_base.build_src_filter} + + + + + lib_deps = ${esp32_base.lib_deps} ${sensor_base.lib_deps} @@ -47,6 +48,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G2 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -56,6 +58,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -86,6 +89,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -98,6 +102,7 @@ build_flags = build_src_filter = ${Station_G2.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -106,6 +111,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G2 Logging Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -117,6 +123,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -148,6 +155,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -161,6 +169,7 @@ build_flags = build_src_filter = ${Station_G2.build_src_filter} + +<../examples/simple_repeater> + + lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -169,8 +178,10 @@ lib_deps = extends = Station_G2 build_src_filter = ${Station_G2.build_src_filter} +<../examples/simple_room_server> + + build_flags = ${Station_G2.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G2 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -186,7 +197,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -195,7 +206,7 @@ build_flags = build_src_filter = ${Station_G2.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -204,7 +215,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -215,7 +226,7 @@ build_flags = build_src_filter = ${Station_G2.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -224,7 +235,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -238,7 +249,7 @@ build_src_filter = ${Station_G2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -247,6 +258,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} + -U DISPLAY_CLASS -D ARDUINO_USB_MODE=1 build_src_filter = ${Station_G2.build_src_filter} +<../examples/kiss_modem/> diff --git a/variants/station_g2/target.cpp b/variants/station_g2/target.cpp index f5365eb58..2cdee0ff6 100644 --- a/variants/station_g2/target.cpp +++ b/variants/station_g2/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/station_g2/target.h b/variants/station_g2/target.h index b4eadbba3..963f4619d 100644 --- a/variants/station_g2/target.h +++ b/variants/station_g2/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern StationG2Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini index 2ce8bb392..dab6c911f 100644 --- a/variants/station_g3_esp32/platformio.ini +++ b/variants/station_g3_esp32/platformio.ini @@ -40,6 +40,7 @@ build_src_filter = ${esp32_base.build_src_filter} + + + + + lib_deps = ${esp32_base.lib_deps} ${sensor_base.lib_deps} @@ -50,6 +51,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G3 ESP32 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -59,6 +61,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -67,6 +70,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G3 ESP32 Logging Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -76,6 +80,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} +<../examples/simple_repeater> + + lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -84,8 +89,10 @@ lib_deps = extends = Station_G3_ESP32 build_src_filter = ${Station_G3_ESP32.build_src_filter} +<../examples/simple_room_server> + + build_flags = ${Station_G3_ESP32.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"Station G3 ESP32 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -101,7 +108,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE @@ -110,7 +117,7 @@ build_flags = build_src_filter = ${Station_G3_ESP32.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -119,7 +126,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -130,7 +137,7 @@ build_flags = build_src_filter = ${Station_G3_ESP32.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -139,7 +146,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -153,12 +160,15 @@ build_src_filter = ${Station_G3_ESP32.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Station_G3_ESP32_kiss_modem] extends = Station_G3_ESP32 +build_flags = + ${Station_G3_ESP32.build_flags} + -U DISPLAY_CLASS build_src_filter = ${Station_G3_ESP32.build_src_filter} +<../examples/kiss_modem/> diff --git a/variants/station_g3_esp32/target.cpp b/variants/station_g3_esp32/target.cpp index 189169d21..da6523686 100644 --- a/variants/station_g3_esp32/target.cpp +++ b/variants/station_g3_esp32/target.cpp @@ -27,6 +27,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/station_g3_esp32/target.h b/variants/station_g3_esp32/target.h index b67349dcb..4bc3fc1ca 100644 --- a/variants/station_g3_esp32/target.h +++ b/variants/station_g3_esp32/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern StationG3Board board; @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index ab8b0de0b..766229d46 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -38,7 +38,7 @@ upload_protocol = nrfutil [env:t1000e_repeater] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ADVERT_NAME='"t1000-e Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -54,7 +54,7 @@ lib_deps = ${t1000-e.lib_deps} [env:t1000e_room_server] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ADVERT_NAME='"t1000-e Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -73,7 +73,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -87,7 +87,7 @@ build_src_filter = ${t1000-e.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -98,7 +98,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -117,7 +117,7 @@ build_src_filter = ${t1000-e.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp index 609c32bc7..a9db46ade 100644 --- a/variants/t1000-e/target.cpp +++ b/variants/t1000-e/target.cpp @@ -17,6 +17,7 @@ T1000SensorManager sensors(nmea, gps_driver); #ifdef DISPLAY_CLASS NullDisplayDriver display; + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index 68508bcb5..e6eea9180 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -10,6 +10,7 @@ #include #ifdef DISPLAY_CLASS #include "NullDisplayDriver.h" + #include #endif class AirohaGpsDriver; @@ -36,6 +37,7 @@ public: #ifdef DISPLAY_CLASS extern NullDisplayDriver display; + extern UITask ui_task; #endif extern T1000eBoard board; diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index ae00d28ea..8be7e19c5 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -85,7 +85,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -105,7 +105,7 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -120,7 +120,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_ROTATION=4 @@ -135,7 +135,7 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/thinknode_m1/target.cpp b/variants/thinknode_m1/target.cpp index 4183c514f..d29d13b4c 100644 --- a/variants/thinknode_m1/target.cpp +++ b/variants/thinknode_m1/target.cpp @@ -20,6 +20,7 @@ ThinkNodeM1SensorManager sensors = ThinkNodeM1SensorManager(nmea); DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); MomentaryButton backlight_btn(BACKLIGHT_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h index 9c8a6e80f..08cb9a569 100644 --- a/variants/thinknode_m1/target.h +++ b/variants/thinknode_m1/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif class ThinkNodeM1SensorManager : public SensorManager { @@ -39,6 +40,7 @@ extern ThinkNodeM1SensorManager sensors; extern DISPLAY_CLASS display; extern MomentaryButton user_btn; extern MomentaryButton backlight_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index 862c71543..089c1f0a3 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -24,7 +24,6 @@ build_flags = ${esp32_base.build_flags} -D SX126X_DIO2_AS_RF_SWITCH=true -D SX126X_DIO3_TCXO_VOLTAGE=3.3 -D SX126X_CURRENT_LIMIT=140 - -D DISPLAY_CLASS=SH1106Display -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -132,7 +131,8 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new + -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -145,7 +145,7 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,8 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new + -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -165,7 +166,7 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -175,8 +176,9 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE + -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -189,7 +191,7 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -199,7 +201,8 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new + -D DISPLAY_CLASS=SH1106Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=43 @@ -211,7 +214,7 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/thinknode_m2/target.cpp b/variants/thinknode_m2/target.cpp index ff0dd6cf4..9ea042ba7 100644 --- a/variants/thinknode_m2/target.cpp +++ b/variants/thinknode_m2/target.cpp @@ -19,6 +19,7 @@ SensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/thinknode_m2/target.h b/variants/thinknode_m2/target.h index 37ede89e5..6928036d1 100644 --- a/variants/thinknode_m2/target.h +++ b/variants/thinknode_m2/target.h @@ -11,6 +11,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ThinknodeM2Board board; @@ -21,6 +22,7 @@ extern SensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini index ce1e7e59e..791f45735 100644 --- a/variants/thinknode_m3/platformio.ini +++ b/variants/thinknode_m3/platformio.ini @@ -39,7 +39,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:ThinkNode_M3_repeater] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ADVERT_NAME='"ThinkNode_M3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -55,7 +55,7 @@ lib_deps = ${ThinkNode_M3.lib_deps} [env:ThinkNode_M3_room_server] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ADVERT_NAME='"ThinkNode_M3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -74,7 +74,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -88,7 +88,7 @@ build_src_filter = ${ThinkNode_M3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -99,7 +99,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -115,7 +115,7 @@ build_src_filter = ${ThinkNode_M3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/thinknode_m3/target.cpp b/variants/thinknode_m3/target.cpp index bb5746cac..f9f5ed71d 100644 --- a/variants/thinknode_m3/target.cpp +++ b/variants/thinknode_m3/target.cpp @@ -20,6 +20,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS NullDisplayDriver display; + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/thinknode_m3/target.h b/variants/thinknode_m3/target.h index f2d34328d..8026f53b4 100644 --- a/variants/thinknode_m3/target.h +++ b/variants/thinknode_m3/target.h @@ -11,10 +11,12 @@ #include #ifdef DISPLAY_CLASS #include "NullDisplayDriver.h" + #include #endif #ifdef DISPLAY_CLASS extern NullDisplayDriver display; + extern UITask ui_task; #endif extern ThinkNodeM3Board board; diff --git a/variants/thinknode_m4/platformio.ini b/variants/thinknode_m4/platformio.ini index 06762f88d..a69d9303e 100644 --- a/variants/thinknode_m4/platformio.ini +++ b/variants/thinknode_m4/platformio.ini @@ -40,7 +40,6 @@ lib_deps= ${nrf52_base.lib_deps} [env:ThinkNode_M4_repeater] extends = ThinkNode_M4 build_flags = ${ThinkNode_M4.build_flags} - -I examples/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M4 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -56,7 +55,6 @@ lib_deps = ${ThinkNode_M4.lib_deps} [env:ThinkNode_M4_room_server] extends = ThinkNode_M4 build_flags = ${ThinkNode_M4.build_flags} - -I examples/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M4 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -75,7 +73,7 @@ extends = ThinkNode_M4 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M4.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -89,7 +87,7 @@ build_src_filter = ${ThinkNode_M4.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M4.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -100,7 +98,7 @@ extends = ThinkNode_M4 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M4.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -116,7 +114,7 @@ build_src_filter = ${ThinkNode_M4.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M4.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/thinknode_m4/target.cpp b/variants/thinknode_m4/target.cpp index 59a898f54..fc3431695 100644 --- a/variants/thinknode_m4/target.cpp +++ b/variants/thinknode_m4/target.cpp @@ -20,6 +20,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS NullDisplayDriver display; + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/thinknode_m4/target.h b/variants/thinknode_m4/target.h index 1135f5e89..922cc18e1 100644 --- a/variants/thinknode_m4/target.h +++ b/variants/thinknode_m4/target.h @@ -11,10 +11,12 @@ #include #ifdef DISPLAY_CLASS #include "NullDisplayDriver.h" + #include #endif #ifdef DISPLAY_CLASS extern NullDisplayDriver display; + extern UITask ui_task; #endif extern ThinkNodeM4Board board; diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini index ad7e6902c..f689a8e0e 100644 --- a/variants/thinknode_m6/platformio.ini +++ b/variants/thinknode_m6/platformio.ini @@ -78,7 +78,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -103,7 +103,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 diff --git a/variants/thinknode_m6/target.cpp b/variants/thinknode_m6/target.cpp index 061f7ad4c..2d936d07c 100644 --- a/variants/thinknode_m6/target.cpp +++ b/variants/thinknode_m6/target.cpp @@ -22,6 +22,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/thinknode_m6/target.h b/variants/thinknode_m6/target.h index 76188e584..6b9a751cc 100644 --- a/variants/thinknode_m6/target.h +++ b/variants/thinknode_m6/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ThinkNodeM6Board board; @@ -22,6 +23,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/thinknode_m7/platformio.ini b/variants/thinknode_m7/platformio.ini index 128b12441..7a6906b38 100644 --- a/variants/thinknode_m7/platformio.ini +++ b/variants/thinknode_m7/platformio.ini @@ -92,7 +92,7 @@ extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} ${ThinkNode_M7_ethernet.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -108,7 +108,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M7.lib_deps} ${ThinkNode_M7_ethernet.lib_deps} @@ -118,7 +118,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -127,7 +127,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -136,7 +136,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -152,7 +152,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -162,7 +162,7 @@ extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} ${ThinkNode_M7_ethernet.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=NullDisplayDriver @@ -173,7 +173,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${ThinkNode_M7.lib_deps} ${ThinkNode_M7_ethernet.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/thinknode_m7/target.cpp b/variants/thinknode_m7/target.cpp index 8e7e8a05a..80825abc1 100644 --- a/variants/thinknode_m7/target.cpp +++ b/variants/thinknode_m7/target.cpp @@ -21,6 +21,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; + UITask ui_task(&board, &display); #endif #ifdef RF_SWITCH_TABLE diff --git a/variants/thinknode_m7/target.h b/variants/thinknode_m7/target.h index 34213f57c..7aa954211 100644 --- a/variants/thinknode_m7/target.h +++ b/variants/thinknode_m7/target.h @@ -11,6 +11,7 @@ #include #ifdef DISPLAY_CLASS #include "NullDisplayDriver.h" + #include #endif extern ThinkNodeM7Board board; @@ -20,6 +21,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern NullDisplayDriver display; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/thinknode_m8/platformio.ini b/variants/thinknode_m8/platformio.ini index 2f8fb9e55..becd34dd7 100644 --- a/variants/thinknode_m8/platformio.ini +++ b/variants/thinknode_m8/platformio.ini @@ -91,7 +91,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M8.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -112,7 +112,7 @@ build_src_filter = ${ThinkNode_M8.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M8.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -127,7 +127,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M8.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_ROTATION=4 @@ -143,7 +143,7 @@ build_src_filter = ${ThinkNode_M8.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M8.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/thinknode_m8/target.cpp b/variants/thinknode_m8/target.cpp index 04496d3fc..e4497ffe8 100644 --- a/variants/thinknode_m8/target.cpp +++ b/variants/thinknode_m8/target.cpp @@ -25,6 +25,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); MomentaryButton user_btn(PIN_USER_BTN, 1000, true); RotaryInputGPIO rotary_input(PIN_BUTTON1_A, PIN_BUTTON1_B); MomentaryButton backlight_btn(BACKLIGHT_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/thinknode_m8/target.h b/variants/thinknode_m8/target.h index 399285065..39ad6bec9 100644 --- a/variants/thinknode_m8/target.h +++ b/variants/thinknode_m8/target.h @@ -13,6 +13,7 @@ #include #include #include + #include #endif extern ThinkNodeM8Board board; @@ -25,6 +26,7 @@ extern EnvironmentSensorManager sensors; extern MomentaryButton user_btn; extern MomentaryButton backlight_btn; extern RotaryInputGPIO rotary_input; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/thinknode_m9/platformio.ini b/variants/thinknode_m9/platformio.ini index d4983491d..c718fe94f 100755 --- a/variants/thinknode_m9/platformio.ini +++ b/variants/thinknode_m9/platformio.ini @@ -94,7 +94,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -106,7 +106,7 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -116,7 +116,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -126,7 +126,7 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -136,7 +136,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -151,7 +151,7 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/thinknode_m9/target.cpp b/variants/thinknode_m9/target.cpp index 990f0388a..aa1cc5b9b 100644 --- a/variants/thinknode_m9/target.cpp +++ b/variants/thinknode_m9/target.cpp @@ -20,6 +20,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; + UITask ui_task(&board, &display); #endif #ifdef RF_SWITCH_TABLE diff --git a/variants/thinknode_m9/target.h b/variants/thinknode_m9/target.h index f083a9f1b..d249d16bb 100644 --- a/variants/thinknode_m9/target.h +++ b/variants/thinknode_m9/target.h @@ -12,6 +12,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ThinkNodeM9Board board; @@ -22,6 +23,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini index 021c7db20..8149b8e0a 100644 --- a/variants/wio-e5-mini/platformio.ini +++ b/variants/wio-e5-mini/platformio.ini @@ -39,7 +39,7 @@ build_src_filter = ${lora_e5_mini.build_src_filter} [env:wio-e5-mini_companion_radio_usb] extends = lora_e5_mini build_flags = ${lora_e5_mini.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig -D LORA_TX_POWER=22 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 @@ -48,7 +48,7 @@ build_flags = ${lora_e5_mini.build_flags} build_src_filter = ${lora_e5_mini.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${lora_e5_mini.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/wio-e5-mini/target.cpp b/variants/wio-e5-mini/target.cpp index 92775d551..9366cf81d 100644 --- a/variants/wio-e5-mini/target.cpp +++ b/variants/wio-e5-mini/target.cpp @@ -22,6 +22,7 @@ WIOE5SensorManager sensors; #ifdef DISPLAY_CLASS NullDisplayDriver display; + UITask ui_task(&board, &display); #endif #ifndef LORA_CR diff --git a/variants/wio-e5-mini/target.h b/variants/wio-e5-mini/target.h index f4d6a0884..fdb0ab542 100644 --- a/variants/wio-e5-mini/target.h +++ b/variants/wio-e5-mini/target.h @@ -9,6 +9,7 @@ #include #ifdef DISPLAY_CLASS #include + #include #endif #include @@ -16,6 +17,7 @@ #ifdef DISPLAY_CLASS extern NullDisplayDriver display; + extern UITask ui_task; #endif class WIOE5Board : public STM32Board { diff --git a/variants/wio-tracker-l1-1w/platformio.ini b/variants/wio-tracker-l1-1w/platformio.ini index 7d3c2dc39..db58c8039 100644 --- a/variants/wio-tracker-l1-1w/platformio.ini +++ b/variants/wio-tracker-l1-1w/platformio.ini @@ -30,8 +30,10 @@ lib_deps= ${nrf52_base.lib_deps} extends = WioTrackerL1-1W build_src_filter = ${WioTrackerL1-1W.build_src_filter} +<../examples/simple_repeater> + + build_flags = ${WioTrackerL1-1W.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"WioTrackerL1 Repeater"' -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 @@ -45,7 +47,9 @@ lib_deps = ${WioTrackerL1-1W.lib_deps} extends = WioTrackerL1-1W build_src_filter = ${WioTrackerL1-1W.build_src_filter} +<../examples/simple_room_server> + + build_flags = ${WioTrackerL1-1W.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"WioTrackerL1 Room"' -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' @@ -60,7 +64,7 @@ extends = WioTrackerL1-1W board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1-1W.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SH1106Display @@ -76,8 +80,7 @@ build_flags = ${WioTrackerL1-1W.build_flags} build_src_filter = ${WioTrackerL1-1W.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> - + + + + lib_deps = ${WioTrackerL1-1W.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -89,7 +92,7 @@ extends = WioTrackerL1-1W board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1-1W.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -111,7 +114,7 @@ build_src_filter = ${WioTrackerL1-1W.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${WioTrackerL1-1W.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 diff --git a/variants/wio-tracker-l1-1w/target.cpp b/variants/wio-tracker-l1-1w/target.cpp index cd4b8dac9..667add43e 100644 --- a/variants/wio-tracker-l1-1w/target.cpp +++ b/variants/wio-tracker-l1-1w/target.cpp @@ -26,6 +26,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false); MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false); MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/wio-tracker-l1-1w/target.h b/variants/wio-tracker-l1-1w/target.h index 05bc7ff1c..5bc9ad434 100644 --- a/variants/wio-tracker-l1-1w/target.h +++ b/variants/wio-tracker-l1-1w/target.h @@ -15,6 +15,7 @@ #include #endif #include + #include #endif #include @@ -28,6 +29,7 @@ extern EnvironmentSensorManager sensors; extern MomentaryButton joystick_left; extern MomentaryButton joystick_right; extern MomentaryButton back_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index 0b448a24b..a6cbf1f2a 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -44,7 +44,7 @@ extends = WioTrackerL1Eink board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1Eink.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -63,7 +63,7 @@ build_src_filter = ${WioTrackerL1Eink.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${WioTrackerL1Eink.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 19139c289..75d02e1f8 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -20,6 +20,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/wio-tracker-l1> + + + + lib_deps= ${nrf52_base.lib_deps} ${sensor_base.lib_deps} @@ -30,8 +31,10 @@ lib_deps= ${nrf52_base.lib_deps} extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} +<../examples/simple_repeater> + + build_flags = ${WioTrackerL1.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"WioTrackerL1 Repeater"' -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 @@ -45,7 +48,9 @@ lib_deps = ${WioTrackerL1.lib_deps} extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} +<../examples/simple_room_server> + + build_flags = ${WioTrackerL1.build_flags} + -I src/helpers/ui/server -D ADVERT_NAME='"WioTrackerL1 Room"' -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' @@ -60,7 +65,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SH1106Display @@ -75,7 +80,7 @@ build_flags = ${WioTrackerL1.build_flags} build_src_filter = ${WioTrackerL1.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + + + lib_deps = ${WioTrackerL1.lib_deps} @@ -88,7 +93,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -109,7 +114,7 @@ build_src_filter = ${WioTrackerL1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${WioTrackerL1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 diff --git a/variants/wio-tracker-l1/target.cpp b/variants/wio-tracker-l1/target.cpp index cd4b8dac9..667add43e 100644 --- a/variants/wio-tracker-l1/target.cpp +++ b/variants/wio-tracker-l1/target.cpp @@ -26,6 +26,7 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(); MomentaryButton joystick_left(JOYSTICK_LEFT, 1000, true, false, false); MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, false, false); MomentaryButton back_btn(PIN_BACK_BTN, 1000, true, false, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/wio-tracker-l1/target.h b/variants/wio-tracker-l1/target.h index 05bc7ff1c..5bc9ad434 100644 --- a/variants/wio-tracker-l1/target.h +++ b/variants/wio-tracker-l1/target.h @@ -15,6 +15,7 @@ #include #endif #include + #include #endif #include @@ -28,6 +29,7 @@ extern EnvironmentSensorManager sensors; extern MomentaryButton joystick_left; extern MomentaryButton joystick_right; extern MomentaryButton back_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index b40ebbc36..b9bdb5083 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -28,7 +28,6 @@ build_flags = ${nrf52_base.build_flags} -D PIN_WIRE_SCL=D6 -D PIN_WIRE_SDA=D7 -D PIN_USER_BTN=PIN_BUTTON1 - -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${nrf52_base.build_src_filter} + + @@ -45,7 +44,8 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig + -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -57,7 +57,7 @@ build_flags = build_src_filter = ${Xiao_nrf52.build_src_filter} + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -68,7 +68,8 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I examples/companion_radio/ui-orig + -I src/helpers/ui/companion-orig + -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -78,7 +79,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + + lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/xiao_nrf52/target.cpp b/variants/xiao_nrf52/target.cpp index def1dbbea..3c9b83957 100644 --- a/variants/xiao_nrf52/target.cpp +++ b/variants/xiao_nrf52/target.cpp @@ -5,6 +5,7 @@ #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); + UITask ui_task(&board, &display); #endif XiaoNrf52Board board; diff --git a/variants/xiao_nrf52/target.h b/variants/xiao_nrf52/target.h index 20093904a..f28dbc930 100644 --- a/variants/xiao_nrf52/target.h +++ b/variants/xiao_nrf52/target.h @@ -12,8 +12,11 @@ #ifdef DISPLAY_CLASS #include #include + #include + extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif extern XiaoNrf52Board board; diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini index b8ae79733..d55de0a47 100644 --- a/variants/xiao_s3/platformio.ini +++ b/variants/xiao_s3/platformio.ini @@ -94,7 +94,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -110,7 +110,7 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -120,7 +120,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -134,7 +134,7 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/xiao_s3/target.cpp b/variants/xiao_s3/target.cpp index a7ae7dd8e..7d4bc9e84 100644 --- a/variants/xiao_s3/target.cpp +++ b/variants/xiao_s3/target.cpp @@ -19,6 +19,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/xiao_s3/target.h b/variants/xiao_s3/target.h index 27eddd844..e351bcc15 100644 --- a/variants/xiao_s3/target.h +++ b/variants/xiao_s3/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif #include "XiaoS3Board.h" @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init(); diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 5a2ef1061..e2df413a0 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -131,7 +131,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -144,7 +144,7 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -154,7 +154,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -170,7 +170,7 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -180,7 +180,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -193,7 +193,7 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -207,14 +207,16 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + +<../examples/companion_radio/*.cpp> + + build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-orig -D ENABLE_WIFI_INTERFACE -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D WIFI_DEBUG_LOGGING=1 + -D DISPLAY_CLASS=NullDisplayDriver -D WIFI_SSID='"myssid"' -D WIFI_PWD='"password"' ; -D BLE_DEBUG_LOGGING=1 diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp index 8a975959f..79781dd5c 100644 --- a/variants/xiao_s3_wio/target.cpp +++ b/variants/xiao_s3_wio/target.cpp @@ -19,6 +19,7 @@ EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + UITask ui_task(&board, &display); #endif bool radio_init() { diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h index 29c5f2814..a5839534e 100644 --- a/variants/xiao_s3_wio/target.h +++ b/variants/xiao_s3_wio/target.h @@ -10,6 +10,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif #include "XiaoS3WIOBoard.h" @@ -21,6 +22,7 @@ extern EnvironmentSensorManager sensors; #ifdef DISPLAY_CLASS extern DISPLAY_CLASS display; extern MomentaryButton user_btn; + extern UITask ui_task; #endif bool radio_init();