diff --git a/src/helpers/ui/companion-new/UITask.h b/src/helpers/ui/companion-new/UITask.h index f6ee999b..a0f2398e 100644 --- a/src/helpers/ui/companion-new/UITask.h +++ b/src/helpers/ui/companion-new/UITask.h @@ -93,7 +93,7 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board, DisplayDriver* display = NULL) : AbstractUITask(board), _display(display), _sensors(NULL) { next_batt_chck = _next_refresh = 0; ui_started_at = 0; curr = NULL; diff --git a/src/helpers/ui/companion-orig/UITask.h b/src/helpers/ui/companion-orig/UITask.h index d5b59a54..1dc6ccb7 100644 --- a/src/helpers/ui/companion-orig/UITask.h +++ b/src/helpers/ui/companion-orig/UITask.h @@ -63,7 +63,7 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board, DisplayDriver* display = NULL) : AbstractUITask(board), _display(display), _sensors(NULL) { _next_refresh = 0; ui_started_at = 0; } diff --git a/src/helpers/ui/companion-tiny/UITask.h b/src/helpers/ui/companion-tiny/UITask.h index 7dce2a1a..c45b83b6 100644 --- a/src/helpers/ui/companion-tiny/UITask.h +++ b/src/helpers/ui/companion-tiny/UITask.h @@ -74,7 +74,7 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board, DisplayDriver* display = NULL) : AbstractUITask(board), _display(display), _sensors(NULL) { next_batt_chck = _next_refresh = 0; _cached_batt_mv = 0; ui_started_at = 0; diff --git a/src/helpers/ui/server/UITask.h b/src/helpers/ui/server/UITask.h index 57e649ac..6e3b4b49 100644 --- a/src/helpers/ui/server/UITask.h +++ b/src/helpers/ui/server/UITask.h @@ -16,7 +16,7 @@ protected: long renderCurrScreen() override; public: - UITask(mesh::MainBoard& board, DisplayDriver& display) : BaseUITask(&board, &display) { _next_read = 0; } + UITask(mesh::MainBoard* board, DisplayDriver* display) : BaseUITask(board, display) { _next_read = 0; } void begin(NodePrefs* node_prefs, const char* build_date, const char* firmware_version, const char* role_lbl); void loop() override; diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 412b386e..95629b41 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -31,7 +31,7 @@ build_flags = -D PIN_GPS_TX=48 -D PIN_GPS_EN=26 build_src_filter = ${esp32_base.build_src_filter} - +<../variants/heltec_v3/target.cpp> + +<../variants/heltec_v3/*.cpp> + + lib_deps = @@ -55,7 +55,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/simple_repeater> - +<../variants/heltec_v3/target-other.cpp> + +<../variants/heltec_v3/ui-other/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -82,7 +82,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/simple_repeater> - +<../variants/heltec_v3/target-other.cpp> + +<../variants/heltec_v3/ui-other/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -106,7 +106,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/simple_repeater> - +<../variants/heltec_v3/target-other.cpp> + +<../variants/heltec_v3/ui-other/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -128,7 +128,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/simple_room_server> - +<../variants/heltec_v3/target-other.cpp> + +<../variants/heltec_v3/ui-other/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -163,7 +163,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../variants/heltec_v3/target-companion.cpp> + +<../variants/heltec_v3/ui-companion/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -190,7 +190,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../variants/heltec_v3/target-companion.cpp> + +<../variants/heltec_v3/ui-companion/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -217,7 +217,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../variants/heltec_v3/target-companion.cpp> + +<../variants/heltec_v3/ui-companion/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -240,7 +240,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/simple_sensor> - +<../variants/heltec_v3/target-other.cpp> + +<../variants/heltec_v3/ui-other/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/heltec_v3/target-companion.cpp b/variants/heltec_v3/ui-companion/target.cpp similarity index 100% rename from variants/heltec_v3/target-companion.cpp rename to variants/heltec_v3/ui-companion/target.cpp diff --git a/variants/heltec_v3/target-other.cpp b/variants/heltec_v3/ui-other/target.cpp similarity index 80% rename from variants/heltec_v3/target-other.cpp rename to variants/heltec_v3/ui-other/target.cpp index bccc29b0..77de9788 100644 --- a/variants/heltec_v3/target-other.cpp +++ b/variants/heltec_v3/ui-other/target.cpp @@ -5,5 +5,5 @@ DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); - UITask ui_task(board, display); + UITask ui_task(&board, &display); #endif diff --git a/variants/lilygo_techo_card/target-companion.cpp b/variants/lilygo_techo_card/target-companion.cpp deleted file mode 100644 index af01d850..00000000 --- a/variants/lilygo_techo_card/target-companion.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "target.h" - -#ifdef DISPLAY_CLASS - DISPLAY_CLASS display; - MomentaryButton user_btn(PIN_USER_BTN, 1000, true); - MomentaryButton back_btn(PIN_BUTTON2, 1000, true); - UITask ui_task(&board); -#endif - diff --git a/variants/lilygo_techo_card/target-other.cpp b/variants/lilygo_techo_card/target-other.cpp deleted file mode 100644 index 0522b18e..00000000 --- a/variants/lilygo_techo_card/target-other.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "target.h" - -#ifdef DISPLAY_CLASS - DISPLAY_CLASS display; - MomentaryButton user_btn(PIN_USER_BTN, 1000, true); - MomentaryButton back_btn(PIN_BUTTON2, 1000, true); - - UITask ui_task(board, display); -#endif diff --git a/variants/lilygo_techo_card/target.cpp b/variants/lilygo_techo_card/target.cpp index 6d1e1510..b3375dbb 100644 --- a/variants/lilygo_techo_card/target.cpp +++ b/variants/lilygo_techo_card/target.cpp @@ -20,6 +20,14 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); EnvironmentSensorManager sensors = EnvironmentSensorManager(); #endif +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; + MomentaryButton user_btn(PIN_USER_BTN, 1000, true); + MomentaryButton back_btn(PIN_BUTTON2, 1000, true); + + UITask ui_task(&board, &display); +#endif + bool radio_init() { rtc_clock.begin(Wire); diff --git a/variants/meshtracker_x1/platformio.ini b/variants/meshtracker_x1/platformio.ini index 51a52778..fa8cc4ba 100644 --- a/variants/meshtracker_x1/platformio.ini +++ b/variants/meshtracker_x1/platformio.ini @@ -31,9 +31,7 @@ build_flags = ${nrf52_base.build_flags} -D ENV_INCLUDE_GPS=1 build_src_filter = ${nrf52_base.build_src_filter} + - +<../variants/meshtracker_x1/MeshTrackerX1Board.cpp> - +<../variants/meshtracker_x1/target.cpp> - +<../variants/meshtracker_x1/variant.cpp> + +<../variants/meshtracker_x1/*.cpp> lib_deps = ${nrf52_base.lib_deps} https://github.com/adafruit/Adafruit_SPA06_003/archive/refs/tags/1.0.2.zip stevemarple/MicroNMEA @ ^2.0.6 @@ -91,7 +89,6 @@ build_src_filter = ${MeshTracker_X1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../variants/meshtracker_x1/target-companion.cpp> lib_deps = ${MeshTracker_X1.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -124,7 +121,6 @@ build_src_filter = ${MeshTracker_X1.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../variants/meshtracker_x1/target-companion.cpp> lib_deps = ${MeshTracker_X1.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 diff --git a/variants/meshtracker_x1/target-companion.cpp b/variants/meshtracker_x1/target-companion.cpp deleted file mode 100644 index aaa710e6..00000000 --- a/variants/meshtracker_x1/target-companion.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "target.h" - -#ifdef DISPLAY_CLASS - NullDisplayDriver display; - UITask ui_task(&board); -#endif diff --git a/variants/meshtracker_x1/target.cpp b/variants/meshtracker_x1/target.cpp index 2c1703bc..daba0619 100644 --- a/variants/meshtracker_x1/target.cpp +++ b/variants/meshtracker_x1/target.cpp @@ -14,6 +14,11 @@ AirohaGpsDriver gps_driver(Serial1); MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); MeshTrackerX1SensorManager sensors = MeshTrackerX1SensorManager(nmea); +#ifdef DISPLAY_CLASS + NullDisplayDriver display; + UITask ui_task(&board, &display); +#endif + bool radio_init() { return radio.std_init(&SPI); }