From dcbd324022bbffff1d849ccf77b72f3a33de3492 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 18 Nov 2026 11:35:08 -0400 Subject: [PATCH] ui-task: apply refactoring on thinknode_m5 --- variants/thinknode_m5/platformio.ini | 46 ++++++++++++++++------ variants/thinknode_m5/target-companion.cpp | 10 +++++ variants/thinknode_m5/target-other.cpp | 10 +++++ variants/thinknode_m5/target.cpp | 6 --- variants/thinknode_m5/target.h | 2 + 5 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 variants/thinknode_m5/target-companion.cpp create mode 100644 variants/thinknode_m5/target-other.cpp diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index b2c7201efb8..8e0a602e5e0 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -20,7 +20,6 @@ build_flags = ${esp32_base.build_flags} -D PIN_BUTTON2=14 -D EXP_PIN_LED=1 ; led is on bus expander -D DISPLAY_ROTATION=4 - -D DISPLAY_CLASS=GxEPDDisplay -D EINK_DISPLAY_MODEL=GxEPD2_154_D67 -D EINK_SCALE_X=1.5625f -D EINK_SCALE_Y=1.5625f @@ -49,7 +48,9 @@ build_src_filter = ${esp32_base.build_src_filter} + + + - +<../variants/thinknode_m5> + + + +<../variants/thinknode_m5/target.cpp> + +<../variants/thinknode_m5/ThinknodeM5Board.cpp> lib_deps = ${esp32_base.lib_deps} zinggjm/GxEPD2 @ 1.6.2 bakercp/CRC32 @ ^2.0.0 @@ -60,13 +61,17 @@ 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} + -I src/helpers/ui/server -D ADVERT_NAME='"Thinknode M5 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 + -D DISPLAY_CLASS=GxEPDDisplay ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -99,8 +104,11 @@ 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} + -I src/helpers/ui/server -D ADVERT_NAME='"ESPNow Bridge"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -108,6 +116,7 @@ build_flags = -D MAX_NEIGHBOURS=8 -D WITH_ESPNOW_BRIDGE=1 -D WITH_ESPNOW_BRIDGE_SECRET='"shared-secret"' + -D DISPLAY_CLASS=GxEPDDisplay ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -118,13 +127,17 @@ 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} + -I src/helpers/ui/server -D ADVERT_NAME='"Thinknode M5 Room Server"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' + -D DISPLAY_CLASS=GxEPDDisplay ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = @@ -149,19 +162,21 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 + -D DISPLAY_CLASS=GxEPDDisplay ; -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> + + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -178,11 +193,14 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 -D ENABLE_USB_INTERFACE -D ENABLE_WIFI_INTERFACE + -D DISPLAY_CLASS=GxEPDDisplay + -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} + +<../examples/companion_radio/*.cpp> + +<../variants/thinknode_m5/target-companion.cpp> + + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + + lib_deps = @@ -202,12 +220,15 @@ build_flags = -D WIFI_DEBUG_LOGGING=1 -D WIFI_SSID='"myssid"' -D WIFI_PWD='"mypwd"' + -D DISPLAY_CLASS=GxEPDDisplay + -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} + +<../examples/companion_radio/*.cpp> + +<../variants/thinknode_m5/target-companion.cpp> + + + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -223,13 +244,16 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=D6 -D SERIAL_RX=D7 + -D DISPLAY_CLASS=GxEPDDisplay ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 + -I src/helpers/ui/companion-new build_src_filter = ${ThinkNode_M5.build_src_filter} + +<../examples/companion_radio/*.cpp> + +<../variants/thinknode_m5/target-companion.cpp> + + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} diff --git a/variants/thinknode_m5/target-companion.cpp b/variants/thinknode_m5/target-companion.cpp new file mode 100644 index 00000000000..5d64b0c4ad4 --- /dev/null +++ b/variants/thinknode_m5/target-companion.cpp @@ -0,0 +1,10 @@ +#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 new file mode 100644 index 00000000000..734263ef810 --- /dev/null +++ b/variants/thinknode_m5/target-other.cpp @@ -0,0 +1,10 @@ +#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 0ed9a0d0c5a..5c1d001bed8 100644 --- a/variants/thinknode_m5/target.cpp +++ b/variants/thinknode_m5/target.cpp @@ -24,12 +24,6 @@ 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); -#endif - bool radio_init() { fallback_clock.begin(); rtc_clock.begin(Wire); diff --git a/variants/thinknode_m5/target.h b/variants/thinknode_m5/target.h index 7cce1edbf88..d5b8d61db30 100644 --- a/variants/thinknode_m5/target.h +++ b/variants/thinknode_m5/target.h @@ -13,6 +13,7 @@ #ifdef DISPLAY_CLASS #include #include + #include #endif extern ThinknodeM5Board board; @@ -25,6 +26,7 @@ extern PCA9557 expander; extern DISPLAY_CLASS display; extern MomentaryButton user_btn; extern MomentaryButton backlight_btn; + extern UITask ui_task; #endif bool radio_init();