From 8fae584dfa322f5ed54fa9ef7dcc83e0d1b65ce1 Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Thu, 19 Nov 2026 12:05:14 +1100 Subject: [PATCH] * thinknode_m5: simplified the target.* modules --- variants/thinknode_m5/platformio.ini | 17 +++++------------ variants/thinknode_m5/target-companion.cpp | 10 ---------- variants/thinknode_m5/target-other.cpp | 10 ---------- variants/thinknode_m5/target.cpp | 8 ++++++++ 4 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 variants/thinknode_m5/target-companion.cpp delete mode 100644 variants/thinknode_m5/target-other.cpp diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index 8e0a602e5..e4dfdc616 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -49,8 +49,7 @@ build_src_filter = ${esp32_base.build_src_filter} + + + - +<../variants/thinknode_m5/target.cpp> - +<../variants/thinknode_m5/ThinknodeM5Board.cpp> + +<../variants/thinknode_m5/*.cpp> lib_deps = ${esp32_base.lib_deps} zinggjm/GxEPD2 @ 1.6.2 bakercp/CRC32 @ ^2.0.0 @@ -61,7 +60,6 @@ lib_deps = ${esp32_base.lib_deps} extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/simple_repeater/*.cpp> - +<../variants/thinknode_m5/target-other.cpp> + build_flags = ${ThinkNode_M5.build_flags} @@ -104,7 +102,6 @@ extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} + +<../examples/simple_repeater/*.cpp> - +<../variants/thinknode_m5/target-other.cpp> + build_flags = ${ThinkNode_M5.build_flags} @@ -127,7 +124,6 @@ lib_deps = extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/simple_room_server> - +<../variants/thinknode_m5/target-other.cpp> + build_flags = ${ThinkNode_M5.build_flags} @@ -162,6 +158,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -170,10 +167,8 @@ build_flags = ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D GPS_NMEA_DEBUG - -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../variants/thinknode_m5/target-companion.cpp> + + + @@ -187,7 +182,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.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 @@ -197,7 +192,6 @@ build_flags = -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../variants/thinknode_m5/target-companion.cpp> + + + @@ -212,7 +206,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.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 @@ -224,7 +218,6 @@ build_flags = -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/companion_radio/*.cpp> - +<../variants/thinknode_m5/target-companion.cpp> + + + @@ -239,7 +232,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new + -I src/helpers/ui/companion-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=D6 diff --git a/variants/thinknode_m5/target-companion.cpp b/variants/thinknode_m5/target-companion.cpp deleted file mode 100644 index 5d64b0c4a..000000000 --- a/variants/thinknode_m5/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 backlight_btn(BACKLIGHT_BTN, 1000, true); - - UITask ui_task(&board); -#endif \ No newline at end of file diff --git a/variants/thinknode_m5/target-other.cpp b/variants/thinknode_m5/target-other.cpp deleted file mode 100644 index 734263ef8..000000000 --- a/variants/thinknode_m5/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 backlight_btn(BACKLIGHT_BTN, 1000, true); - - UITask ui_task(board, display); -#endif diff --git a/variants/thinknode_m5/target.cpp b/variants/thinknode_m5/target.cpp index 5c1d001be..493ce8445 100644 --- a/variants/thinknode_m5/target.cpp +++ b/variants/thinknode_m5/target.cpp @@ -24,6 +24,14 @@ EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); EnvironmentSensorManager sensors = EnvironmentSensorManager(); #endif +#ifdef DISPLAY_CLASS + 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() { fallback_clock.begin(); rtc_clock.begin(Wire);