Merge branch 'master' into arduino-esp32-v3.2

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,7 +87,7 @@
   </screenshots>
 
   <releases>
-    <release version="2.7.1" date="2025-06-21">
+    <release version="2.7.1" date="2025-06-27">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.1</url>
     </release>
     <release version="2.7.0" date="2025-06-20">

debian/changelog

@@ -25,4 +25,4 @@ meshtasticd (2.7.1.0) UNRELEASED; urgency=medium
   [  ]
   * GitHub Actions Automatic version bump
 
- --  <github-actions[bot]@users.noreply.github.com>  Sat, 21 Jun 2025 15:51:49 +0000
+ --  <github-actions[bot]@users.noreply.github.com>  Fri, 27 Jun 2025 20:12:21 +0000

platformio.ini

@@ -110,7 +110,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/cdc6e5bdeedb8293d10e4a02be6ca64e95a7c515.zip
+	https://github.com/meshtastic/device-ui/archive/4b7bf369adfa5a7bd419fa8293d21206576d52d0.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/Power.cpp

@@ -682,7 +682,7 @@ bool Power::setup()
 
 void Power::shutdown()
 {
-    LOG_INFO("Shutting down");
+    LOG_INFO("Shutting Down");
 
 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1

src/input/ButtonThread.cpp

@@ -58,14 +58,14 @@ bool ButtonThread::initButton(const ButtonConfig &config)
         userButton.attachLongPressStart(
             [](void *callerThread) -> void {
                 ButtonThread *thread = (ButtonThread *)callerThread;
-                if (millis() > 30000) // hold off 30s after boot
+                // if (millis() > 30000) // hold off 30s after boot
                 thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
             },
             this);
         userButton.attachLongPressStop(
             [](void *callerThread) -> void {
                 ButtonThread *thread = (ButtonThread *)callerThread;
-                if (millis() > 30000) // hold off 30s after boot
+                // if (millis() > 30000) // hold off 30s after boot
                 thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
             },
             this);
@@ -254,7 +254,8 @@ int32_t ButtonThread::runOnce()
         case BUTTON_EVENT_LONG_RELEASED: {
 
             LOG_INFO("LONG PRESS RELEASE");
-            if (_longLongPress != INPUT_BROKER_NONE && (millis() - buttonPressStartTime) >= _longLongPressTime) {
+            if (millis() > 30000 && _longLongPress != INPUT_BROKER_NONE &&
+                (millis() - buttonPressStartTime) >= _longLongPressTime) {
                 evt.inputEvent = _longLongPress;
                 this->notifyObservers(&evt);
             }

src/input/ExpressLRSFiveWay.cpp

@@ -235,7 +235,7 @@ void ExpressLRSFiveWay::shutdown()
 {
     LOG_INFO("Shutdown from long press");
     powerFSM.trigger(EVENT_PRESS);
-    screen->startAlert("Shutting down...");
+    screen->startAlert("Shutting Down...");
     // Don't set alerting = true. We don't want to auto-dismiss this alert.
 
     playShutdownMelody(); // In case user adds a buzzer

src/mesh/NodeDB.cpp

@@ -1156,7 +1156,7 @@ void NodeDB::loadFromDisk()
         LOG_WARN("Node count %d exceeds MAX_NUM_NODES %d, truncating", numMeshNodes, MAX_NUM_NODES);
         numMeshNodes = MAX_NUM_NODES;
     }
-    meshNodes->resize(MAX_NUM_NODES);
+    meshNodes->resize(MAX_NUM_NODES + 1); // The rp2040, rp2035, and maybe other targets, have a problem doing a sort() when full
 
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
     state = loadProto(deviceStateFileName, meshtastic_DeviceState_size, sizeof(meshtastic_DeviceState),
@@ -1694,7 +1694,10 @@ void NodeDB::sortMeshDB()
 {
     if (!Throttle::isWithinTimespanMs(lastSort, 1000 * 5)) {
         lastSort = millis();
-        std::sort(meshNodes->begin(), meshNodes->end(), [](const meshtastic_NodeInfoLite &a, const meshtastic_NodeInfoLite &b) {
+        std::sort(meshNodes->begin(), meshNodes->begin() + numMeshNodes,
+                  [](const meshtastic_NodeInfoLite &a, const meshtastic_NodeInfoLite &b) {
+                      if (a.num == myNodeInfo.my_node_num && b.num == myNodeInfo.my_node_num) // in theory impossible
+                          return false;
                       if (a.num == myNodeInfo.my_node_num) {
                           return true;
                       }
@@ -1705,10 +1708,6 @@ void NodeDB::sortMeshDB()
                       bool bFav = b.is_favorite;
                       if (aFav != bFav)
                           return aFav;
-            if (a.last_heard == 0 || a.last_heard == UINT32_MAX)
-                return false;
-            if (b.last_heard == 0 || b.last_heard == UINT32_MAX)
-                return true;
                       return a.last_heard > b.last_heard;
                   });
     }

src/mesh/udp/UdpMulticastHandler.h

@@ -44,7 +44,10 @@ class UdpMulticastHandler final
         meshtastic_MeshPacket mp;
         LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
         bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
-        if (isPacketDecoded && router) {
+        if (isPacketDecoded && router && mp.which_payload_variant == meshtastic_MeshPacket_encrypted_tag) {
+            mp.pki_encrypted = false;
+            mp.public_key.size = 0;
+            memset(mp.public_key.bytes, 0, sizeof(mp.public_key.bytes));
             UniquePacketPoolPacket p = packetPool.allocUniqueCopy(mp);
             // Unset received SNR/RSSI
             p->rx_snr = 0;

src/modules/SystemCommandsModule.cpp

@@ -107,8 +107,8 @@ int SystemCommandsModule::handleInputEvent(const InputEvent *event)
         return true;
     // Power control
     case INPUT_BROKER_SHUTDOWN:
-        LOG_ERROR("Shutting down");
+        LOG_ERROR("Shutting Down");
-        IF_SCREEN(screen->showOverlayBanner("Shutting down..."));
+        IF_SCREEN(screen->showOverlayBanner("Shutting Down..."));
         nodeDB->saveToDisk();
         shutdownAtMsec = millis() + DEFAULT_SHUTDOWN_SECONDS * 1000;
         // runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;

src/platform/nrf52/NRF52Bluetooth.cpp

@@ -314,7 +314,9 @@ void NRF52Bluetooth::onConnectionSecured(uint16_t conn_handle)
 }
 bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passkey[6], bool match_request)
 {
-    LOG_INFO("BLE pair process started with passkey %.3s %.3s", passkey, passkey + 3);
+    char passkey1[4] = {passkey[0], passkey[1], passkey[2], '\0'};
+    char passkey2[4] = {passkey[3], passkey[4], passkey[5], '\0'};
+    LOG_INFO("BLE pair process started with passkey %s %s", passkey1, passkey2);
     powerFSM.trigger(EVENT_BLUETOOTH_PAIR);
 
     // Get passkey as string
@@ -327,6 +329,7 @@ bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passke
     bluetoothStatus->updateStatus(new meshtastic::BluetoothStatus(textkey));
 
 #if !defined(MESHTASTIC_EXCLUDE_SCREEN) // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
+    if (screen) {
         screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
             char btPIN[16] = "888888";
             snprintf(btPIN, sizeof(btPIN), "%06u", configuredPasskey);
@@ -352,6 +355,7 @@ bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passke
             y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_LARGE - 6 : y_offset + FONT_HEIGHT_LARGE + 5;
             display->drawString(x_offset + x, y_offset + y, deviceName);
         });
+    }
 #endif
     if (match_request) {
         uint32_t start_time = millis();
@@ -394,8 +398,7 @@ void NRF52Bluetooth::onPairingCompleted(uint16_t conn_handle, uint8_t auth_statu
 {
     if (auth_status == BLE_GAP_SEC_STATUS_SUCCESS) {
         LOG_INFO("BLE pair success");
-        bluetoothStatus->updateStatus(
+        bluetoothStatus->updateStatus(new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::CONNECTED));
-            new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED));
     } else {
         LOG_INFO("BLE pair failed");
         // Notify UI (or any other interested firmware components)
@@ -404,8 +407,10 @@ void NRF52Bluetooth::onPairingCompleted(uint16_t conn_handle, uint8_t auth_statu
     }
 
     // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
+    if (screen) {
         screen->endAlert();
     }
+}
 
 void NRF52Bluetooth::sendLog(const uint8_t *logMessage, size_t length)
 {

variants/seeed_xiao_nrf52840_kit/variant.h

@@ -179,7 +179,11 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define I2C_NO_RESCAN // I2C is a bit finicky, don't scan too much
 #define WIRE_INTERFACES_COUNT 1
 
-#if !defined(XIAO_BLE_LEGACY_PINOUT) && !defined(GPS_L76K)
+#if defined(XIAO_BLE_LEGACY_PINOUT)
+// Used for I2C by DIY xiao_ble variant
+#define PIN_WIRE_SDA D4
+#define PIN_WIRE_SCL D5
+#elif !defined(GPS_L76K)
 // If D6 and D7 are free, I2C is probably the most versatile assignment
 #define PIN_WIRE_SDA D6
 #define PIN_WIRE_SCL D7