Fix OTA partition name matching

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.trunk/trunk.yaml

@@ -9,10 +9,10 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.497
-    - renovate@42.78.2
+    - renovate@42.80.1
     - prettier@3.7.4
     - trufflehog@3.92.4
-    - yamllint@1.37.1
+    - yamllint@1.38.0
     - bandit@1.9.2
     - trivy@0.68.2
     - taplo@0.10.0

platformio.ini

@@ -119,7 +119,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/12f8cddc1e2908e1988da21e3500c695668e8d92.zip
+	https://github.com/meshtastic/device-ui/archive/5a870c623a4e9ab7a7abe3d02950536f107d1a31.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/SafeFile.cpp

@@ -54,7 +54,7 @@ size_t SafeFile::write(const uint8_t *buffer, size_t size)
 }
 
 /**
- * Atomically close the file (deleting any old versions) and readback the contents to confirm the hash matches
+ * Atomically close the file (overwriting any old version) and readback the contents to confirm the hash matches
  *
  * @return false for failure
  */
@@ -73,15 +73,7 @@ bool SafeFile::close()
     if (!testReadback())
         return false;
 
-    { // Scope for lock
-        concurrency::LockGuard g(spiLock);
-        // brief window of risk here ;-)
-        if (fullAtomic && FSCom.exists(filename.c_str()) && !FSCom.remove(filename.c_str())) {
-            LOG_ERROR("Can't remove old pref file");
-            return false;
-        }
-    }
-
+    // Rename or overwrite (atomic operation)
     String filenameTmp = filename;
     filenameTmp += ".tmp";
     if (!renameFile(filenameTmp.c_str(), filename.c_str())) {

src/mesh/generated/meshtastic/config.pb.h

@@ -66,7 +66,7 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
     but should not be given priority over other routers in order to avoid unnecessaraily
     consuming hops. */
     meshtastic_Config_DeviceConfig_Role_ROUTER_LATE = 11,
-    /* Description: Treats packets from or to favorited nodes as ROUTER, and all other packets as CLIENT.
+    /* Description: Treats packets from or to favorited nodes as ROUTER_LATE, and all other packets as CLIENT.
  Technical Details: Used for stronger attic/roof nodes to distribute messages more widely
     from weaker, indoor, or less-well-positioned nodes. Recommended for users with multiple nodes
     where one CLIENT_BASE acts as a more powerful base station, such as an attic/roof node. */

src/platform/esp32/BleOta.cpp

@@ -1,31 +1,53 @@
 #include "BleOta.h"
 #include "Arduino.h"
+#include <cctype>
 #include <esp_ota_ops.h>
+#include <string>
 
-static const String MESHTASTIC_OTA_APP_PROJECT_NAME("Meshtastic-OTA");
+static bool isMeshtasticOtaProject(const esp_app_desc_t &desc)
+{
+    std::string name(desc.project_name);
+    return name.find("Meshtastic") != std::string::npos && name.find("OTA") != std::string::npos;
+}
 
 const esp_partition_t *BleOta::findEspOtaAppPartition()
 {
-    const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
-
     esp_app_desc_t app_desc;
-    esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+    esp_err_t ret = ESP_ERR_INVALID_ARG;
 
-    if (ret != ESP_OK || MESHTASTIC_OTA_APP_PROJECT_NAME != app_desc.project_name) {
-        part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, nullptr);
+    // Try standard OTA slots first (app0 / app1)
+    const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
+    if (part) {
         ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
     }
 
-    if (ret == ESP_OK && MESHTASTIC_OTA_APP_PROJECT_NAME == app_desc.project_name) {
-        return part;
-    } else {
-        return nullptr;
+    if (!part || ret != ESP_OK || !isMeshtasticOtaProject(app_desc)) {
+        part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, nullptr);
+        if (part) {
+            ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+        }
     }
+
+    // Fallback: look by partition label "app1" in case table uses custom labels
+    if ((!part || ret != ESP_OK || !isMeshtasticOtaProject(app_desc))) {
+        part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_ANY, "app1");
+        if (part) {
+            ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+        }
+    }
+
+    if (part && ret == ESP_OK && isMeshtasticOtaProject(app_desc)) {
+        return part;
+    }
+    return nullptr;
 }
 
 String BleOta::getOtaAppVersion()
 {
     const esp_partition_t *part = findEspOtaAppPartition();
+    if (!part) {
+        return String();
+    }
     esp_app_desc_t app_desc;
     esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
     String version;

variants/esp32s3/elecrow_panel/platformio.ini

@@ -44,7 +44,7 @@ lib_deps = ${esp32s3_base.lib_deps}
   # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
   # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
+  earlephilhower/ESP8266SAM@1.1.0
   # renovate: datasource=custom.pio depName=TCA9534 packageName=hideakitai/library/TCA9534
   hideakitai/TCA9534@0.1.1
   lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality

variants/esp32s3/tlora-pager/platformio.ini

@@ -33,7 +33,7 @@ lib_deps = ${esp32s3_base.lib_deps}
   # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
   # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
+  earlephilhower/ESP8266SAM@1.1.0
   # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
   adafruit/Adafruit DRV2605 Library@1.2.4
   # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library