mirror of
https://github.com/opentx/opentx.git
synced 2025-07-24 00:35:18 +03:00
Merge remote-tracking branch 'origin/next' into
bsongis/Issue713_more_custom_functions Conflicts: radio/src/.gitignore radio/src/opentx.cpp
This commit is contained in:
commit
9ade773618
432 changed files with 50699 additions and 11677 deletions
|
@ -365,9 +365,9 @@ void StartEepromThread(const char *filename)
|
|||
{
|
||||
eepromFile = filename;
|
||||
if (eepromFile) {
|
||||
fp = fopen(eepromFile, "r+");
|
||||
fp = fopen(eepromFile, "rb+");
|
||||
if (!fp)
|
||||
fp = fopen(eepromFile, "w+");
|
||||
fp = fopen(eepromFile, "wb+");
|
||||
if (!fp) perror("error in fopen");
|
||||
}
|
||||
#ifdef __APPLE__
|
||||
|
@ -496,7 +496,7 @@ FRESULT f_open (FIL * fil, const TCHAR *name, BYTE flag)
|
|||
return FR_INVALID_NAME;
|
||||
fil->fsize = tmp.st_size;
|
||||
}
|
||||
fil->fs = (FATFS*)fopen(path, (flag & FA_WRITE) ? "w+" : "r+");
|
||||
fil->fs = (FATFS*)fopen(path, (flag & FA_WRITE) ? "wb+" : "rb+");
|
||||
return FR_OK;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue