Fixed broken targets.

This commit is contained in:
mikeller 2018-07-01 21:37:40 +12:00
parent 93ab648183
commit 3f082b569b
2 changed files with 15 additions and 15 deletions

View File

@ -163,6 +163,18 @@ static void validateAndFixConfig(void)
}
#endif
if (!isSerialConfigValid(serialConfig())) {
pgResetFn_serialConfig(serialConfigMutable());
}
if (
#if defined(USE_GPS)
!findSerialPortConfig(FUNCTION_GPS) &&
#endif
true) {
featureClear(FEATURE_GPS);
}
#ifndef USE_OSD_SLAVE
if (systemConfig()->activeRateProfile >= CONTROL_RATE_PROFILE_COUNT) {
systemConfigMutable()->activeRateProfile = 0;
@ -265,19 +277,6 @@ static void validateAndFixConfig(void)
}
}
#endif
#endif // USE_OSD_SLAVE
if (!isSerialConfigValid(serialConfig())) {
pgResetFn_serialConfig(serialConfigMutable());
}
if (
#if defined(USE_GPS)
!findSerialPortConfig(FUNCTION_GPS) &&
#endif
true) {
featureClear(FEATURE_GPS);
}
if (
featureConfigured(FEATURE_3D) || !featureConfigured(FEATURE_GPS)
@ -293,6 +292,7 @@ static void validateAndFixConfig(void)
removeModeActivationCondition(BOXGPSRESCUE);
}
}
#endif // USE_OSD_SLAVE
#if defined(USE_ESC_SENSOR)
if (!findSerialPortConfig(FUNCTION_ESC_SENSOR)) {

View File

@ -38,9 +38,9 @@
//#undef USE_TELEMETRY_HOTT
//#undef USE_TELEMETRY_MAVLINK
//#undef USE_TELEMETRY_LTM
//#undef USE_SERIALRX_XBUS
#ifdef FURYF3OSD
#undef USE_SERIALRX_XBUS
#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_RTC_TIME