Factory reset function (manual EEPROM format)
This commit is contained in:
@@ -58,6 +58,7 @@ bool eeModelExists(uint8_t id);
|
|||||||
void eeLoadModelName(uint8_t id, char *name);
|
void eeLoadModelName(uint8_t id, char *name);
|
||||||
void eeLoadModel(uint8_t id);
|
void eeLoadModel(uint8_t id);
|
||||||
bool eeConvert();
|
bool eeConvert();
|
||||||
|
void eeErase(bool warn);
|
||||||
void ConvertModel(int id, int version);
|
void ConvertModel(int id, int version);
|
||||||
uint8_t eeFindEmptyModel(uint8_t id, bool down);
|
uint8_t eeFindEmptyModel(uint8_t id, bool down);
|
||||||
void selectModel(uint8_t sub);
|
void selectModel(uint8_t sub);
|
||||||
|
|||||||
+16
-13
@@ -1016,6 +1016,21 @@ void eeLoadModel(uint8_t id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void eeErase(bool warn)
|
||||||
|
{
|
||||||
|
generalDefault();
|
||||||
|
|
||||||
|
if (warn) {
|
||||||
|
ALERT(STR_EEPROMWARN, STR_BADEEPROMDATA, AU_BAD_EEPROM);
|
||||||
|
}
|
||||||
|
|
||||||
|
MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING);
|
||||||
|
EeFsFormat();
|
||||||
|
theFile.writeRlc(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&g_eeGeneral, sizeof(EEGeneral), true);
|
||||||
|
modelDefault(0);
|
||||||
|
theFile.writeRlc(FILE_MODEL(0), FILE_TYP_MODEL, (uint8_t*)&g_model, sizeof(g_model), true);
|
||||||
|
}
|
||||||
|
|
||||||
// TODO merge this code with eeprom_arm.cpp one
|
// TODO merge this code with eeprom_arm.cpp one
|
||||||
void eeReadAll()
|
void eeReadAll()
|
||||||
{
|
{
|
||||||
@@ -1023,19 +1038,7 @@ void eeReadAll()
|
|||||||
EeFsck() < 0 ||
|
EeFsck() < 0 ||
|
||||||
!eeLoadGeneral())
|
!eeLoadGeneral())
|
||||||
{
|
{
|
||||||
generalDefault();
|
eeErase(true);
|
||||||
|
|
||||||
ALERT(STR_EEPROMWARN, STR_BADEEPROMDATA, AU_BAD_EEPROM);
|
|
||||||
|
|
||||||
MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING);
|
|
||||||
|
|
||||||
EeFsFormat();
|
|
||||||
|
|
||||||
theFile.writeRlc(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&g_eeGeneral, sizeof(EEGeneral), true);
|
|
||||||
|
|
||||||
modelDefault(0);
|
|
||||||
|
|
||||||
theFile.writeRlc(FILE_MODEL(0), FILE_TYP_MODEL, (uint8_t*)&g_model, sizeof(g_model), true);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
eeLoadModelHeaders();
|
eeLoadModelHeaders();
|
||||||
|
|||||||
@@ -88,12 +88,23 @@ void backupEeprom()
|
|||||||
|
|
||||||
void menuGeneralVersion(uint8_t event)
|
void menuGeneralVersion(uint8_t event)
|
||||||
{
|
{
|
||||||
|
if (s_warning_result) {
|
||||||
|
s_warning_result = 0;
|
||||||
|
displayPopup(STR_EEPROMFORMATTING);
|
||||||
|
eeErase(false);
|
||||||
|
NVIC_SystemReset();
|
||||||
|
}
|
||||||
|
|
||||||
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, e_Vers, 1);
|
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, e_Vers, 1);
|
||||||
|
|
||||||
lcd_putsLeft(MENU_HEADER_HEIGHT+FH, vers_stamp);
|
lcd_putsLeft(MENU_HEADER_HEIGHT+FH, vers_stamp);
|
||||||
|
|
||||||
lcd_putsLeft(MENU_HEADER_HEIGHT+6*FH, STR_EEBACKUP);
|
lcd_putsLeft(MENU_HEADER_HEIGHT+5*FH, STR_EEBACKUP);
|
||||||
|
lcd_putsLeft(MENU_HEADER_HEIGHT+6*FH, STR_FACTORYRESET);
|
||||||
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
backupEeprom();
|
backupEeprom();
|
||||||
}
|
}
|
||||||
|
else if (event == EVT_KEY_LONG(KEY_MENU)) {
|
||||||
|
POPUP_CONFIRMATION(STR_CONFIRMRESET);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -499,6 +499,8 @@ const pm_char STR_FLASH_EXTERNAL_DEVICE[] PROGMEM = TR_FLASH_EXTERNAL_DEVICE;
|
|||||||
const pm_char STR_WRITING[] PROGMEM = TR_WRITING;
|
const pm_char STR_WRITING[] PROGMEM = TR_WRITING;
|
||||||
const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT;
|
const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT;
|
||||||
const pm_char STR_EEBACKUP[] PROGMEM = TR_EEBACKUP;
|
const pm_char STR_EEBACKUP[] PROGMEM = TR_EEBACKUP;
|
||||||
|
const pm_char STR_FACTORYRESET[] PROGMEM = TR_FACTORYRESET;
|
||||||
|
const pm_char STR_CONFIRMRESET[] PROGMEM = TR_CONFIRMRESET;
|
||||||
const pm_char STR_TOO_MANY_LUA_SCRIPTS[] PROGMEM = TR_TO_MANY_LUA_SCRIPTS;
|
const pm_char STR_TOO_MANY_LUA_SCRIPTS[] PROGMEM = TR_TO_MANY_LUA_SCRIPTS;
|
||||||
const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
|
const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
|
||||||
|
|
||||||
|
|||||||
@@ -669,6 +669,8 @@ extern const pm_char STR_FLASH_INTERNAL_MODULE[];
|
|||||||
extern const pm_char STR_WRITING[];
|
extern const pm_char STR_WRITING[];
|
||||||
extern const pm_char STR_CONFIRM_FORMAT[];
|
extern const pm_char STR_CONFIRM_FORMAT[];
|
||||||
extern const pm_char STR_EEBACKUP[];
|
extern const pm_char STR_EEBACKUP[];
|
||||||
|
extern const pm_char STR_FACTORYRESET[];
|
||||||
|
extern const pm_char STR_CONFIRMRESET[];
|
||||||
extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[];
|
extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[];
|
||||||
extern const pm_char STR_BLCOLOR[];
|
extern const pm_char STR_BLCOLOR[];
|
||||||
|
|
||||||
|
|||||||
@@ -926,6 +926,8 @@
|
|||||||
#define TR_INPUTS "Vstupy"
|
#define TR_INPUTS "Vstupy"
|
||||||
#define TR_OUTPUTS "Výstupy"
|
#define TR_OUTPUTS "Výstupy"
|
||||||
#define TR_EEBACKUP "\010[dlouze ENTER] zálohuje EEPROM"
|
#define TR_EEBACKUP "\010[dlouze ENTER] zálohuje EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Příliš mnoho skriptů!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Příliš mnoho skriptů!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -925,6 +925,8 @@
|
|||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\002[ENTER Long] Backup EEPROM->SD-Karte"
|
#define TR_EEBACKUP "\002[ENTER Long] Backup EEPROM->SD-Karte"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Zu viele Lua-Scripten!!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Zu viele Lua-Scripten!!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -925,6 +925,8 @@
|
|||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -861,6 +861,8 @@
|
|||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
* Authors (alphabetical order)
|
* Authors (alphabetical order)
|
||||||
* - Bertrand Songis <bsongis@gmail.com>
|
* - Bertrand Songis <bsongis@gmail.com>
|
||||||
* - Bernet Andre <bernet.andre@gmail.com>
|
* - Bernet Andre <bernet.andre@gmail.com>
|
||||||
@@ -861,6 +861,8 @@
|
|||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -921,6 +921,8 @@
|
|||||||
#define TR_INPUTS "Entrées"
|
#define TR_INPUTS "Entrées"
|
||||||
#define TR_OUTPUTS "Sorties"
|
#define TR_OUTPUTS "Sorties"
|
||||||
#define TR_EEBACKUP "\004[ENTER Long]: Sauvegarder l'EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Long]: Sauvegarder l'EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\016[MENU Long]: RAZ d'usine"
|
||||||
|
#define TR_CONFIRMRESET "Effacer TOUS modèles/réglages?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -861,6 +861,8 @@
|
|||||||
#define TR_INPUTS "Ingresso"
|
#define TR_INPUTS "Ingresso"
|
||||||
#define TR_OUTPUTS "Uscita"
|
#define TR_OUTPUTS "Uscita"
|
||||||
#define TR_EEBACKUP "\004[ENTER Lungo] per copiare la EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Lungo] per copiare la EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Troppi Scripts Lua!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Troppi Scripts Lua!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -859,6 +859,8 @@
|
|||||||
#define TR_INPUTS "Wejścia"
|
#define TR_INPUTS "Wejścia"
|
||||||
#define TR_OUTPUTS "Wyjścia"
|
#define TR_OUTPUTS "Wyjścia"
|
||||||
#define TR_EEBACKUP "\004[ENTER Długo] Backupowanie EEPROMu"
|
#define TR_EEBACKUP "\004[ENTER Długo] Backupowanie EEPROMu"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Za dużo skryptów Lua!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Za dużo skryptów Lua!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -861,6 +861,8 @@
|
|||||||
#define TR_INPUTS "Inputs"
|
#define TR_INPUTS "Inputs"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
@@ -861,6 +861,8 @@
|
|||||||
#define TR_INPUTS "Input"
|
#define TR_INPUTS "Input"
|
||||||
#define TR_OUTPUTS "Outputs"
|
#define TR_OUTPUTS "Outputs"
|
||||||
#define TR_EEBACKUP "\004[ENTER Lång] säkerhetskopiera EEPROM"
|
#define TR_EEBACKUP "\004[ENTER Lång] säkerhetskopiera EEPROM"
|
||||||
|
#define TR_FACTORYRESET "\012[MENU Long]: Factory reset"
|
||||||
|
#define TR_CONFIRMRESET "Erase ALL models and settings?"
|
||||||
#define TR_TO_MANY_LUA_SCRIPTS "För många Lua-scripts!"
|
#define TR_TO_MANY_LUA_SCRIPTS "För många Lua-scripts!"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
|
|||||||
Reference in New Issue
Block a user