Merge branch 'dev' into minewsemi-refactor

variants/ebyte_eora_s3/platformio.ini

@@ -135,3 +135,8 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
 lib_deps =
   ${Ebyte_EoRa-S3.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Ebyte_EoRa-S3_kiss_modem]
+extends = Ebyte_EoRa-S3
+build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
+  +<../examples/kiss_modem/>

variants/ebyte_eora_s3/target.cpp

@@ -73,6 +73,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/gat562_30s_mesh_kit/platformio.ini

@@ -112,3 +112,7 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
 
+[env:GAT562_30S_Mesh_Kit_kiss_modem]
+extends = GAT562_30S_Mesh_Kit
+build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
+  +<../examples/kiss_modem/>

variants/gat562_mesh_evb_pro/platformio.ini

@@ -50,3 +50,8 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter}
   +<../examples/simple_room_server>
+
+[env:GAT562_Mesh_EVB_Pro_kiss_modem]
+extends = GAT562_Mesh_EVB_Pro
+build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter}
+  +<../examples/kiss_modem/>

variants/gat562_mesh_tracker_pro/platformio.ini

@@ -106,3 +106,7 @@ lib_deps =
   ${GAT562_Mesh_Tracker_Pro.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+[env:GAT562_Mesh_Tracker_Pro_kiss_modem]
+extends = GAT562_Mesh_Tracker_Pro
+build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter}
+  +<../examples/kiss_modem/>

variants/gat562_mesh_watch13/platformio.ini

@@ -87,3 +87,7 @@ lib_deps =
   ${GAT562_Mesh_Watch13.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+[env:GAT562_Mesh_Watch13_kiss_modem]
+extends = GAT562_Mesh_Watch13
+build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter}
+  +<../examples/kiss_modem/>

variants/generic-e22/platformio.ini

@@ -95,6 +95,11 @@ lib_deps =
   ${Generic_E22.lib_deps}
   ${esp32_ota.lib_deps}
 
+[env:Generic_E22_kiss_modem]
+extends = Generic_E22
+build_src_filter = ${Generic_E22.build_src_filter}
+  +<../examples/kiss_modem/>
+
 [env:Generic_E22_sx1268_repeater]
 extends = Generic_E22
 build_src_filter = ${Generic_E22.build_src_filter}

variants/generic-e22/target.cpp

@@ -36,6 +36,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_ct62/platformio.ini

@@ -150,3 +150,8 @@ build_src_filter = ${Heltec_ct62.build_src_filter}
 lib_deps =
   ${Heltec_ct62.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_ct62_kiss_modem]
