Merge branch 'dev' of github.com:recrof/MeshCore into dev

2026-04-20 22:13:47 +00:00 · 2025-05-03 14:59:06 +02:00 · 2025-05-03 14:59:06 +02:00 · 1e031e989d
commit 1e031e989d
parent 154b5e4014 26f01e0605
71 changed files with 3971 additions and 251 deletions
--- a/variants/generic-e22/target.cpp
+++ b/variants/generic-e22/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/generic-e22/target.h
+++ b/variants/generic-e22/target.h
@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomSX1268Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/generic_espnow/target.cpp
+++ b/variants/generic_espnow/target.cpp
@ -7,6 +7,7 @@ ESP32Board board;
 ESPNOWRadio radio_driver;

 ESP32RTCClock rtc_clock;
+SensorManager sensors;

 bool radio_init() {
  rtc_clock.begin();
--- a/variants/generic_espnow/target.h
+++ b/variants/generic_espnow/target.h
@ -2,10 +2,12 @@

 #include <helpers/ESP32Board.h>
 #include <helpers/esp32/ESPNOWRadio.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern ESPNOWRadio radio_driver;
 extern ESP32RTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/heltec_v2/target.cpp
+++ b/variants/heltec_v2/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/heltec_v2/target.h
+++ b/variants/heltec_v2/target.h
@ -6,10 +6,12 @@
 #include <helpers/HeltecV2Board.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern HeltecV2Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/heltec_v3/target.cpp
+++ b/variants/heltec_v3/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/heltec_v3/target.h
+++ b/variants/heltec_v3/target.h
@ -6,10 +6,12 @@
 #include <helpers/HeltecV3Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern HeltecV3Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_t3s3/target.cpp
+++ b/variants/lilygo_t3s3/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_t3s3/target.h
+++ b/variants/lilygo_t3s3/target.h
@ -6,10 +6,12 @@
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam/target.cpp
+++ b/variants/lilygo_tbeam/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tbeam/target.h
+++ b/variants/lilygo_tbeam/target.h
@ -6,10 +6,12 @@
 #include <helpers/TBeamBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_SX1262/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tbeam_SX1262/target.h
+++ b/variants/lilygo_tbeam_SX1262/target.h
@ -6,10 +6,12 @@
 #include <helpers/TBeamBoardSX1262.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamBoardSX1262 board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp
@ -23,7 +23,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
+SensorManager sensors;

 static void setPMUIntFlag(){
  pmuIntFlag = true;
--- a/variants/lilygo_tbeam_supreme_SX1262/target.h
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.h
@ -5,10 +5,12 @@
 #include <helpers/TBeamS3SupremeBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamS3SupremeBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tlora_v2_1/target.cpp
+++ b/variants/lilygo_tlora_v2_1/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tlora_v2_1/target.h
+++ b/variants/lilygo_tlora_v2_1/target.h
@ -6,10 +6,12 @@
 #include <helpers/LilyGoTLoraBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern LilyGoTLoraBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/picow/target.cpp
+++ b/variants/picow/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/picow/target.h
+++ b/variants/picow/target.h
@ -6,10 +6,12 @@
 #include <helpers/rp2040/PicoWBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern PicoWBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/promicro/target.cpp
+++ b/variants/promicro/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/promicro/target.h
+++ b/variants/promicro/target.h
@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomLLCC68Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern PromicroBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/rak4631/target.h
+++ b/variants/rak4631/target.h
@ -6,10 +6,12 @@
 #include <helpers/nrf52/RAK4631Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern RAK4631Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/station_g2/target.cpp
+++ b/variants/station_g2/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/station_g2/target.h
+++ b/variants/station_g2/target.h
@ -6,10 +6,12 @@
 #include <helpers/StationG2Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern StationG2Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/t1000-e/target.cpp
+++ b/variants/t1000-e/target.cpp
@ -8,6 +8,7 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU
 WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock rtc_clock;
+T1000SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
@ -84,3 +85,19 @@ mesh::LocalIdentity radio_new_identity() {
  RadioNoiseListener rng(radio);
  return mesh::LocalIdentity(&rng);  // create new random identity
 }
+
+bool T1000SensorManager::begin() {
+  // TODO: init GPS
+  return true;
+}
+
+bool T1000SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
+  if (requester_permissions & TELEM_PERM_LOCATION) {   // does requester have permission?
+    telemetry.addGPS(TELEM_CHANNEL_SELF, _lat, _lon, _alt);
+  }
+  return true;
+}
+
+void T1000SensorManager::loop() {
+  // TODO: poll GPS serial,  set _lat, _lon, _alt
+}
--- a/variants/t1000-e/target.h
+++ b/variants/t1000-e/target.h
@ -6,10 +6,21 @@
 #include <helpers/nrf52/T1000eBoard.h>
 #include <helpers/CustomLR1110Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
+#include <helpers/SensorManager.h>
+
+class T1000SensorManager : public SensorManager {
+  float _lat, _lon, _alt;
+public:
+  T1000SensorManager(): _lat(0), _lon(0), _alt(0) { }
+  bool begin() override;
+  bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
+  void loop() override;
+};

 extern T1000eBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
+extern T1000SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/t114/platformio.ini
+++ b/variants/t114/platformio.ini
@ -60,6 +60,9 @@ build_flags =
 extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
+  -I src/helpers/ui
+  -D ST7789
+  -D DISPLAY_CLASS=ST7789Display
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
@ -69,23 +72,17 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
-  +<helpers/nrf52/*.cpp>
+  +<helpers/nrf52/T114Board.cpp>
+  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${Heltec_t114.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Heltec_t114_companion_radio_ble_screen]
-extends = env:Heltec_t114_companion_radio_ble
-build_flags = ${env:Heltec_t114_companion_radio_ble.build_flags}
-  -I src/helpers/ui
-  -D ST7789
-  -D DISPLAY_CLASS=ST7789Display
-build_src_filter = ${env:Heltec_t114_companion_radio_ble.build_src_filter}
  +<../examples/companion_radio/UITask.cpp>
  +<helpers/ui/ST7789Display.cpp>
-lib_deps = ${env:Heltec_t114_companion_radio_ble.lib_deps}
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+  +<helpers/ui/OLEDDisplay.cpp>
+  +<helpers/ui/OLEDDisplayFonts.cpp>
+lib_deps =
+  adafruit/Adafruit GFX Library @ ^1.12.1
+  ${Heltec_t114.lib_deps}
+  densaugeo/base64 @ ~1.4.0

 [env:Heltec_t114_companion_radio_usb]
 extends = Heltec_t114
--- a/variants/t114/target.cpp
+++ b/variants/t114/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/t114/target.h
+++ b/variants/t114/target.h
@ -6,10 +6,12 @@
 #include <helpers/nrf52/T114Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern T114Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/t114/variant.cpp
+++ b/variants/t114/variant.cpp
@ -11,4 +11,5 @@ const uint32_t g_ADigitalPinMap[] = {

 void initVariant()
 {
+  pinMode(PIN_USER_BTN, INPUT);
 }
--- a/variants/techo/target.cpp
+++ b/variants/techo/target.cpp
@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/techo/target.h
+++ b/variants/techo/target.h
@ -6,10 +6,12 @@
 #include <helpers/nrf52/TechoBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TechoBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@ -33,6 +33,7 @@ build_flags =
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=8
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
--- a/variants/xiao_c3/target.cpp
+++ b/variants/xiao_c3/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_c3/target.h
+++ b/variants/xiao_c3/target.h
@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomSX1268Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern XiaoC3Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_nrf52/platformio.ini
+++ b/variants/xiao_nrf52/platformio.ini
@ -27,6 +27,12 @@ build_flags = ${nrf52840_xiao.build_flags}
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
+  -D P_LORA_DIO_1=D1
+  -D P_LORA_RESET=D2
+  -D P_LORA_BUSY=D3
+  -D P_LORA_NSS=D4
+  -D SX126X_DIO2_AS_RF_SWITCH=1
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=130
  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_xiao.build_src_filter}
@ -45,7 +51,6 @@ build_flags =
  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
  -D MESH_PACKET_LOGGING=1
  -D MESH_DEBUG=1
 build_src_filter = ${Xiao_nrf52.build_src_filter}
@ -61,12 +66,9 @@ build_flags =
  ${Xiao_nrf52.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
 build_src_filter = ${Xiao_nrf52.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/main.cpp>
--- a/variants/xiao_nrf52/target.cpp
+++ b/variants/xiao_nrf52/target.cpp
@ -9,6 +9,7 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU
 WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock rtc_clock;
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_nrf52/target.h
+++ b/variants/xiao_nrf52/target.h
@ -6,10 +6,12 @@
 #include <helpers/nrf52/XiaoNrf52Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
+#include <helpers/SensorManager.h>

 extern XiaoNrf52Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_nrf52/variant.h
+++ b/variants/xiao_nrf52/variant.h
@ -98,15 +98,15 @@ static const uint8_t A5  = PIN_A5;
 #define PIN_SPI_MOSI            (10)
 #define PIN_SPI_SCK             (8)

-static const uint8_t SS   = D3; // NSS for sx ?
-static const uint8_t MOSI = PIN_SPI_MOSI;
-static const uint8_t MISO = PIN_SPI_MISO;
-static const uint8_t SCK  = PIN_SPI_SCK ;
-
 #define PIN_SPI1_MISO           (25)
 #define PIN_SPI1_MOSI           (26)
 #define PIN_SPI1_SCK            (29)

+// Lora SPI is on SPI0
+#define  P_LORA_SCLK            PIN_SPI_SCK
+#define  P_LORA_MISO            PIN_SPI_MISO
+#define  P_LORA_MOSI            PIN_SPI_MOSI
+
 // Wire Interfaces
 #define WIRE_INTERFACES_COUNT   (1)

--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@ -79,17 +79,20 @@ build_flags =
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
+  -D DISPLAY_CLASS=SSD1306Display
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/main.cpp>
+  +<../examples/companion_radio>
 lib_deps =
  ${Xiao_S3_WIO.lib_deps}
  densaugeo/base64 @ ~1.4.0
+  adafruit/Adafruit SSD1306 @ ^2.5.13

 [env:Xiao_S3_WIO_companion_radio_serial]
 extends = Xiao_S3_WIO
@ -108,24 +111,4 @@ lib_deps =
  ${Xiao_S3_WIO.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Xiao_S3_WIO_expansion_companion_radio_ble]
-extends = Xiao_S3_WIO
-build_flags =
-  ${Xiao_S3_WIO.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-  -D DISPLAY_CLASS=SSD1306Display
-;  -D BLE_DEBUG_LOGGING=1
-;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${Xiao_S3_WIO.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio>
-lib_deps =
-  ${Xiao_S3_WIO.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-  adafruit/Adafruit SSD1306 @ ^2.5.13
+
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_s3_wio/target.h
+++ b/variants/xiao_s3_wio/target.h
@ -6,10 +6,12 @@
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();