aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HAL_PX4: disable rename of old parameter file for now

Browse Source 
be nice to release candidate users
This commit is contained in:
Andrew Tridgell 2014-01-14 22:00:56 +11:00
parent 461638780b
commit 376ab30366
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_HAL_PX4/Storage.cpp
View File

@ -25,6 +25,7 @@ using namespace PX4;
#define OLD_STORAGE_FILE_BAK STORAGE_DIR "/" SKETCHNAME ".bak" #define OLD_STORAGE_FILE_BAK STORAGE_DIR "/" SKETCHNAME ".bak"
#define MTD_PARAMS_FILE "/fs/mtd_params" #define MTD_PARAMS_FILE "/fs/mtd_params"
#define MTD_SIGNATURE 0x14012014 #define MTD_SIGNATURE 0x14012014
#define STORAGE_RENAME_OLD_FILE 0
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
@ -122,7 +123,9 @@ void PX4Storage::_upgrade_to_mtd(void)
hal.scheduler->panic("Unable to write MTD for upgrade"); hal.scheduler->panic("Unable to write MTD for upgrade");
} }
close(mtd_fd); close(mtd_fd);
#if STORAGE_RENAME_OLD_FILE
rename(OLD_STORAGE_FILE, OLD_STORAGE_FILE_BAK); rename(OLD_STORAGE_FILE, OLD_STORAGE_FILE_BAK);
#endif
::printf("Upgraded MTD from %s\n", OLD_STORAGE_FILE); ::printf("Upgraded MTD from %s\n", OLD_STORAGE_FILE);
} }
@ -168,7 +171,9 @@ void PX4Storage::_storage_open(void)
bool good_signature = (_mtd_signature() == MTD_SIGNATURE); bool good_signature = (_mtd_signature() == MTD_SIGNATURE);
if (stat(OLD_STORAGE_FILE, &st) == 0) { if (stat(OLD_STORAGE_FILE, &st) == 0) {
if (good_signature) { if (good_signature) {
#if STORAGE_RENAME_OLD_FILE
rename(OLD_STORAGE_FILE, OLD_STORAGE_FILE_BAK); rename(OLD_STORAGE_FILE, OLD_STORAGE_FILE_BAK);
#endif
} else { } else {
_upgrade_to_mtd(); _upgrade_to_mtd();
} }