Merge branch 'master' into master

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)

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/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)