From f5c1a93f87dde801fa730922a27754c9e092261a Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 2 May 2023 01:30:27 +0200 Subject: [PATCH] fix: Formatting the SD card on radio when running is a bad idea (#3549) Plus we need the flash memory space for some targets! --- .../src/gui/common/stdlcd/radio_sdmanager.cpp | 18 ----------- radio/src/sdcard.cpp | 31 ------------------- radio/src/sdcard.h | 1 - radio/src/translations.cpp | 1 - radio/src/translations.h | 1 - radio/src/translations/cn.h | 1 - radio/src/translations/cz.h | 1 - radio/src/translations/da.h | 1 - radio/src/translations/de.h | 1 - radio/src/translations/en.h | 1 - radio/src/translations/es.h | 1 - radio/src/translations/fi.h | 1 - radio/src/translations/fr.h | 1 - radio/src/translations/it.h | 1 - radio/src/translations/jp.h | 1 - radio/src/translations/nl.h | 1 - radio/src/translations/pl.h | 1 - radio/src/translations/pt.h | 1 - radio/src/translations/se.h | 1 - radio/src/translations/tw.h | 1 - 20 files changed, 67 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index ddf31860a..badbbb7ec 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -78,19 +78,6 @@ void getSelectionFullPath(char * lfn) strcat(lfn, reusableBuffer.sdManager.lines[menuVerticalPosition - HEADER_LINE - menuVerticalOffset]); } -void onSdFormatConfirm(const char * result) -{ - if (result == STR_OK) { - showMessageBox(STR_FORMATTING); - logsClose(); - audioQueue.stopSD(); - if (sdCardFormat()) { - f_chdir(ROOT_PATH); - REFRESH_FILES(); - } - } -} - #if defined(PXX2) #include "pulses/pxx2_ota.h" @@ -142,9 +129,6 @@ void onSdManagerMenu(const char * result) if (result == STR_SD_INFO) { pushMenu(menuRadioSdManagerInfo); } - else if (result == STR_SD_FORMAT) { - POPUP_CONFIRMATION(STR_CONFIRM_FORMAT, onSdFormatConfirm); - } else if (result == STR_COPY_FILE) { clipboard.type = CLIPBOARD_TYPE_SD_FILE; f_getcwd(clipboard.data.sd.directory, CLIPBOARD_PATH_LEN); @@ -334,7 +318,6 @@ void menuRadioSdManager(event_t _event) if (SD_CARD_PRESENT() && !READ_ONLY() && s_editMode == 0) { killEvents(_event); POPUP_MENU_ADD_ITEM(STR_SD_INFO); - POPUP_MENU_ADD_ITEM(STR_SD_FORMAT); POPUP_MENU_START(onSdManagerMenu); } break; @@ -369,7 +352,6 @@ void menuRadioSdManager(event_t _event) if (menuVerticalPosition < HEADER_LINE) { killEvents(_event); POPUP_MENU_ADD_ITEM(STR_SD_INFO); - POPUP_MENU_ADD_ITEM(STR_SD_FORMAT); POPUP_MENU_START(onSdManagerMenu); break; } diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index 61dfaf011..5f39af548 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -30,37 +30,6 @@ #include "libopenui/src/libopenui_file.h" #endif -bool sdCardFormat() -{ - BYTE work[FF_MAX_SS]; - FRESULT res = f_mkfs("", FM_FAT32, 0, work, sizeof(work)); - switch(res) { - case FR_OK : - return true; - case FR_DISK_ERR: - POPUP_WARNING("Format error"); - return false; - case FR_NOT_READY: - POPUP_WARNING("SDCard not ready"); - return false; - case FR_WRITE_PROTECTED: - POPUP_WARNING("SDCard write protected"); - return false; - case FR_INVALID_PARAMETER: - POPUP_WARNING("Format param invalid"); - return false; - case FR_INVALID_DRIVE: - POPUP_WARNING("Invalid drive"); - return false; - case FR_MKFS_ABORTED: - POPUP_WARNING("Format aborted"); - return false; - default: - POPUP_WARNING(STR_SDCARD_ERROR); - return false; - } -} - const char * sdCheckAndCreateDirectory(const char * path) { DIR archiveFolder; diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index ac7a8f19c..86b269fbc 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -124,7 +124,6 @@ void logsInit(); void logsClose(); void logsWrite(); -bool sdCardFormat(); uint32_t sdGetNoSectors(); uint32_t sdGetSize(); uint32_t sdGetFreeSectors(); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index e9b8c9090..887b441e8 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -479,7 +479,6 @@ const char STR_DELETE_FILE[] = TR_DELETE_FILE; const char STR_COPY_FILE[] = TR_COPY_FILE; const char STR_RENAME_FILE[] = TR_RENAME_FILE; const char STR_SD_INFO[] = TR_SD_INFO; -const char STR_SD_FORMAT[] = TR_SD_FORMAT; const char STR_REMOVED[] = TR_REMOVED; const char STR_NA[] = TR_NA; const char STR_HARDWARE[] = TR_HARDWARE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 08772f633..c1e878ba6 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -758,7 +758,6 @@ extern const char STR_COPY_FILE[]; extern const char STR_RENAME_FILE[]; extern const char STR_REMOVED[]; extern const char STR_SD_INFO[]; -extern const char STR_SD_FORMAT[]; extern const char STR_NA[]; extern const char STR_HARDWARE[]; extern const char STR_FORMATTING[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 30dd41b7f..b152938d9 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -745,7 +745,6 @@ #define TR_EXECUTE_FILE "执行" #define TR_REMOVED "已删除" #define TR_SD_INFO "信息" -#define TR_SD_FORMAT "格式" #define TR_NA "N/A" #define TR_HARDWARE "硬件" #define TR_FORMATTING "正在格式化..." diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 30f2b13cb..0d93740c2 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -745,7 +745,6 @@ #define TR_EXECUTE_FILE "Spustit" #define TR_REMOVED "odstraněn" #define TR_SD_INFO "Informace" -#define TR_SD_FORMAT "Formát" #define TR_NA "[X]" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formátovaní..." diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 4c5b3190b..34475cb8d 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -750,7 +750,6 @@ #define TR_EXECUTE_FILE "Udfør" #define TR_REMOVED " slettet" #define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Format" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formattering..." diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index e5712e3ae..373c20200 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -742,7 +742,6 @@ #define TR_EXECUTE_FILE "Execute" #define TR_REMOVED " gelöscht" #define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Formatieren" #define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung #define TR_HARDWARE TR("Hardware einst. ", "Namen und Hardware einst.") #define TR_FORMATTING "Formatierung..." diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 668c53989..9a3b4bee9 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -743,7 +743,6 @@ #define TR_EXECUTE_FILE "Execute" #define TR_REMOVED " removed" #define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Format" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formatting..." diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 0239b4f44..017e79644 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -744,7 +744,6 @@ #define TR_EXECUTE_FILE "Ejecutar" #define TR_REMOVED "Borrado" #define TR_SD_INFO "Información" -#define TR_SD_FORMAT "Formatear" #define TR_NA "N/A" #define TR_HARDWARE "COMPONENTES" #define TR_FORMATTING "Formateando.." diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index f34f51578..df48e9ac3 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -756,7 +756,6 @@ #define TR_EXECUTE_FILE "Suorittaa" #define TR_REMOVED "poistettu" #define TR_SD_INFO "Tiedot" -#define TR_SD_FORMAT "Format" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formatting..." diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 8c49c5481..7dc759f40 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -753,7 +753,6 @@ #define TR_EXECUTE_FILE "Exécuter" #define TR_REMOVED "supprimé" #define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Formater" #define TR_NA "N/D" #define TR_HARDWARE "MATERIEL" #define TR_FORMATTING "Formatage..." diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index c892ee4fc..b7212924e 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -745,7 +745,6 @@ #define TR_EXECUTE_FILE "Esegui" #define TR_REMOVED " rimosso" #define TR_SD_INFO "Informazioni" -#define TR_SD_FORMAT "Formatta" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formattazione" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 8a4849776..4637afe52 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -743,7 +743,6 @@ #define TR_EXECUTE_FILE "実行" #define TR_REMOVED "移動" #define TR_SD_INFO "インフォメーション" -#define TR_SD_FORMAT "フォーマット" #define TR_NA "該当なし" #define TR_HARDWARE "ハードウェア" #define TR_FORMATTING "フォーマット中..." diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 59d4056ec..bc788c28a 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -748,7 +748,6 @@ #define TR_EXECUTE_FILE "Uitvoeren" #define TR_REMOVED " verwijderd" #define TR_SD_INFO "Informatie" -#define TR_SD_FORMAT "Format" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formatteren..." diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index d3d7ec789..a828062f4 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -741,7 +741,6 @@ #define TR_EXECUTE_FILE "Wykonaj" #define TR_REMOVED " skasowane" #define TR_SD_INFO "Informacje" -#define TR_SD_FORMAT "Formatuj" #define TR_NA "[X]" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formatowanie.." diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index f7a3a2031..2a47a22c5 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -748,7 +748,6 @@ #define TR_EXECUTE_FILE "Execute" #define TR_REMOVED "Remover" #define TR_SD_INFO "Dados SD" -#define TR_SD_FORMAT "Formatar" #define TR_NA "N/A" #define TR_HARDWARE "HARDWARE" #define TR_FORMATTING "Formatando..." diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 739de118d..6e6f87fb3 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -766,7 +766,6 @@ #define TR_EXECUTE_FILE "Kör" #define TR_REMOVED " raderad" #define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Formatera" #define TR_NA "N/A" #define TR_HARDWARE "HÅRDVARA" #define TR_FORMATTING "Formaterar..." diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index da94b90bf..615df6b09 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -743,7 +743,6 @@ #define TR_EXECUTE_FILE "執行" #define TR_REMOVED "已刪除" #define TR_SD_INFO "信息" -#define TR_SD_FORMAT "格式" #define TR_NA "N/A" #define TR_HARDWARE "硬件" #define TR_FORMATTING "正在格式化..."