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

Some Haptic corrections

Browse Source
This commit is contained in:
bsongis
2012-05-03 17:19:06 +00:00
parent 8188c48d5b
commit 6e201bc4b6
12 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+11 -7
View File
@@ -296,26 +296,32 @@ void menuProcModelSelect(uint8_t event)
#endif
s_copyMode = 0;
killEvents(event);
if (g_eeGeneral.currModel != sub) {
#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_ARCHIVE_MODEL;
s_menu[s_menu_count++] = STR_BACKUP_MODEL;
s_menu[s_menu_count++] = STR_DELETE_MODEL;;
}
else {
s_menu[s_menu_count++] = STR_CREATE_MODEL;
s_menu[s_menu_count++] = STR_RESTORE_MODEL;;
}
}
else {
s_menu[s_menu_count++] = STR_BACKUP_MODEL;
s_menu[s_menu_count++] = STR_RESTORE_MODEL;;
}
#else
if (g_eeGeneral.currModel != sub) {
displayPopup(STR_LOADINGMODEL);
eeCheck(true); // force writing of current model data before this is changed
g_eeGeneral.currModel = sub;
STORE_GENERALVARS;
eeLoadModel(sub);
return;
#endif
}
#endif
}
else if (eeModelExists(sub)) {
s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);
@@ -440,10 +446,8 @@ void menuProcModelSelect(uint8_t event)
eeLoadModel(sub);
}
}
else if (result == STR_ARCHIVE_MODEL) {
s_sdcard_error = eeArchiveModel(sub);
if (!s_sdcard_error)
eeDeleteModel(sub); // delete the model, it's archived!
else if (result == STR_BACKUP_MODEL) {
s_sdcard_error = eeBackupModel(sub);
}
else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) {
if (!listSDcardModels()) {