mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-05 06:33:56 +00:00
Compare commits
2 Commits
3b40fe9805
...
d1f7739bbe
Author | SHA1 | Date | |
---|---|---|---|
![]() |
d1f7739bbe | ||
![]() |
0d860882a8 |
@ -4,7 +4,7 @@ platform = platformio/nordicnrf52@^10.7.0
|
|||||||
extends = arduino_base
|
extends = arduino_base
|
||||||
platform_packages =
|
platform_packages =
|
||||||
; our custom Git version until they merge our PR
|
; 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
|
toolchain-gccarmnoneeabi@~1.90301.0
|
||||||
|
|
||||||
build_type = debug
|
build_type = debug
|
||||||
|
@ -8,9 +8,8 @@ static File openFile(const char *filename, bool fullAtomic)
|
|||||||
concurrency::LockGuard g(spiLock);
|
concurrency::LockGuard g(spiLock);
|
||||||
LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
|
LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
|
||||||
#ifdef ARCH_NRF52
|
#ifdef ARCH_NRF52
|
||||||
File file = FSCom.open(filename, FILE_O_WRITE);
|
FSCom.remove(filename);
|
||||||
file.seek(0);
|
return FSCom.open(filename, FILE_O_WRITE);
|
||||||
return file;
|
|
||||||
#endif
|
#endif
|
||||||
if (!fullAtomic)
|
if (!fullAtomic)
|
||||||
FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
|
FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
|
||||||
@ -59,9 +58,6 @@ bool SafeFile::close()
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
spiLock->lock();
|
spiLock->lock();
|
||||||
#ifdef ARCH_NRF52
|
|
||||||
f.truncate();
|
|
||||||
#endif
|
|
||||||
f.close();
|
f.close();
|
||||||
spiLock->unlock();
|
spiLock->unlock();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user