Merge branch 'dev' into dev

variants/muziworks_r1_neo/platformio.ini

@@ -9,6 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -D R1Neo
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D DISPLAY_CLASS=NullDisplayDriver
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
@@ -65,6 +66,7 @@ build_flags =
   -I examples/companion_radio/ui-orig
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${R1Neo.build_src_filter}
@@ -98,7 +100,6 @@ build_src_filter = ${R1Neo.build_src_filter}
   +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
   ${R1Neo.lib_deps}
-  ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
 
@@ -126,6 +127,11 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
+;  -D MESH_DEBUG=1
 build_src_filter = ${R1Neo.build_src_filter}
   +<../examples/simple_sensor>
+
+[env:R1Neo_kiss_modem]
+extends = R1Neo
+build_src_filter = ${R1Neo.build_src_filter}
+  +<../examples/kiss_modem/>

variants/muziworks_r1_neo/target.cpp

@@ -4,12 +4,17 @@
 
 R1NeoBoard board;
 
-DISPLAY_CLASS display;
-
 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);
 
+#ifdef DISPLAY_CLASS
+  NullDisplayDriver display;
+#endif
+
+#ifdef PIN_USER_BTN 
+MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
+#endif
+
 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 
@@ -26,21 +31,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity

variants/muziworks_r1_neo/target.h

@@ -16,7 +16,4 @@ extern DISPLAY_CLASS display;
 extern MomentaryButton user_btn;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();