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

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2019-11-07 15:04:45 +01:00
parent 579aa03cd1 50a07dc8d8
commit 071116afeb
286 changed files with 9956 additions and 10363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+29 -5
View File
@@ -849,6 +849,21 @@ void checkSDVersion()
}
#endif
#if defined(MULTIMODULE)
void checkMultiLowPower()
{
if (isModuleMultimodule(EXTERNAL_MODULE) && g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode) {
ALERT("MULTI", STR_WARN_MULTI_LOWPOWER, AU_ERROR);
return;
}
#if defined(INTERNAL_MODULE_MULTI)
if (isModuleMultimodule(INTERNAL_MODULE) && g_model.moduleData[INTERNAL_MODULE].multi.lowPowerMode) {
ALERT("MULTI", STR_WARN_MULTI_LOWPOWER, AU_ERROR);
}
#endif
}
#endif
#if defined(STM32)
static void checkRTCBattery()
{
@@ -865,6 +880,12 @@ static void checkRTCBattery()
void checkFailsafe()
{
for (int i=0; i<NUM_MODULES; i++) {
#if defined(MULTIMODULE)
if (isModuleMultimodule(i)) {
getMultiModuleStatus(i).requiresFailsafeCheck = true;
}
else
#endif
if (isModuleFailsafeAvailable(i)) {
ModuleData & moduleData = g_model.moduleData[i];
if (moduleData.failsafeMode == FAILSAFE_NOT_SET) {
@@ -905,7 +926,8 @@ void checkAll()
#endif
#if defined(STM32)
checkRTCBattery();
if (!g_eeGeneral.disableRtcWarning)
checkRTCBattery();
#endif
#if defined(COLORLCD)
@@ -916,6 +938,10 @@ void checkAll()
}
#endif
#if defined(MULTIMODULE)
checkMultiLowPower();
#endif
if (!waitKeysReleased()) {
showMessageBox(STR_KEYSTUCK);
tmr10ms_t tgtime = get_tmr10ms() + 500;
@@ -1531,7 +1557,7 @@ void doMixerCalculations()
static uint8_t countRangecheck = 0;
for (uint8_t i=0; i<NUM_MODULES; ++i) {
#if defined(MULTIMODULE)
if (moduleState[i].mode >= MODULE_MODE_BEEP_FIRST || multiModuleStatus.isBinding()) {
if (moduleState[i].mode >= MODULE_MODE_BEEP_FIRST || getMultiModuleStatus(i).isBinding()) {
#else
if (moduleState[i].mode >= MODULE_MODE_BEEP_FIRST) {
#endif
@@ -1881,8 +1907,6 @@ void opentxInit()
}
#if defined(SDCARD)
globalData.sdcardPresent = SD_CARD_PRESENT();
// SDCARD related stuff, only done if not unexpectedShutdown
if (!globalData.unexpectedShutdown) {
sdInit();
@@ -1891,7 +1915,7 @@ void opentxInit()
sportStopSendByteLoop();
if (f_stat(AUTOUPDATE_FILENAME, nullptr) == FR_OK) {
FrSkyFirmwareInformation information;
if (readFirmwareInformation(AUTOUPDATE_FILENAME, information) == nullptr) {
if (readFrSkyFirmwareInformation(AUTOUPDATE_FILENAME, information) == nullptr) {
#if defined(BLUETOOTH)
if (information.productFamily == FIRMWARE_FAMILY_BLUETOOTH_CHIP) {
if (bluetooth.flashFirmware(AUTOUPDATE_FILENAME) == nullptr)