Merge master into tdeck-touch-fix

.github/actions/build-variant/action.yml

@@ -76,7 +76,7 @@ runs:
         done
 
     - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v6
+      uses: actions/cache@v5
       with:
         path: ~/.platformio/.cache
         key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}

.trunk/trunk.yaml

@@ -9,12 +9,12 @@ plugins:
 lint:
   enabled:
     - checkov@3.3.1
-    - renovate@43.236.0
+    - renovate@43.232.0
     - prettier@3.8.4
     - trufflehog@3.95.6
     - yamllint@1.38.0
     - bandit@1.9.4
-    - trivy@0.71.2
+    - trivy@0.71.1
     - taplo@0.10.0
     - ruff@0.15.18
     - isort@8.0.1

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,9 +87,6 @@
   </screenshots>
 
   <releases>
-    <release version="2.7.27" date="2026-06-24">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.27</url>
-    </release>
     <release version="2.7.26" date="2026-06-10">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.26</url>
     </release>

debian/changelog

@@ -1,9 +1,3 @@
-meshtasticd (2.7.27.0) unstable; urgency=medium
-
-  * Version 2.7.27
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Wed, 24 Jun 2026 11:20:05 +0000
-
 meshtasticd (2.7.26.0) unstable; urgency=medium
 
   * Version 2.7.26

src/FSCommon.cpp

@@ -99,87 +99,48 @@ bool renameFile(const char *pathFrom, const char *pathTo)
 #endif
 }
 
-#include <cstring>
-#include <new>
-#include <stdexcept>
 #include <vector>
 
