Merge branch 'master' into esp32-c6

src/platform/esp32/architecture.h

@@ -76,6 +76,8 @@
 #ifdef HELTEC_V2_1
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_V2_1
 #endif
+#elif defined(HELTEC_WIRELESS_BRIDGE)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_BRIDGE
 #elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_V1
 #elif defined(TLORA_V1)
@@ -168,6 +170,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
 #elif defined(SENSECAP_INDICATOR)
 #define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
+#elif defined(SEEED_XIAO_S3)
+#define HW_VENDOR meshtastic_HardwareModel_SEEED_XIAO_S3
 #endif
 
 // -----------------------------------------------------------------------------

src/platform/nrf52/NRF52Bluetooth.cpp

@@ -55,7 +55,6 @@ static BluetoothPhoneAPI *bluetoothPhoneAPI;
 
 void onConnect(uint16_t conn_handle)
 {
-
     // Get the reference to current connection
     BLEConnection *connection = Bluefruit.Connection(conn_handle);
     connectionHandle = conn_handle;
@@ -70,8 +69,10 @@ void onConnect(uint16_t conn_handle)
  */
 void onDisconnect(uint16_t conn_handle, uint8_t reason)
 {
-    // FIXME - we currently assume only one active connection
     LOG_INFO("BLE Disconnected, reason = 0x%x\n", reason);
+    if (bluetoothPhoneAPI) {
+        bluetoothPhoneAPI->close();
+    }
 }
 void onCccd(uint16_t conn_hdl, BLECharacteristic *chr, uint16_t cccd_value)
 {

src/platform/nrf52/main-nrf52.cpp

@@ -12,6 +12,7 @@
 #include "PowerMon.h"
 #include "error.h"
 #include "main.h"
+#include "meshUtils.h"
 
 #ifdef BQ25703A_ADDR
 #include "BQ25713.h"
@@ -157,6 +158,7 @@ void nrf52Loop()
 
 #ifdef USE_SEMIHOSTING
 #include <SemihostingStream.h>
+#include <meshUtils.h>
 
 /**
  * Note: this variable is in BSS and therfore false by default.  But the gdbinit
@@ -261,10 +263,9 @@ void cpuDeepSleep(uint32_t msecToWake)
     // Sleepy trackers or sensors can low power "sleep"
     // Don't enter this if we're sleeping portMAX_DELAY, since that's a shutdown event
     if (msecToWake != portMAX_DELAY &&
-        (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
-         config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
-         config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR) &&
-        config.power.is_power_saving == true) {
+        (IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_TRACKER,
+                   meshtastic_Config_DeviceConfig_Role_TAK_TRACKER, meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+         config.power.is_power_saving == true)) {
         sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
         delay(msecToWake);
         NVIC_SystemReset();

src/platform/rp2xx0/architecture.h

@@ -23,6 +23,8 @@
 
 #if defined(RPI_PICO)
 #define HW_VENDOR meshtastic_HardwareModel_RPI_PICO
+#elif defined(RPI_PICO2)
+#define HW_VENDOR meshtastic_HardwareModel_RPI_PICO2
 #elif defined(RAK11310)
 #define HW_VENDOR meshtastic_HardwareModel_RAK11310
 #elif defined(SENSELORA_RP2040)