.github/workflows/main_matrix.yml

@@ -320,23 +320,19 @@ jobs:
         run: ls -lR
 
       - name: Add deb files to release
-        run: |
-          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
-          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
-          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
-          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.version.outputs.long }}
+          files: |
+            ./output/meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
+            ./output/meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
+            ./output/meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
+            ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
 
       - name: Bump version.properties
         run: >-
           bin/bump_version.py
 
-      - name: Install debian tools for changelog
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y devscripts
-
       - name: Update debian changelog
         run: >-
           debian/ci_changelog.sh
@@ -401,8 +397,9 @@ jobs:
         run: ls -lR
 
       - name: Add bins and debug elfs to release
-        run: |
-          gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
-          gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.version.outputs.long }}
+          files: |
+            ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
+            ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip

protobufs

@@ -1 +1 @@
-Subproject commit 76f806e1bb1e2a7b157a14fadd095775f63db5e4
+Subproject commit c55f120a9c1ce90c85e4826907a0b9bcb2d5f5a2

src/SafeFile.cpp

@@ -6,11 +6,6 @@
 static File openFile(const char *filename, bool fullAtomic)
 {
     concurrency::LockGuard g(spiLock);
-    LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
-#ifdef ARCH_NRF52
-    lfs_assert_failed = false;
-    return FSCom.open(filename, FILE_O_WRITE);
-#endif
     if (!fullAtomic)
         FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
 
@@ -19,6 +14,7 @@ static File openFile(const char *filename, bool fullAtomic)
 
     // clear any previous LFS errors
     lfs_assert_failed = false;
+
     return FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
 }
 
@@ -61,10 +57,6 @@ bool SafeFile::close()
     spiLock->lock();
     f.close();
     spiLock->unlock();
-
-#ifdef ARCH_NRF52
-    return true;
-#endif
     if (!testReadback())
         return false;
 

src/mesh/NodeDB.cpp

@@ -958,7 +958,7 @@ void NodeDB::loadFromDisk()
 #endif
 
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
-    auto state = loadProto(prefFileName, sizeof(meshtastic_DeviceState) + MAX_NUM_NODES_FS * meshtastic_NodeInfoLite_size,
+    auto state = loadProto(prefFileName, sizeof(meshtastic_DeviceState) + MAX_NUM_NODES_FS * sizeof(meshtastic_NodeInfo),
                            sizeof(meshtastic_DeviceState), &meshtastic_DeviceState_msg, &devicestate);
 
     // See https://github.com/meshtastic/firmware/issues/4184#issuecomment-2269390786
@@ -1147,9 +1147,8 @@ bool NodeDB::saveDeviceStateToDisk()
 #endif
     // Note: if MAX_NUM_NODES=100 and meshtastic_NodeInfoLite_size=166, so will be approximately 17KB
     // Because so huge we _must_ not use fullAtomic, because the filesystem is probably too small to hold two copies of this
-    size_t deviceStateSize;
-    pb_get_encoded_size(&deviceStateSize, meshtastic_DeviceState_fields, &devicestate);
-    return saveProto(prefFileName, deviceStateSize, &meshtastic_DeviceState_msg, &devicestate, false);
+    return saveProto(prefFileName, sizeof(devicestate) + numMeshNodes * meshtastic_NodeInfoLite_size, &meshtastic_DeviceState_msg,
+                     &devicestate, false);
 }
 
 bool NodeDB::saveToDiskNoRetry(int saveWhat)