Peg NRF52 arduino to meshtastic fork with LFE bluetooth fix (#5924 )

NRF52 - Remove file totally before opening write (#5916 )
* Remove prefs first * Remove file first * Remove truncate * No longer needed * Missed a param * That wasn't supposed to be there * Remove vestigal lfs assert * Durr
2025-10-03 13:55:45 +00:00 · 2025-01-23 19:56:59 -06:00 · 2025-01-23 19:12:20 -06:00
2 changed files with 3 additions and 7 deletions
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@ -4,7 +4,7 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
  ; our custom Git version until they merge our PR
-  framework-arduinoadafruitnrf52 @ https://github.com/geeksville/Adafruit_nRF52_Arduino.git
+  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
  toolchain-gccarmnoneeabi@~1.90301.0

 build_type = debug
--- a/src/SafeFile.cpp
+++ b/src/SafeFile.cpp
@ -8,9 +8,8 @@ static File openFile(const char *filename, bool fullAtomic)
    concurrency::LockGuard g(spiLock);
    LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
 #ifdef ARCH_NRF52
-    File file = FSCom.open(filename, FILE_O_WRITE);
-    file.seek(0);
-    return file;
+    FSCom.remove(filename);
+    return FSCom.open(filename, FILE_O_WRITE);
 #endif
    if (!fullAtomic)
        FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
@ -59,9 +58,6 @@ bool SafeFile::close()
        return false;

    spiLock->lock();
-#ifdef ARCH_NRF52
-    f.truncate();
-#endif
    f.close();
    spiLock->unlock();
Author	SHA1	Message	Date
Ben Meadors	d1f7739bbe	Peg NRF52 arduino to meshtastic fork with LFE bluetooth fix (#5924 ) Some checks failed CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / package-raspbian (push) Waiting to run Details CI / package-raspbian-armv7l (push) Waiting to run Details CI / package-native (push) Waiting to run Details CI / build-debian-src (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-debian-amd64 (push) Waiting to run Details CI / docker-alpine-amd64 (push) Waiting to run Details CI / docker-debian-arm64 (push) Waiting to run Details CI / docker-debian-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Flawfinder Scan / Flawfinder (push) Waiting to run Details Nightly / Trunk Check Upload (push) Has been cancelled Details	2025-01-23 19:56:59 -06:00
Ben Meadors	0d860882a8	NRF52 - Remove file totally before opening write (#5916 ) * Remove prefs first * Remove file first * Remove truncate * No longer needed * Missed a param * That wasn't supposed to be there * Remove vestigal lfs assert * Durr	2025-01-23 19:12:20 -06:00