Merge branch '2.3' into 3djc/2.3-synced
This commit is contained in:
+20
-1
@@ -334,6 +334,14 @@ void generalDefault()
|
||||
setDefaultOwnerId();
|
||||
#endif
|
||||
|
||||
#if defined(RADIOMASTER_RTF_RELEASE)
|
||||
// Those settings are for headless radio
|
||||
g_eeGeneral.USBMode = USB_JOYSTICK_MODE;
|
||||
g_eeGeneral.disableRtcWarning = 1;
|
||||
g_eeGeneral.splashMode = 3; // Disable splash
|
||||
g_eeGeneral.pwrOnSpeed = 1; // 1 second
|
||||
#endif
|
||||
|
||||
g_eeGeneral.chkSum = 0xFFFF;
|
||||
}
|
||||
|
||||
@@ -523,6 +531,15 @@ void modelDefault(uint8_t id)
|
||||
g_model.switchWarningState |= (1 << (3*i));
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(RADIOMASTER_RTF_RELEASE)
|
||||
// Those settings are for headless radio
|
||||
g_model.trainerData.mode = TRAINER_MODE_SLAVE;
|
||||
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_MULTIMODULE;
|
||||
g_model.moduleData[INTERNAL_MODULE].setMultiProtocol(MODULE_SUBTYPE_MULTI_FRSKY);
|
||||
g_model.moduleData[INTERNAL_MODULE].subType = MM_RF_FRSKY_SUBTYPE_D8;
|
||||
g_model.moduleData[INTERNAL_MODULE].failsafeMode = FAILSAFE_NOPULSES;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool isInputRecursive(int index)
|
||||
@@ -917,7 +934,7 @@ void checkAll()
|
||||
checkFailsafe();
|
||||
checkRSSIAlarmsDisabled();
|
||||
|
||||
#if defined(SDCARD)
|
||||
#if defined(SDCARD) && !defined(RADIOMASTER_RTF_RELEASE)
|
||||
checkSDVersion();
|
||||
#endif
|
||||
|
||||
@@ -2196,6 +2213,7 @@ uint32_t pwrCheck()
|
||||
#endif
|
||||
event_t evt = getEvent(false);
|
||||
DISPLAY_WARNING(evt);
|
||||
LED_ERROR_BEGIN();
|
||||
lcdRefresh();
|
||||
|
||||
if (warningResult) {
|
||||
@@ -2205,6 +2223,7 @@ uint32_t pwrCheck()
|
||||
else if (!warningText) {
|
||||
// shutdown has been cancelled
|
||||
pwr_check_state = PWR_CHECK_PAUSED;
|
||||
LED_ERROR_END();
|
||||
return e_power_on;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user