diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index 1093efc1..57a33c17 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -322,7 +322,7 @@ void setup() { #endif #ifdef DISPLAY_CLASS - ui_task.begin(disp, &sensors, the_mesh.getNodePrefs(), &the_mesh, the_mesh.getBLEPin(), FIRMWARE_VERSION, FIRMWARE_BUILD_DATE); + ui_task.begin(disp, &sensors, the_mesh.getNodePrefs(), &interface_manager, &the_mesh, the_mesh.getBLEPin(), FIRMWARE_VERSION, FIRMWARE_BUILD_DATE); the_mesh.setListener(&ui_task); #ifdef EINK_REFRESH_LOOP if (disp != NULL) disp->setBusyHook(loopDuringDisplayRefresh); diff --git a/src/helpers/ui/AbstractUITask.h b/src/helpers/ui/AbstractUITask.h index fa2449a8..98343aa7 100644 --- a/src/helpers/ui/AbstractUITask.h +++ b/src/helpers/ui/AbstractUITask.h @@ -27,7 +27,7 @@ protected: mesh::MainBoard* _board; MultiSerialInterface* _interfaceManager; - AbstractUITask(mesh::MainBoard* board, MultiSerialInterface* interfaceManager) : _board(board), _interfaceManager(interfaceManager) { + AbstractUITask(mesh::MainBoard* board, MultiSerialInterface* interfaceManager = NULL) : _board(board), _interfaceManager(interfaceManager) { } public: diff --git a/src/helpers/ui/companion-new/UITask.cpp b/src/helpers/ui/companion-new/UITask.cpp index 714daa28..652fef94 100644 --- a/src/helpers/ui/companion-new/UITask.cpp +++ b/src/helpers/ui/companion-new/UITask.cpp @@ -787,9 +787,12 @@ public: } }; -void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) { +void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) +{ _display = display; _sensors = sensors; + _interfaceManager = serial; the_mesh = mesh; _ble_pin = ble_pin; diff --git a/src/helpers/ui/companion-new/UITask.h b/src/helpers/ui/companion-new/UITask.h index 288a8245..f6ee999b 100644 --- a/src/helpers/ui/companion-new/UITask.h +++ b/src/helpers/ui/companion-new/UITask.h @@ -93,12 +93,13 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { next_batt_chck = _next_refresh = 0; ui_started_at = 0; curr = NULL; } - void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); + void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); void gotoHomeScreen() { setCurrScreen(home); } void showAlert(const char* text, int duration_millis); diff --git a/src/helpers/ui/companion-orig/UITask.cpp b/src/helpers/ui/companion-orig/UITask.cpp index 144e4d60..2c5abff7 100644 --- a/src/helpers/ui/companion-orig/UITask.cpp +++ b/src/helpers/ui/companion-orig/UITask.cpp @@ -40,9 +40,12 @@ static const uint8_t meshcore_logo [] PROGMEM = { 0xe3, 0xe3, 0x8f, 0xff, 0x1f, 0xfc, 0x3c, 0x0e, 0x1f, 0xf8, 0xff, 0xf8, 0x70, 0x3c, 0x7f, 0xf8, }; -void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) { +void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) +{ _display = display; _sensors = sensors; + _interfaceManager = serial; the_mesh = mesh; _ble_pin = ble_pin; diff --git a/src/helpers/ui/companion-orig/UITask.h b/src/helpers/ui/companion-orig/UITask.h index 21070528..d5b59a54 100644 --- a/src/helpers/ui/companion-orig/UITask.h +++ b/src/helpers/ui/companion-orig/UITask.h @@ -63,11 +63,12 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { _next_refresh = 0; ui_started_at = 0; } - void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); + void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); bool hasDisplay() const { return _display != NULL; } void clearMsgPreview(); diff --git a/src/helpers/ui/companion-tiny/UITask.cpp b/src/helpers/ui/companion-tiny/UITask.cpp index f9f06aea..a26c50e0 100644 --- a/src/helpers/ui/companion-tiny/UITask.cpp +++ b/src/helpers/ui/companion-tiny/UITask.cpp @@ -453,10 +453,12 @@ public: } }; - -void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) { +void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date) +{ _display = display; _sensors = sensors; + _interfaceManager = serial; the_mesh = mesh; _ble_pin = ble_pin; _auto_off = millis() + AUTO_OFF_MILLIS; diff --git a/src/helpers/ui/companion-tiny/UITask.h b/src/helpers/ui/companion-tiny/UITask.h index ea581edb..7dce2a1a 100644 --- a/src/helpers/ui/companion-tiny/UITask.h +++ b/src/helpers/ui/companion-tiny/UITask.h @@ -74,13 +74,14 @@ class UITask : public AbstractUITask { public: - UITask(mesh::MainBoard* board, MultiSerialInterface* serial) : AbstractUITask(board, serial), _display(NULL), _sensors(NULL) { + UITask(mesh::MainBoard* board) : AbstractUITask(board), _display(NULL), _sensors(NULL) { next_batt_chck = _next_refresh = 0; _cached_batt_mv = 0; ui_started_at = 0; curr = NULL; } - void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); + void begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* node_prefs, MultiSerialInterface* serial, + BaseChatMesh* mesh, uint32_t ble_pin, const char* ver, const char* build_date); void gotoHomeScreen() { setCurrScreen(home); } void showAlert(const char* text, int duration_millis); diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index ef9ba10b..412b386e 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -151,7 +151,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.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 @@ -163,7 +163,6 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> +<../variants/heltec_v3/target-companion.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} @@ -200,7 +199,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.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 @@ -218,7 +217,6 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> +<../variants/heltec_v3/target-companion.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} diff --git a/variants/heltec_v3/target-companion.cpp b/variants/heltec_v3/target-companion.cpp index 3e31880c..c8b9f0c7 100644 --- a/variants/heltec_v3/target-companion.cpp +++ b/variants/heltec_v3/target-companion.cpp @@ -2,11 +2,8 @@ #include "target.h" #ifdef DISPLAY_CLASS - #include - extern MultiSerialInterface interface_manager; - DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); - UITask ui_task(&board, &interface_manager); + UITask ui_task(&board); #endif diff --git a/variants/lilygo_techo_card/target-companion.cpp b/variants/lilygo_techo_card/target-companion.cpp index 481a1a4f..af01d850 100644 --- a/variants/lilygo_techo_card/target-companion.cpp +++ b/variants/lilygo_techo_card/target-companion.cpp @@ -2,12 +2,9 @@ #include "target.h" #ifdef DISPLAY_CLASS - #include - extern MultiSerialInterface interface_manager; - DISPLAY_CLASS display; MomentaryButton user_btn(PIN_USER_BTN, 1000, true); MomentaryButton back_btn(PIN_BUTTON2, 1000, true); - UITask ui_task(&board, &interface_manager); + UITask ui_task(&board); #endif diff --git a/variants/meshtracker_x1/target-companion.cpp b/variants/meshtracker_x1/target-companion.cpp index ed46ebcc..aaa710e6 100644 --- a/variants/meshtracker_x1/target-companion.cpp +++ b/variants/meshtracker_x1/target-companion.cpp @@ -2,9 +2,6 @@ #include "target.h" #ifdef DISPLAY_CLASS - #include - extern MultiSerialInterface interface_manager; - NullDisplayDriver display; - UITask ui_task(&board, &interface_manager); + UITask ui_task(&board); #endif