piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

SD-card more options

Browse Source
This commit is contained in:
bsongis
2012-05-03 18:23:37 +00:00
parent 344cf5c308
commit 5383549e2a
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+7 -2
View File
@@ -299,8 +299,9 @@ void menuProcModelSelect(uint8_t event)
#if defined(SDCARD)
if (g_eeGeneral.currModel != sub) {
if (eeModelExists(sub)) {
s_menu[s_menu_count++] = STR_LOAD_MODEL;
s_menu[s_menu_count++] = STR_SELECT_MODEL;
s_menu[s_menu_count++] = STR_BACKUP_MODEL;
s_menu[s_menu_count++] = STR_RESTORE_MODEL;
s_menu[s_menu_count++] = STR_DELETE_MODEL;;
}
else {
@@ -437,7 +438,7 @@ void menuProcModelSelect(uint8_t event)
if (s_menu_count) {
const char * result = displayMenu(event);
if (result) {
if (result == STR_LOAD_MODEL || result == STR_CREATE_MODEL) {
if (result == STR_SELECT_MODEL || result == STR_CREATE_MODEL) {
displayPopup(STR_LOADINGMODEL);
eeCheck(true); // force writing of current model data before this is changed
if (g_eeGeneral.currModel != sub) {
@@ -459,7 +460,11 @@ void menuProcModelSelect(uint8_t event)
}
else {
// The user choosed a file on SD to restore
if (g_eeGeneral.currModel == sub)
eeCheck(true); // force writing of current model data before this is changed
s_sdcard_error = eeRestoreModel(sub, (char *)result);
if (!s_sdcard_error && g_eeGeneral.currModel == sub)
eeLoadModel(sub); // force writing of current model data before this is changed
}
}
}
src/o9xstrings.cpp
+1 -1
View File
@@ -312,7 +312,7 @@ const pm_char STR_CURRENT[] PROGMEM = TR_CURRENT;
#endif
#if defined(SDCARD)
const pm_char STR_LOAD_MODEL[] PROGMEM = TR_LOAD_MODEL;
const pm_char STR_SELECT_MODEL[] PROGMEM = TR_SELECT_MODEL;
const pm_char STR_CREATE_MODEL[] PROGMEM = TR_CREATE_MODEL;
const pm_char STR_BACKUP_MODEL[] PROGMEM = TR_BACKUP_MODEL;
const pm_char STR_DELETE_MODEL[] PROGMEM = TR_DELETE_MODEL;
src/o9xstrings.h
+1 -1
View File
@@ -379,7 +379,7 @@ extern const pm_char STR_CURRENT[];
#endif
#if defined(SDCARD)
extern const pm_char STR_LOAD_MODEL[];
extern const pm_char STR_SELECT_MODEL[];
extern const pm_char STR_CREATE_MODEL[];
extern const pm_char STR_BACKUP_MODEL[];
extern const pm_char STR_DELETE_MODEL[];
src/translations/en.h
+1 -1
View File
@@ -370,7 +370,7 @@
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
#define TR_CURRENT "Current"
#define TR_LOAD_MODEL "Load Model"
#define TR_SELECT_MODEL "Select Model"
#define TR_CREATE_MODEL "Create Model"
#define TR_BACKUP_MODEL "Backup Model"
#define TR_DELETE_MODEL "Delete Model" // TODO merged into DELETEMODEL?
src/translations/fr.h
+1 -1
View File
@@ -374,7 +374,7 @@
#define TR_BATT_CALIB "Calib. Batterie"
#define TR_CURRENT_CALIB "Calib. Amperage"
#define TR_CURRENT "Courant"
#define TR_LOAD_MODEL "Charger Modele"
#define TR_SELECT_MODEL "Select Modele"
#define TR_CREATE_MODEL "Creer Modele"
#define TR_BACKUP_MODEL "Archiver Modele"
#define TR_DELETE_MODEL "Supprimer Modele"
src/translations/se.h
+1 -1
View File
@@ -374,7 +374,7 @@
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
#define TR_CURRENT "Sp\201nning"
#define TR_LOAD_MODEL "Load Model"
#define TR_SELECT_MODEL "Select Model"
#define TR_CREATE_MODEL "Create Model"
#define TR_BACKUP_MODEL "Backup Model"
#define TR_DELETE_MODEL "Delete Model"