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

[SD] Wrong message in status bar when backuping a model!

Browse Source
This commit is contained in:
bsongis
2012-11-09 11:03:59 +00:00
parent 839bad199e
commit dfa697d47c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eeprom_arm.cpp
+3 -2
View File
@@ -973,6 +973,9 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
return SDCARD_ERROR(result);
}
strcpy(statusLineMsg, PSTR("File "));
strcpy(statusLineMsg+5, &buf[sizeof(MODELS_PATH)]);
uint16_t size = File_system[i_fileSrc+1].size;
*(uint32_t*)&buf[0] = O9X_FOURCC;
@@ -993,8 +996,6 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
return SDCARD_ERROR(result);
}
strcpy(statusLineMsg, PSTR("File "));
strcpy(statusLineMsg+5, &buf[sizeof(MODELS_PATH)]);
showStatusLine();
return NULL;
src/simpgmspace.cpp
+12 -4
View File
@@ -307,19 +307,27 @@ FRESULT f_mount (BYTE, FATFS*)
return FR_OK;
}
FRESULT f_open (FIL * fil, const TCHAR *name, BYTE)
FRESULT f_open (FIL * fil, const TCHAR *name, BYTE flag)
{
fil->fs = (FATFS*)fopen(name, "w+");
struct stat tmp;
if (stat(name, &tmp))
return FR_INVALID_NAME;
fil->fsize = tmp.st_size;
fil->fs = (FATFS*)fopen(name, (flag & FA_WRITE) ? "w+" : "r+");
return FR_OK;
}
FRESULT f_read (FIL*, void*, UINT, UINT*)
FRESULT f_read (FIL* fil, void* data, UINT size, UINT* read)
{
fread(data, size, 1, (FILE*)fil->fs);
*read = size;
return FR_OK;
}
FRESULT f_write (FIL*, const void*, UINT, UINT*)
FRESULT f_write (FIL* fil, const void* data, UINT size, UINT* written)
{
fwrite(data, size, 1, (FILE*)fil->fs);
*written = size;
return FR_OK;
}