From 39934d6999143397591f7c32b9fb468c2f336498 Mon Sep 17 00:00:00 2001
From: taco <taco@sly.nu>
Date: Sun, 9 Aug 2026 18:33:27 +1000
Subject: [PATCH] minewsemi: build fix and platformio.ini tidy up

fixes minewsemi repeater failing build due to user_btn missing.
---
 variants/minewsemi_me25ls01/platformio.ini | 18 +-----------------
 variants/minewsemi_me25ls01/target.cpp     |  4 ++--
 variants/minewsemi_me25ls01/target.h       |  9 +++++----
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini
index d115a1f1..1743e719 100644
--- a/variants/minewsemi_me25ls01/platformio.ini
+++ b/variants/minewsemi_me25ls01/platformio.ini
@@ -21,6 +21,7 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_INA219=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<../variants/minewsemi_me25ls01>
   +<helpers/sensors>
 debug_tool = jlink
@@ -55,7 +56,6 @@ build_flags = ${me25ls01.build_flags}
   ;-D PIN_BUZZER=25
   ;-D PIN_BUZZER_EN=37
 build_src_filter = ${me25ls01.build_src_filter}
-  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
@@ -63,10 +63,6 @@ build_src_filter = ${me25ls01.build_src_filter}
 [env:Minewsemi_me25ls01_repeater]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -85,10 +81,6 @@ build_src_filter = ${me25ls01.build_src_filter}
 [env:Minewsemi_me25ls01_room_server]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -103,15 +95,10 @@ build_flags = ${me25ls01.build_flags}
   -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/NullDisplayDriver.cpp>
 
 [env:Minewsemi_me25ls01_terminal_chat]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -126,7 +113,6 @@ build_flags = ${me25ls01.build_flags}
   -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/NullDisplayDriver.cpp>
 
 [env:Minewsemi_me25ls01_companion_radio_usb]
 extends = me25ls01
@@ -137,7 +123,6 @@ build_flags = ${me25ls01.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   ;-D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -147,7 +132,6 @@ build_flags = ${me25ls01.build_flags}
   -D ENABLE_USB_INTERFACE
 build_src_filter = ${me25ls01.build_src_filter}
   +<helpers/nrf52/*.cpp>
-  +<helpers/ui/NullDisplayDriver.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 
diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp
index 9944a38b..41fc71a7 100644
--- a/variants/minewsemi_me25ls01/target.cpp
+++ b/variants/minewsemi_me25ls01/target.cpp
@@ -4,7 +4,6 @@
 MinewsemiME25LS01Board board;
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
 WRAPPER_CLASS radio_driver(radio, board);
 
 VolatileRTCClock rtc_clock;
@@ -18,7 +17,8 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 #ifdef DISPLAY_CLASS
-  NullDisplayDriver display;
+  DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 #ifndef LORA_CR
diff --git a/variants/minewsemi_me25ls01/target.h b/variants/minewsemi_me25ls01/target.h
index 978e616b..db44058c 100644
--- a/variants/minewsemi_me25ls01/target.h
+++ b/variants/minewsemi_me25ls01/target.h
@@ -11,16 +11,17 @@
 #include <helpers/sensors/EnvironmentSensorManager.h>
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/NullDisplayDriver.h>
-#endif
-
-#ifdef DISPLAY_CLASS
-  extern NullDisplayDriver display;
+  #include <helpers/ui/MomentaryButton.h>
 #endif
 
 extern MinewsemiME25LS01Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
+#ifdef DISPLAY_CLASS
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+#endif
 
 bool radio_init();
 mesh::LocalIdentity radio_new_identity();