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

fix: Formatting the SD card on radio when running is a bad idea (#3549)

Browse Source 
Plus we need the flash memory space for some targets!
This commit is contained in:
3djc
2023-05-02 09:30:27 +10:00
committed by GitHub
parent 99da364eaf
commit f5c1a93f87
20 changed files with 0 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
-18
View File
@@ -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;
}
radio/src/sdcard.cpp
-31
View File
@@ -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;
radio/src/sdcard.h
-1
View File
@@ -124,7 +124,6 @@ void logsInit();
void logsClose();
void logsWrite();
bool sdCardFormat();
uint32_t sdGetNoSectors();
uint32_t sdGetSize();
uint32_t sdGetFreeSectors();
radio/src/translations.cpp
-1
View File
@@ -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;
radio/src/translations.h
-1
View File
@@ -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[];
radio/src/translations/cn.h
-1
View File
@@ -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 "正在格式化..."
radio/src/translations/cz.h
-1
View File
@@ -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í..."
radio/src/translations/da.h
-1
View File
@@ -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..."
radio/src/translations/de.h
-1
View File
@@ -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..."
radio/src/translations/en.h
-1
View File
@@ -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..."
radio/src/translations/es.h
-1
View File
@@ -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.."
radio/src/translations/fi.h
-1
View File
@@ -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..."
radio/src/translations/fr.h
-1
View File
@@ -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..."
radio/src/translations/it.h
-1
View File
@@ -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"
radio/src/translations/jp.h
-1
View File
@@ -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 "フォーマット中..."
radio/src/translations/nl.h
-1
View File
@@ -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..."
radio/src/translations/pl.h
-1
View File
@@ -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.."
radio/src/translations/pt.h
-1
View File
@@ -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..."
radio/src/translations/se.h
-1
View File
@@ -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..."
radio/src/translations/tw.h
-1
View File
@@ -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 "正在格式化..."