Merge pull request #631 from khudson/new-companion-ui

Ikoka Stick: Use New Companion UI. Fix repeater & room server roles.

Author: ripplebiz

build.sh

@@ -3,6 +3,7 @@
 # usage
 # sh build.sh build-firmware RAK_4631_Repeater
 # sh build.sh build-firmwares
+# sh build.sh build-matching-firmwares RAK_4631
 # sh build.sh build-companion-firmwares
 # sh build.sh build-repeater-firmwares
 # sh build.sh build-room-server-firmwares
@@ -144,6 +145,16 @@ mkdir -p out
 if [[ $1 == "build-firmware" ]]; then
   if [ "$2" ]; then
     build_firmware $2
+  else
+    echo "usage: $0 build-firmware <target>"
+    exit 1
+  fi
+elif [[ $1 == "build-matching-firmwares" ]]; then
+  if [ "$2" ]; then
+     build_all_firmwares_matching $2
+  else
+     echo "usage: $0 build-matching-firmwares <build-match-spec>"
+    exit 1
   fi
 elif [[ $1 == "build-firmwares" ]]; then
   build_firmwares

variants/ikoka_stick_nrf/ikoka_stick_nrf_board.h

@@ -29,10 +29,10 @@ class ikoka_stick_nrf_board : public mesh::MainBoard {
 
 #if defined(P_LORA_TX_LED)
   void onBeforeTransmit() override {
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED on
+    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
   }
   void onAfterTransmit() override {
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED off
+    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
   }
 #endif
 

variants/ikoka_stick_nrf/platformio.ini

@@ -55,6 +55,7 @@ build_flags = ${nrf52840_xiao.build_flags}
 build_src_filter = ${nrf52840_xiao.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/sensors>
+  +<helpers/ui/MomentaryButton.cpp>
   +<helpers/ui/SSD1306Display.cpp>
   +<../variants/ikoka_stick_nrf>
 debug_tool = jlink
@@ -68,12 +69,14 @@ build_flags =
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
+  -I examples/companion_radio/ui-new
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${ikoka_stick_nrf.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -84,21 +87,17 @@ build_flags =
   ${ikoka_stick_nrf.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
+  -I examples/companion_radio/ui-new
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${ikoka_stick_nrf.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:ikoka_stick_nrf_alt_pinout_companion_radio_ble]
-extends = env:ikoka_stick_nrf_companion_radio_ble
-build_flags =
-  ${env:ikoka_stick_nrf_companion_radio_ble.build_flags}
-  -D SX1262_XIAO_S3_VARIANT
-
 [env:ikoka_stick_nrf_repeater]
 extends = ikoka_stick_nrf
 build_flags =
@@ -111,13 +110,8 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
-  +<../examples/simple_repeater/main.cpp>
-
-[env:ikoka_stick_nrf_alt_pinout_repeater]
-extends = env:ikoka_stick_nrf_repeater
-build_flags =
-  ${env:ikoka_stick_nrf_repeater.build_flags}
-  -D SX1262_XIAO_S3_VARIANT
+  +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/simple_repeater/*.cpp>
 
 [env:ikoka_stick_nrf_room_server]
 extends = ikoka_stick_nrf
@@ -130,4 +124,4 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
-  +<../examples/simple_room_server/main.cpp>
+  +<../examples/simple_room_server/*.cpp>

variants/ikoka_stick_nrf/target.cpp

@@ -6,6 +6,7 @@ ikoka_stick_nrf_board board;
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);

variants/ikoka_stick_nrf/target.h

@@ -11,7 +11,9 @@
 
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/SSD1306Display.h>
+  #include <helpers/ui/MomentaryButton.h>
   extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
 #endif
 
 extern ikoka_stick_nrf_board board;