* UITask constructors now with same params, so don't have to have separate target-* modules/dirs

This commit is contained in:
Scott Powell committed 2026-11-19 11:54:24 +11:00
1 parent 26ae484af8
commit 1ad8ca230a
13 files changed
+28 -46

No files matched your search

+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;
}
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;
+9 -9
View File
@@ -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>
+<helpers/ui/BaseUITask.cpp>
+<helpers/sensors>
lib_deps =
@@ -55,7 +55,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/server>
+<../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}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/server>
+<../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}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/server>
+<../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}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/server>
+<../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}
+<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/companion-new>
+<../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}
+<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../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}
+<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../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}
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/server>
+<../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}
@@ -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
@@ -1,10 +0,0 @@
#include <Arduino.h>
#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
@@ -1,10 +0,0 @@
#include <Arduino.h>
#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
+8
View File
@@ -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);
+1 -5
View File
@@ -31,9 +31,7 @@ build_flags = ${nrf52_base.build_flags}
-D ENV_INCLUDE_GPS=1
build_src_filter = ${nrf52_base.build_src_filter}
+<helpers/*.cpp>
+<../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}
+<helpers/ui/DRV2605Vibration.cpp>
+<helpers/ui/companion-orig>
+<../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}
+<helpers/ui/DRV2605Vibration.cpp>
+<helpers/ui/companion-orig>
+<../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
@@ -1,7 +0,0 @@
#include <Arduino.h>
#include "target.h"
#ifdef DISPLAY_CLASS
NullDisplayDriver display;
UITask ui_task(&board);
#endif
+5
View File
@@ -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);
}