+extends = Heltec_ct62
+build_src_filter = ${Heltec_ct62.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_ct62/target.cpp

@@ -25,6 +25,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_e213/platformio.ini

@@ -166,3 +166,8 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_E213_kiss_modem]
+extends = Heltec_E213_base
+build_src_filter = ${Heltec_E213_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_e213/target.cpp

@@ -42,6 +42,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_e290/platformio.ini

@@ -162,3 +162,8 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_E290_kiss_modem]
+extends = Heltec_E290_base
+build_src_filter = ${Heltec_E290_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_e290/target.cpp

@@ -42,6 +42,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_mesh_solar/platformio.ini

@@ -92,4 +92,9 @@ build_src_filter = ${Heltec_mesh_solar.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps =
   ${Heltec_mesh_solar.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_mesh_solar_kiss_modem]
+extends = Heltec_mesh_solar
+build_src_filter = ${Heltec_mesh_solar.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_mesh_solar/target.cpp

@@ -32,6 +32,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_t096/LoRaFEMControl.h

@@ -16,6 +16,6 @@ class LoRaFEMControl
     void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
 
   private:
-    bool lna_enabled = true;
+    bool lna_enabled = false;
     bool lna_can_control = false;
 };

variants/heltec_t096/platformio.ini

@@ -92,7 +92,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
 [env:Heltec_t096_room_server]
 extends = Heltec_t096
 build_src_filter = ${Heltec_t096.build_src_filter}
-  +<../examples/simple_room_server> 
+  +<../examples/simple_room_server>
 build_flags =
   ${Heltec_t096.build_flags}
   -D ADVERT_NAME='"Heltec_t096 Room"'
@@ -145,4 +145,9 @@ build_src_filter = ${Heltec_t096.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Heltec_t096.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_t096_kiss_modem]
+extends = Heltec_t096
+build_src_filter = ${Heltec_t096.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_t114/platformio.ini

@@ -50,7 +50,6 @@ upload_protocol = nrfutil
 extends = Heltec_t114
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_repeater>
-
 build_flags =
   ${Heltec_t114.build_flags}
   -D ADVERT_NAME='"Heltec_T114 Repeater"'
@@ -127,10 +126,6 @@ build_flags =
   -D DISPLAY_CLASS=NullDisplayDriver
   -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
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<helpers/nrf52/*.cpp>
   +<../examples/companion_radio/*.cpp>
@@ -251,4 +246,9 @@ build_src_filter = ${Heltec_t114_with_display.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Heltec_t114_with_display.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_t114_kiss_modem]
+extends = Heltec_t114
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_t114/target.cpp

@@ -52,6 +52,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_t190/platformio.ini

@@ -153,3 +153,8 @@ build_src_filter = ${Heltec_T190_base.build_src_filter}
 lib_deps =
   ${Heltec_T190_base.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_T190_kiss_modem]
+extends = Heltec_T190_base
+build_src_filter = ${Heltec_T190_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_t190/target.cpp

@@ -42,6 +42,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_tracker/platformio.ini

@@ -186,3 +186,8 @@ build_src_filter = ${Heltec_tracker_base.build_src_filter}
 lib_deps =
   ${Heltec_tracker_base.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_Wireless_Tracker_kiss_modem]
+extends = Heltec_tracker_base
+build_src_filter = ${Heltec_tracker_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_tracker/target.cpp

@@ -46,6 +46,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_tracker_v2/LoRaFEMControl.h

@@ -16,6 +16,6 @@ class LoRaFEMControl
     void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
 
   private:
-    bool lna_enabled = true;
+    bool lna_enabled = false;
     bool lna_can_control = false;
 };

variants/heltec_tracker_v2/platformio.ini

@@ -187,7 +187,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_v2.build_src_filter}
@@ -217,3 +217,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter}
 lib_deps =
   ${Heltec_tracker_v2.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:heltec_tracker_v2_kiss_modem]
+extends = Heltec_tracker_v2
+build_src_filter = ${Heltec_tracker_v2.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_tracker_v2/target.cpp

@@ -48,6 +48,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_v2/platformio.ini

@@ -195,3 +195,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter}
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_v2_kiss_modem]
+extends = Heltec_lora32_v2
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_v2/target.cpp

@@ -41,6 +41,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_v3/platformio.ini

@@ -371,9 +371,5 @@ lib_deps =
 
 [env:Heltec_v3_kiss_modem]
 extends = Heltec_lora32_v3
-build_flags =
-  ${Heltec_lora32_v3.build_flags}
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<../examples/kiss_modem/>
-lib_deps =
-  ${Heltec_lora32_v3.lib_deps}

variants/heltec_v3/target.cpp

@@ -48,6 +48,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_v4/LoRaFEMControl.h

@@ -23,7 +23,7 @@ class LoRaFEMControl
     LoRaFEMType getFEMType(void) const { return fem_type; }
   private:
     LoRaFEMType fem_type=OTHER_FEM_TYPES;
-    bool lna_enabled=true;
+    bool lna_enabled=false;
     bool lna_can_control=false;
 };
 

variants/heltec_v4/platformio.ini

@@ -429,3 +429,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter}
 lib_deps =
   ${heltec_v4_tft.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:heltec_v4_kiss_modem]
+extends = Heltec_lora32_v4
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_v4/target.cpp

@@ -48,6 +48,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/heltec_wireless_paper/platformio.ini

@@ -165,3 +165,8 @@ lib_deps =
   ${Heltec_Wireless_Paper_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_Wireless_Paper_kiss_modem]
+extends = Heltec_Wireless_Paper_base
+build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/heltec_wireless_paper/target.cpp

@@ -41,6 +41,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/ikoka_handheld_nrf/platformio.ini

@@ -86,8 +86,7 @@ build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
 
 [env:ikoka_handheld_nrf_e22_30dbm_repeater]
 extends = ikoka_handheld_nrf
-build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+build_flags = ${ikoka_handheld_nrf.build_flags}
   -D ADVERT_NAME='"ikoka_handheld Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -99,8 +98,7 @@ build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
 
 [env:ikoka_handheld_nrf_e22_30dbm_room_server]
 extends = ikoka_handheld_nrf
-build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+build_flags = ${ikoka_handheld_nrf.build_flags}
   -D ADVERT_NAME='"ikoka_handheld Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -108,3 +106,10 @@ build_flags =
   -D LORA_TX_POWER=20
 build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
   +<../examples/simple_room_server/*.cpp>
+
+[env:ikoka_handheld_nrf_kiss_modem]
+extends = ikoka_handheld_nrf
+build_flags = ${ikoka_handheld_nrf.build_flags}
+  -D LORA_TX_POWER=20
+build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
+  +<../examples/kiss_modem/>

variants/ikoka_handheld_nrf/target.cpp

@@ -34,6 +34,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/ikoka_nano_nrf/platformio.ini

@@ -279,3 +279,18 @@ build_flags =
 build_src_filter =
    ${ikoka_nano_nrf_room_server.build_src_filter}
    ${ikoka_nano_nrf_e22_33dbm.build_src_filter}
+
+[env:ikoka_nano_nrf_22dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_22dbm
+build_src_filter = ${ikoka_nano_nrf_e22_22dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_nano_nrf_30dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_30dbm
+build_src_filter = ${ikoka_nano_nrf_e22_30dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_nano_nrf_33dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_33dbm
+build_src_filter = ${ikoka_nano_nrf_e22_33dbm.build_src_filter}
+  +<../examples/kiss_modem/>

variants/ikoka_nano_nrf/target.cpp

@@ -32,6 +32,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/ikoka_stick_nrf/platformio.ini

@@ -290,3 +290,18 @@ build_flags =
 build_src_filter =
    ${ikoka_stick_nrf_room_server.build_src_filter}
    ${ikoka_stick_nrf_e22_33dbm.build_src_filter}
+
+[env:ikoka_stick_nrf_22dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_22dbm
+build_src_filter = ${ikoka_stick_nrf_e22_22dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_stick_nrf_30dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_30dbm
+build_src_filter = ${ikoka_stick_nrf_e22_30dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_stick_nrf_33dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_33dbm
+build_src_filter = ${ikoka_stick_nrf_e22_33dbm.build_src_filter}
+  +<../examples/kiss_modem/>

variants/ikoka_stick_nrf/target.cpp

@@ -32,6 +32,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/keepteen_lt1/platformio.ini

@@ -17,7 +17,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/sensors>
   +<../variants/keepteen_lt1>
 lib_deps= ${nrf52_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit SSD1306 @ ^2.5.13
   stevemarple/MicroNMEA @ ^2.0.6
 
 [env:KeepteenLT1_repeater]
@@ -99,4 +99,9 @@ build_src_filter = ${KeepteenLT1.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${KeepteenLT1.lib_deps}
   adafruit/RTClib @ ^2.1.3
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:KeepteenLT1_kiss_modem]
+extends = KeepteenLT1
+build_src_filter = ${KeepteenLT1.build_src_filter}
+  +<../examples/kiss_modem/>

variants/keepteen_lt1/target.cpp

@@ -38,6 +38,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_t3s3/platformio.ini

@@ -173,3 +173,8 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
 lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T3S3_sx1262_kiss_modem]
+extends = LilyGo_T3S3_sx1262
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_t3s3/target.cpp

@@ -36,6 +36,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_t3s3_sx1276/platformio.ini

@@ -168,4 +168,9 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${LilyGo_T3S3_sx1276.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T3S3_sx1276_kiss_modem]
+extends = LilyGo_T3S3_sx1276
+build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_t3s3_sx1276/target.cpp

@@ -42,6 +42,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tbeam_1w/platformio.ini

@@ -192,3 +192,8 @@ build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_1W.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:LilyGo_TBeam_1W_kiss_modem]
+extends = LilyGo_TBeam_1W
+build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tbeam_1w/target.cpp

@@ -52,6 +52,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tbeam_SX1262/platformio.ini

@@ -133,3 +133,8 @@ build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_SX1262.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Tbeam_SX1262_kiss_modem]
+extends = LilyGo_TBeam_SX1262
+build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tbeam_SX1262/target.cpp

@@ -43,6 +43,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tbeam_SX1276/platformio.ini

@@ -131,3 +131,8 @@ build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_SX1276.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Tbeam_SX1276_kiss_modem]
+extends = LilyGo_TBeam_SX1276
+build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tbeam_SX1276/target.cpp

@@ -48,6 +48,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tbeam_supreme_SX1262/platformio.ini

@@ -158,3 +158,8 @@ build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
 lib_deps =
   ${T_Beam_S3_Supreme_SX1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:T_Beam_S3_Supreme_SX1262_kiss_modem]
+extends = T_Beam_S3_Supreme_SX1262
+build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tbeam_supreme_SX1262/target.cpp

@@ -40,6 +40,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tdeck/platformio.ini

@@ -57,6 +57,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_tdeck>
   +<helpers/sensors/*.cpp>
+  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   ${sensor_base.lib_deps}
@@ -75,7 +76,6 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -94,7 +94,6 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -113,4 +112,9 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
-  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:LilyGo_TDeck_kiss_modem]
+extends = LilyGo_TDeck
+build_src_filter = ${LilyGo_TDeck.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tdeck/target.cpp

@@ -43,6 +43,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_techo/platformio.ini

@@ -126,3 +126,8 @@ build_src_filter = ${LilyGo_T-Echo.build_src_filter}
 lib_deps =
   ${LilyGo_T-Echo.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo_kiss_modem]
+extends = LilyGo_T-Echo
+build_src_filter = ${LilyGo_T-Echo.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_techo/target.cpp

@@ -40,6 +40,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_techo_lite/platformio.ini

@@ -140,3 +140,8 @@ build_src_filter = ${nrf52_base.build_src_filter}
 lib_deps =
   ${LilyGo_T-Echo-Lite.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo-Lite_kiss_modem]
+extends = LilyGo_T-Echo-Lite
+build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_techo_lite/target.cpp

@@ -39,6 +39,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tlora_c6/platformio.ini

@@ -84,3 +84,8 @@ build_src_filter = ${tlora_c6.build_src_filter}
 lib_deps =
   ${tlora_c6.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_Tlora_C6_kiss_modem]
+extends = tlora_c6
+build_src_filter = ${tlora_c6.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tlora_c6/target.cpp

@@ -36,6 +36,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/lilygo_tlora_v2_1/platformio.ini

@@ -192,3 +192,8 @@ build_flags =
 lib_deps =
   ${LilyGo_TLora_V2_1_1_6.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:LilyGo_TLora_V2_1_1_6_kiss_modem]
+extends = LilyGo_TLora_V2_1_1_6
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tlora_v2_1/target.cpp

@@ -37,6 +37,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/m5stack_unit_c6l/UnitC6LBoard.cpp

@@ -37,6 +37,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(uint8_t dbm) {

variants/m5stack_unit_c6l/platformio.ini

@@ -105,3 +105,8 @@ lib_deps =
   ${M5Stack_Unit_C6L.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:M5Stack_Unit_C6L_kiss_modem]
+extends = M5Stack_Unit_C6L
+build_src_filter = ${M5Stack_Unit_C6L.build_src_filter}
+  +<../examples/kiss_modem/>

variants/mesh_pocket/platformio.ini

@@ -109,4 +109,9 @@ build_src_filter = ${Mesh_pocket.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Mesh_pocket.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:Mesh_pocket_kiss_modem]
+extends = Mesh_pocket
+build_src_filter = ${Mesh_pocket.build_src_filter}
+  +<../examples/kiss_modem/>

variants/mesh_pocket/target.cpp

@@ -32,6 +32,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/meshadventurer/platformio.ini

@@ -29,6 +29,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/meshadventurer>
   +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
@@ -38,7 +39,6 @@ lib_deps =
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1262
@@ -60,7 +60,6 @@ lib_deps =
 ; build_src_filter = ${Meshadventurer.build_src_filter}
 ;   +<helpers/bridges/RS232Bridge.cpp>
 ;   +<../examples/simple_repeater>
-;   +<helpers/ui/SSD1306Display.cpp>
 ; build_flags =
 ;   ${Meshadventurer.build_flags}
 ;   -D RADIO_CLASS=CustomSX1262
@@ -86,7 +85,6 @@ extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/bridges/ESPNowBridge.cpp>
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1262
@@ -109,7 +107,6 @@ lib_deps =
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1268
@@ -157,7 +154,6 @@ extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/bridges/ESPNowBridge.cpp>
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1268
@@ -179,8 +175,6 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -200,9 +194,7 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -235,7 +227,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -256,7 +247,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   ${esp32_ota.lib_deps}
@@ -264,8 +254,6 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -285,9 +273,7 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -320,7 +306,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -341,7 +326,24 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
-  ${esp32_ota.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Meshadventurer_sx1262_kiss_modem]
+extends = Meshadventurer
+build_src_filter = ${Meshadventurer.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags = ${Meshadventurer.build_flags}
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+
+[env:Meshadventurer_sx1268_kiss_modem]
+extends = Meshadventurer
+build_src_filter = ${Meshadventurer.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags = ${Meshadventurer.build_flags}
+  -D RADIO_CLASS=CustomSX1268
+  -D WRAPPER_CLASS=CustomSX1268Wrapper
+  -D LORA_TX_POWER=22

variants/meshadventurer/target.cpp

@@ -39,6 +39,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/meshtiny/platformio.ini

@@ -67,3 +67,8 @@ build_src_filter = ${Meshtiny.build_src_filter}
 lib_deps =
   ${Meshtiny.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Meshtiny_kiss_modem]
+extends = Meshtiny
+build_src_filter = ${Meshtiny.build_src_filter}
+  +<../examples/kiss_modem/>

variants/meshtiny/target.cpp

@@ -35,6 +35,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/minewsemi_me25ls01/platformio.ini

@@ -145,3 +145,7 @@ build_src_filter = ${me25ls01.build_src_filter}
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 
+[env:Minewsemi_me25ls01_kiss_modem]
+extends = me25ls01
+build_src_filter = ${me25ls01.build_src_filter}
+  +<../examples/kiss_modem/>

variants/minewsemi_me25ls01/target.cpp

@@ -86,6 +86,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/muziworks_r1_neo/platformio.ini

@@ -130,3 +130,8 @@ build_flags =
   -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/nano_g2_ultra/platformio.ini

@@ -1,20 +1,11 @@
-[nrf52840_g2_ultra]
+[Nano_G2_Ultra]
 extends = nrf52_base
-platform_packages = framework-arduinoadafruitnrf52
+board = nano-g2-ultra
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
-lib_deps =
-  ${nrf52_base.lib_deps}
-  rweather/Crypto @ ^0.4.0
-  lewisxhe/PCF8563_Library@^1.0.1
-
-[Nano_G2_Ultra]
-extends = nrf52840_g2_ultra
-board = nano-g2-ultra
-board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52840_g2_ultra.build_flags}
   -I variants/nano_g2_ultra
   -D NANO_G2_ULTRA
   -D RADIO_CLASS=CustomSX1262
@@ -23,11 +14,47 @@ build_flags = ${nrf52840_g2_ultra.build_flags}
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D PIN_USER_BTN=38
-build_src_filter = ${nrf52840_g2_ultra.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<../variants/nano_g2_ultra>
 debug_tool = jlink
 upload_protocol = nrfutil
+lib_deps = ${nrf52_base.lib_deps}
+  adafruit/Adafruit SH110X @ ~2.1.13
+  adafruit/Adafruit GFX Library @ ^1.12.1
+  stevemarple/MicroNMEA @ ^2.0.6
+
+[env:Nano_G2_Ultra_repeater]
+extends = Nano_G2_Ultra
+build_flags =
+  ${Nano_G2_Ultra.build_flags}
+  -D DISPLAY_CLASS=SH1106Display
+  -D ADVERT_NAME='"Nano G2 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<helpers/ui/SH1106Display.cpp>
+  +<../examples/simple_repeater>
+
+[env:Nano_G2_Ultra_room_server]
+extends = Nano_G2_Ultra
+build_flags =
+  ${Nano_G2_Ultra.build_flags}
+  -D DISPLAY_CLASS=SH1106Display
+  -D ADVERT_NAME='"Nano G2 Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<helpers/ui/SH1106Display.cpp>
+  +<../examples/simple_room_server>
 
 [env:Nano_G2_Ultra_companion_radio_ble]
 extends = Nano_G2_Ultra
@@ -54,12 +81,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Nano_G2_Ultra.lib_deps}
+lib_deps = ${Nano_G2_Ultra.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  adafruit/Adafruit SH110X @ ~2.1.13
-  adafruit/Adafruit GFX Library @ ^1.12.1
-  stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:Nano_G2_Ultra_companion_radio_usb]
@@ -84,10 +107,11 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Nano_G2_Ultra.lib_deps}
+lib_deps = ${Nano_G2_Ultra.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  adafruit/Adafruit SH110X @ ~2.1.13
-  adafruit/Adafruit GFX Library @ ^1.12.1
-  stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:Nano_G2_Ultra_kiss_modem]
+extends = Nano_G2_Ultra
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<../examples/kiss_modem/>

variants/nano_g2_ultra/target.cpp

@@ -34,6 +34,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/nibble_screen_connect/platformio.ini

@@ -159,3 +159,8 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+
+[env:nibble_screen_connect_kiss_modem]
+extends = nibble_screen_connect_base
+build_src_filter = ${nibble_screen_connect_base.build_src_filter}
+  +<../examples/kiss_modem/>

variants/nibble_screen_connect/target.cpp

@@ -36,6 +36,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/promicro/platformio.ini

@@ -27,7 +27,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/sensors>
   +<../variants/promicro>
 lib_deps= ${nrf52_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit SSD1306 @ ^2.5.13
   adafruit/Adafruit INA3221 Library @ ^1.0.1
   adafruit/Adafruit INA219 @ ^1.2.3
   adafruit/Adafruit AHTX0 @ ^2.0.5
@@ -171,3 +171,8 @@ build_src_filter = ${Promicro.build_src_filter}
   +<../examples/simple_sensor>
 lib_deps =
   ${Promicro.lib_deps}
+
+[env:ProMicro_kiss_modem]
+extends = Promicro
+build_src_filter = ${Promicro.build_src_filter}
+  +<../examples/kiss_modem/>

variants/promicro/target.cpp

@@ -38,6 +38,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak11310/platformio.ini

@@ -132,3 +132,8 @@ build_src_filter = ${rak11310.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${rak11310.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:RAK_11310_kiss_modem]
+extends = rak11310
+build_src_filter = ${rak11310.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rak11310/target.cpp

@@ -27,6 +27,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak3112/platformio.ini

@@ -204,3 +204,8 @@ build_src_filter = ${rak3112.build_src_filter}
 lib_deps =
   ${rak3112.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:RAK_3112_kiss_modem]
+extends = rak3112
+build_src_filter = ${rak3112.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rak3112/target.cpp

@@ -48,6 +48,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak3401/platformio.ini

@@ -6,6 +6,7 @@ build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/rak3401
   -D RAK_3401
+  -D RAK_BOARD
   -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
@@ -63,6 +64,8 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak3401.build_flags}
   -I examples/companion_radio/ui-new
+  -D PIN_USER_BTN_ANA=31
+  -D PIN_GPS_EN=-1
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -82,6 +85,8 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak3401.build_flags}
   -I examples/companion_radio/ui-new
+  -D PIN_USER_BTN_ANA=31
+  -D PIN_GPS_EN=-1
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -126,3 +131,8 @@ build_flags =
 build_src_filter = ${rak3401.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_sensor>
+
+[env:RAK_3401_kiss_modem]
+extends = rak3401
+build_src_filter = ${rak3401.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rak3401/target.cpp

@@ -46,6 +46,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak3x72/platformio.ini

@@ -41,3 +41,8 @@ build_src_filter = ${rak3x72.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps = ${rak3x72.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:RAK_3x72_kiss_modem]
+extends = rak3x72
+build_src_filter = ${rak3x72.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rak3x72/target.cpp

@@ -64,6 +64,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak4631/target.cpp

@@ -46,6 +46,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rak_wismesh_tag/platformio.ini

@@ -118,4 +118,9 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/simple_sensor>
+  +<../examples/simple_sensor>
+
+[env:RAK_WisMesh_Tag_kiss_modem]
+extends = rak_wismesh_tag
+build_src_filter = ${rak_wismesh_tag.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rak_wismesh_tag/target.cpp

@@ -42,6 +42,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/rpi_picow/platformio.ini

@@ -106,3 +106,8 @@ build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${rpi_picow.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:PicoW_kiss_modem]
+extends = rpi_picow
+build_src_filter = ${rpi_picow.build_src_filter}
+  +<../examples/kiss_modem/>

variants/rpi_picow/target.cpp

@@ -27,6 +27,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/sensecap_solar/target.cpp

@@ -34,6 +34,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/station_g2/platformio.ini

@@ -238,3 +238,8 @@ build_src_filter = ${Station_G2.build_src_filter}
 lib_deps =
   ${Station_G2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Station_G2_kiss_modem]
+extends = Station_G2
+build_src_filter = ${Station_G2.build_src_filter}
+  +<../examples/kiss_modem/>

variants/station_g2/target.cpp

@@ -49,6 +49,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {

variants/t1000-e/platformio.ini

@@ -117,3 +117,10 @@ lib_deps = ${t1000-e.lib_deps}
   densaugeo/base64 @ ~1.4.0
   stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:t1000e_kiss_modem]
+extends = t1000-e
+build_src_filter = ${t1000-e.build_src_filter}
+  +<../examples/kiss_modem/>
+lib_deps = ${t1000-e.lib_deps}
+  stevemarple/MicroNMEA @ ^2.0.6