+/**
+ * @brief Get the list of files in a directory.
+ *
+ * This function returns a list of files in a directory. The list includes the full path of each file.
+ * We can't use SPILOCK here because of recursion. Callers of this function should use SPILOCK.
+ *
+ * @param dirname The name of the directory.
+ * @param levels The number of levels of subdirectories to list.
+ * @return A vector of strings containing the full path of each file in the directory.
+ */
+std::vector<meshtastic_FileInfo> getFiles(const char *dirname, uint8_t levels)
+{
+    std::vector<meshtastic_FileInfo> filenames = {};
 #ifdef FSCom
-namespace
-{
-bool pathEndsWithDot(const char *path)
-{
-    if (!path)
-        return false;
-
-    size_t length = strlen(path);
-    return length > 0 && path[length - 1] == '.';
-}
-
-bool copyFilePath(char *dest, size_t destSize, const char *path, bool *wasLimited)
-{
-    if (!path || destSize == 0) {
-        if (wasLimited)
-            *wasLimited = true;
-        return false;
-    }
-
-    if (strlcpy(dest, path, destSize) >= destSize) {
-        if (wasLimited)
-            *wasLimited = true;
-        return false;
-    }
-
-    return true;
-}
-
-void collectFiles(const char *dirname, uint8_t levels, size_t maxCount, std::vector<meshtastic_FileInfo> &filenames,
-                  bool *wasLimited)
-{
-    if (!dirname)
-        return;
-
     File root = FSCom.open(dirname, FILE_O_READ);
     if (!root)
-        return;
-    if (!root.isDirectory()) {
-        root.close();
-        return;
-    }
+        return filenames;
+    if (!root.isDirectory())
+        return filenames;
 
     File file = root.openNextFile();
-    // file.name()[0] check is a workaround for a bug in the Adafruit LittleFS nrf52 glue (see issue 4395)
-    while (file && file.name()[0]) {
-        if (filenames.size() >= maxCount) {
-            if (wasLimited)
-                *wasLimited = true;
-            file.close();
-            break;
-        }
-        const char *fileName = file.name();
-        if (file.isDirectory() && !pathEndsWithDot(fileName)) {
-            char pathBuffer[sizeof(((meshtastic_FileInfo *)nullptr)->file_name)] = {};
+    while (file) {
+        if (file.isDirectory() && !String(file.name()).endsWith(".")) {
+            if (levels) {
 #ifdef ARCH_ESP32
-            const char *subDirPath = file.path();
+                std::vector<meshtastic_FileInfo> subDirFilenames = getFiles(file.path(), levels - 1);
 #else
-            const char *subDirPath = fileName;
+                std::vector<meshtastic_FileInfo> subDirFilenames = getFiles(file.name(), levels - 1);
 #endif
-            bool hasSubDirPath = copyFilePath(pathBuffer, sizeof(pathBuffer), subDirPath, wasLimited);
-            file.close();
-
-            if (levels && hasSubDirPath) {
-                collectFiles(pathBuffer, levels - 1, maxCount, filenames, wasLimited);
-            } else if (wasLimited) {
-                *wasLimited = true;
+                filenames.insert(filenames.end(), subDirFilenames.begin(), subDirFilenames.end());
+                file.close();
             }
         } else {
             meshtastic_FileInfo fileInfo = {"", static_cast<uint32_t>(file.size())};
 #ifdef ARCH_ESP32
-            bool hasFilePath = copyFilePath(fileInfo.file_name, sizeof(fileInfo.file_name), file.path(), wasLimited);
+            strcpy(fileInfo.file_name, file.path());
 #else
-            bool hasFilePath = copyFilePath(fileInfo.file_name, sizeof(fileInfo.file_name), file.name(), wasLimited);
+            strcpy(fileInfo.file_name, file.name());
 #endif
-            if (hasFilePath && !pathEndsWithDot(fileInfo.file_name)) {
+            if (!String(fileInfo.file_name).endsWith(".")) {
                 filenames.push_back(fileInfo);
             }
             file.close();
@@ -187,41 +148,6 @@ void collectFiles(const char *dirname, uint8_t levels, size_t maxCount, std::vec
         file = root.openNextFile();
     }
     root.close();
-}
-} // namespace
-#endif
-
-// Callers must hold the SPI lock; recursion prevents taking it here.
-std::vector<meshtastic_FileInfo> getFiles(const char *dirname, uint8_t levels, size_t maxCount, bool *wasLimited)
-{
-    std::vector<meshtastic_FileInfo> filenames = {};
-    if (wasLimited)
-        *wasLimited = false;
-#ifdef FSCom
-#if defined(__cpp_exceptions) || defined(__EXCEPTIONS)
-    size_t reservedCount = maxCount;
-    while (reservedCount > 0) {
-        try {
-            filenames.reserve(reservedCount);
-            break;
-        } catch (const std::bad_alloc &) {
-            reservedCount /= 2;
-        } catch (const std::length_error &) {
-            reservedCount /= 2;
-        }
-    }
-    if (reservedCount == 0) {
-        if (wasLimited)
-            *wasLimited = true;
-        return filenames;
-    }
-    if (reservedCount < maxCount) {
-        if (wasLimited)
-            *wasLimited = true;
-        maxCount = reservedCount;
-    }
-#endif
-    collectFiles(dirname, levels, maxCount, filenames, wasLimited);
 #endif
     return filenames;
 }
@@ -409,4 +335,4 @@ void setupSDCard()
     LOG_DEBUG("Total space: %lu MB", (uint32_t)(SD.totalBytes() / (1024 * 1024)));
     LOG_DEBUG("Used space: %lu MB", (uint32_t)(SD.usedBytes() / (1024 * 1024)));
 #endif
-}
+}

src/FSCommon.h

@@ -52,7 +52,7 @@ void fsInit();
 void fsListFiles();
 bool copyFile(const char *from, const char *to);
 bool renameFile(const char *pathFrom, const char *pathTo);
-std::vector<meshtastic_FileInfo> getFiles(const char *dirname, uint8_t levels, size_t maxCount = 64, bool *wasLimited = nullptr);
+std::vector<meshtastic_FileInfo> getFiles(const char *dirname, uint8_t levels);
 void listDir(const char *dirname, uint8_t levels, bool del = false);
 void rmDir(const char *dirname);
-void setupSDCard();
+void setupSDCard();

src/mesh/PhoneAPI.cpp

@@ -36,17 +36,6 @@
 // Flag to indicate a heartbeat was received and we should send queue status
 bool heartbeatReceived = false;
 
-namespace
-{
-constexpr uint8_t FILES_MANIFEST_LEVELS = 3;
-constexpr size_t FILES_MANIFEST_MAX_COUNT = 64;
-
-void releaseFilesManifest(std::vector<meshtastic_FileInfo> &filesManifest)
-{
-    std::vector<meshtastic_FileInfo>().swap(filesManifest);
-}
-} // namespace
-
 PhoneAPI::PhoneAPI()
 {
     lastContactMsec = millis();
@@ -81,23 +70,10 @@ void PhoneAPI::handleStartConfig()
         state = STATE_SEND_MY_INFO;
     }
     pauseBluetoothLogging = true;
-    // Manifest is never read on the node-info-only path (STATE_SEND_FILEMANIFEST
-    // short-circuits to sendConfigComplete), so skip the SPI lock + FS walk.
-    if (config_nonce != SPECIAL_NONCE_ONLY_NODES) {
-        bool filesManifestLimited = false;
-        {
-            concurrency::LockGuard guard(spiLock);
-            filesManifest = getFiles("/", FILES_MANIFEST_LEVELS, FILES_MANIFEST_MAX_COUNT, &filesManifestLimited);
-        }
-        if (filesManifestLimited) {
-            LOG_WARN("Got %zu files in manifest (limited to %zu entries/depth %u)", filesManifest.size(),
-                     FILES_MANIFEST_MAX_COUNT, static_cast<unsigned>(FILES_MANIFEST_LEVELS));
-        } else {
-            LOG_DEBUG("Got %zu files in manifest", filesManifest.size());
-        }
-    } else {
-        releaseFilesManifest(filesManifest);
-    }
+    spiLock->lock();
+    filesManifest = getFiles("/", 10);
+    spiLock->unlock();
+    LOG_DEBUG("Got %d files in manifest", filesManifest.size());
 
     LOG_INFO("Start API client config millis=%u", millis());
     // Protect against concurrent BLE callbacks: they run in NimBLE's FreeRTOS task and also touch nodeInfoQueue.
@@ -146,7 +122,8 @@ void PhoneAPI::close()
             nodeInfoQueue.clear();
         }
         packetForPhone = NULL;
-        releaseFilesManifest(filesManifest);
+        filesManifest.clear();
+        filesManifest.shrink_to_fit();
         lastPortNumToRadio.clear();
         fromRadioNum = 0;
         config_nonce = 0;
@@ -555,7 +532,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         if (config_state == filesManifest.size() ||
             config_nonce == SPECIAL_NONCE_ONLY_NODES) { // also handles an empty filesManifest
             config_state = 0;
-            releaseFilesManifest(filesManifest);
+            filesManifest.clear();
             // Skip to complete packet
             sendConfigComplete();
         } else {

variants/esp32s3/picomputer-s3/platformio.ini

@@ -37,9 +37,6 @@ extends = env:picomputer-s3
 build_flags =
   ${env:picomputer-s3.build_flags}
   -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  ; device-ui's I2CKeyboardScanner unconditionally calls Wire.begin(I2C_SDA, I2C_SCL);
-  -D I2C_SDA=8
-  -D I2C_SCL=9
   -D INPUTDRIVER_MATRIX_TYPE=1
   -D USE_PIN_BUZZER=PIN_BUZZER
   -D USE_SX127x

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 7
-build = 27
+build = 26