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

Merge pull request #501 from EdgeTX/main

Browse Source 
Merge from main
This commit is contained in:
richardclli
2021-07-26 10:50:32 +08:00
committed by GitHub
parent 9e044b6f97 cbced4a81c
commit f12e9d4599
19 changed files with 884 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
-29
View File
@@ -654,32 +654,6 @@ void doSplash()
#define doSplash()
#endif
#if defined(SDCARD)
void checkSDVersion()
{
if (sdMounted()) {
FIL versionFile;
UINT read = 0;
char version[sizeof(REQUIRED_SDCARD_VERSION)-1];
char error[sizeof(TR_WRONG_SDCARDVERSION)+ sizeof(version)];
strAppend(strAppend(error, STR_WRONG_SDCARDVERSION, sizeof(TR_WRONG_SDCARDVERSION)), REQUIRED_SDCARD_VERSION, sizeof(REQUIRED_SDCARD_VERSION));
FRESULT result = f_open(&versionFile, "/edgetx.sdcard.version", FA_OPEN_EXISTING | FA_READ);
if (result == FR_OK) {
if (f_read(&versionFile, &version, sizeof(version), &read) != FR_OK ||
read != sizeof(version) ||
strncmp(version, REQUIRED_SDCARD_VERSION, sizeof(version)) != 0) {
TRACE("SD card version mismatch: %.*s, %s", sizeof(REQUIRED_SDCARD_VERSION)-1, version, REQUIRED_SDCARD_VERSION);
ALERT(STR_SD_CARD, error, AU_ERROR);
}
f_close(&versionFile);
}
else {
ALERT(STR_SD_CARD, error, AU_ERROR);
}
}
}
#endif
#if defined(MULTIMODULE)
void checkMultiLowPower()
@@ -738,9 +712,6 @@ void checkAll()
checkSwitches();
checkFailsafe();
#if defined(SDCARD) && !defined(RADIOMASTER_RTF_RELEASE)
checkSDVersion();
#endif
#if defined(STM32)
if (isVBatBridgeEnabled() && !g_eeGeneral.disableRtcWarning) {