T1000-E: switch to ui-new

The compiler is switched from `examples/companion_radio/ui-orig` to
`examples/companion_radio/ui-new`. The handling of the momentary button
was switched from `T1000eBoard::buttonStateChanged()` to a
`MomentaryButton` in `variants/t1000-e/target.cpp`.

Everything still seems to work properly. I briefly tested the room
server and repeater modes, and did a bit more testing of the companion
(USB & BLE) modes.

Author: sybrenstuvel

variants/t1000-e/T1000eBoard.cpp

@@ -5,11 +5,9 @@
 
 void T1000eBoard::begin() {
   NRF52BoardDCDC::begin();
-  btn_prev_state = HIGH;
 
 #ifdef BUTTON_PIN
   pinMode(BATTERY_PIN, INPUT);
-  pinMode(BUTTON_PIN, INPUT);
   pinMode(LED_PIN, OUTPUT);
 #endif
 

variants/t1000-e/T1000eBoard.h

@@ -6,7 +6,6 @@
 
 class T1000eBoard : public NRF52BoardDCDC {
 protected:
-  uint8_t btn_prev_state;
 
 public:
   T1000eBoard() : NRF52Board("T1000E_OTA") {}
@@ -38,17 +37,6 @@ class T1000eBoard : public NRF52BoardDCDC {
     return "Seeed Tracker T1000-E";
   }
 
-  int buttonStateChanged() {
-  #ifdef BUTTON_PIN
-    uint8_t v = digitalRead(BUTTON_PIN);
-    if (v != btn_prev_state) {
-      btn_prev_state = v;
-      return (v == LOW) ? 1 : -1;
-    }
-  #endif
-    return 0;
-  }
-
   void powerOff() override {
     #ifdef HAS_GPS
         digitalWrite(GPS_VRTC_EN, LOW);

variants/t1000-e/platformio.ini

@@ -37,7 +37,7 @@ upload_protocol = nrfutil
 [env:t1000e_repeater]
 extends = t1000-e
 build_flags = ${t1000-e.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D ADVERT_NAME='"t1000-e Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -53,7 +53,7 @@ lib_deps = ${t1000-e.lib_deps}
 [env:t1000e_room_server]
 extends = t1000-e
 build_flags = ${t1000-e.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D ADVERT_NAME='"t1000-e Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -72,7 +72,7 @@ extends = t1000-e
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${t1000-e.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
@@ -84,7 +84,7 @@ build_flags = ${t1000-e.build_flags}
 build_src_filter = ${t1000-e.build_src_filter}
   +<helpers/ui/buzzer.cpp>
   +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${t1000-e.lib_deps}
   densaugeo/base64 @ ~1.4.0
   stevemarple/MicroNMEA @ ^2.0.6
@@ -95,7 +95,7 @@ extends = t1000-e
 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${t1000-e.build_flags}
-  -I examples/companion_radio/ui-orig
+  -I examples/companion_radio/ui-new
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
@@ -112,7 +112,7 @@ build_src_filter = ${t1000-e.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<helpers/ui/buzzer.cpp>
   +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${t1000-e.lib_deps}
   densaugeo/base64 @ ~1.4.0
   stevemarple/MicroNMEA @ ^2.0.6

variants/t1000-e/target.cpp

@@ -17,6 +17,14 @@ T1000SensorManager sensors = T1000SensorManager(nmea);
   DISPLAY_CLASS display;
 #endif
 
+#ifdef PIN_USER_BTN
+  MomentaryButton user_btn(PIN_USER_BTN,
+    /*long_press_mills=*/1000,
+    /*reverse=*/(USER_BTN_PRESSED==LOW),
+    /*pulldownup=*/false,
+    /*multiclick=*/true);
+#endif
+
 #ifndef LORA_CR
   #define LORA_CR      5
 #endif

variants/t1000-e/target.h

@@ -11,6 +11,9 @@
 #ifdef DISPLAY_CLASS
   #include "NullDisplayDriver.h"
 #endif
+#ifdef PIN_USER_BTN
+  #include <helpers/ui/MomentaryButton.h>
+#endif
 
 class T1000SensorManager: public SensorManager {
   bool gps_active = false;
@@ -35,6 +38,10 @@ class T1000SensorManager: public SensorManager {
   extern NullDisplayDriver display;
 #endif
 
+#ifdef PIN_USER_BTN
+  extern MomentaryButton user_btn;
+#endif
+
 extern T1000eBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;