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

Double warnings on USB disconnect

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-18 23:28:59 +02:00
parent eaf595bd76
commit ffe8d821cd
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+7 -14
View File
@@ -1481,26 +1481,18 @@ void doMixerCalculations()
s_mixer_first_run_done = true;
}
#define OPENTX_START_NO_SPLASH 0x01
#define OPENTX_START_NO_CHECKS 0x02
#if !defined(OPENTX_START_DEFAULT_ARGS)
#define OPENTX_START_DEFAULT_ARGS 0
#endif
void opentxStart(const uint8_t startType = OPENTX_START_DEFAULT_ARGS)
void opentxStart(const uint8_t startOptions = OPENTX_START_DEFAULT_ARGS)
{
TRACE("opentxStart(%u)", startType);
TRACE("opentxStart(%u)", startOptions);
if (startType & OPENTX_START_NO_CHECKS) {
return;
}
uint8_t calibration_needed = (g_eeGeneral.chkSum != evalChkSum());
uint8_t calibration_needed = !(startOptions & OPENTX_START_NO_CALIBRATION) && (g_eeGeneral.chkSum != evalChkSum());
#if defined(GUI)
if (!calibration_needed && !(startType & OPENTX_START_NO_SPLASH)) {
if (!calibration_needed && !(startOptions & OPENTX_START_NO_SPLASH)) {
doSplash();
}
#endif
@@ -1523,7 +1515,7 @@ void opentxStart(const uint8_t startType = OPENTX_START_DEFAULT_ARGS)
if (calibration_needed) {
chainMenu(menuFirstCalib);
}
else {
else if (!(startOptions & OPENTX_START_NO_CHECKS)) {
checkAlarm();
checkAll();
PLAY_MODEL_NAME();
@@ -1601,7 +1593,8 @@ void opentxResume()
loadFontCache();
#endif
opentxStart(OPENTX_START_NO_SPLASH);
// removed to avoid the double warnings (throttle, switch, etc.)
// opentxStart(OPENTX_START_NO_SPLASH | OPENTX_START_NO_CALIBRATION | OPENTX_START_NO_CHECKS);
referenceSystemAudioFiles();