station g2: switch to new_ui

variants/station_g2/platformio.ini

@@ -22,6 +22,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/station_g2>
   +<helpers/ui/SH1106Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit SH110X @ ~2.1.13
@@ -65,14 +66,16 @@ lib_deps =
 extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
+  -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SH1106Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
-  +<helpers/ui/SH1106Display.cpp>
-  +<../examples/companion_radio>
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Station_G2.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -81,6 +84,7 @@ lib_deps =
 extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
+  -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SH1106Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
@@ -91,8 +95,8 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
   +<helpers/esp32/*.cpp>
-  +<helpers/ui/SH1106Display.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Station_G2.lib_deps}
   densaugeo/base64 @ ~1.4.0

variants/station_g2/target.cpp

@@ -18,10 +18,7 @@ SensorManager sensors;
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
-#endif
-
-#ifndef LORA_CR
-  #define LORA_CR      5
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 bool radio_init() {

variants/station_g2/target.h

@@ -10,6 +10,7 @@
 
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/SH1106Display.h>
+  #include <helpers/ui/MomentaryButton.h>
 #endif
 
 extern StationG2Board board;
@@ -19,6 +20,7 @@ extern SensorManager sensors;
 
 #ifdef DISPLAY_CLASS
   extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();