From 8429ab57b3ee27c23167ac779712c28581096b9d Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Fri, 6 Sep 2013 20:38:20 +0000 Subject: [PATCH] [All boards with SD] Confirmation Popup before SD Format ... --- src/gui/menu_general.cpp | 38 +++++++++++++++++++++++--------------- src/gui/menus.h | 8 ++++---- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp index 3048557b3..d92bbf353 100644 --- a/src/gui/menu_general.cpp +++ b/src/gui/menu_general.cpp @@ -202,6 +202,7 @@ void menuGeneralSetup(uint8_t event) #if defined(FAI_CHOICE) if (s_warning_result) { + s_warning_result = 0; g_eeGeneral.fai = true; eeDirty(EE_GENERAL); } @@ -641,21 +642,7 @@ void onSdManagerMenu(const char *result) pushMenu(menuGeneralSdManagerInfo); } else if (result == STR_SD_FORMAT) { - displayPopup(STR_FORMATTING); - closeLogs(); -#if defined(PCBSKY9X) - Card_state = SD_ST_DATA; -#endif -#if defined(CPUARM) - audioQueue.stopSD(); -#endif - if (f_mkfs(0, 1, 0) == FR_OK) { - f_chdir("/"); - reusableBuffer.sdmanager.offset = -1; - } - else { - POPUP_WARNING(STR_SDCARD_ERROR); - } + POPUP_CONFIRMATION(PSTR("Confirm Format?")); } else if (result == STR_DELETE_FILE) { f_getcwd(lfn, SD_SCREEN_FILE_LENGTH); @@ -710,6 +697,27 @@ void menuGeneralSdManager(uint8_t event) char lfn[SD_SCREEN_FILE_LENGTH]; #endif +#if defined(SDCARD) + if (s_warning_result) { + s_warning_result = 0; + displayPopup(STR_FORMATTING); + closeLogs(); +#if defined(PCBSKY9X) + Card_state = SD_ST_DATA; +#endif +#if defined(CPUARM) + audioQueue.stopSD(); +#endif + if (f_mkfs(0, 1, 0) == FR_OK) { + f_chdir("/"); + reusableBuffer.sdmanager.offset = -1; + } + else { + POPUP_WARNING(STR_SDCARD_ERROR); + } + } +#endif + SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, menuTabDiag, e_Sd, 1+reusableBuffer.sdmanager.count); if (s_editMode > 0) diff --git a/src/gui/menus.h b/src/gui/menus.h index 711e5ef0e..03b53f924 100644 --- a/src/gui/menus.h +++ b/src/gui/menus.h @@ -301,13 +301,13 @@ void displayWarning(uint8_t event); #if defined(CPUARM) #define DISPLAY_WARNING (*popupFunc) - #define POPUP_WARNING(s) do { s_warning = s; popupFunc = displayWarning; } while(0) - #define POPUP_CONFIRMATION(s) do { s_warning = s; s_warning_type = WARNING_TYPE_CONFIRM; popupFunc = displayWarning; } while(0) - #define POPUP_INPUT(s, func, start, min, max) do { s_warning = s; s_warning_type = WARNING_TYPE_INPUT; popupFunc = func; s_warning_input_value = start; s_warning_input_min = min; s_warning_input_max = max; } while(0) + #define POPUP_WARNING(s) (s_warning = s, popupFunc = displayWarning) + #define POPUP_CONFIRMATION(s) (s_warning = s, s_warning_type = WARNING_TYPE_CONFIRM, popupFunc = displayWarning) + #define POPUP_INPUT(s, func, start, min, max) (s_warning = s, s_warning_type = WARNING_TYPE_INPUT, popupFunc = func, s_warning_input_value = start, s_warning_input_min = min, s_warning_input_max = max) #else #define DISPLAY_WARNING displayWarning #define POPUP_WARNING(s) s_warning = s - #define POPUP_CONFIRMATION(s) do { s_warning = s; s_warning_type = WARNING_TYPE_CONFIRM; } while(0) + #define POPUP_CONFIRMATION(s) (s_warning = s, s_warning_type = WARNING_TYPE_CONFIRM) #endif #if defined(SDCARD) || (defined(ROTARY_ENCODER_NAVIGATION) && !defined(CPUM64))