aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arming: Remove the SITL protection around GPS configuration, and rely upon the GPS library instead

Browse Source
This commit is contained in:
Michael du Breuil 2017-03-06 16:14:45 -07:00 committed by Randy Mackay
parent 398ff823c0
commit be1fd147fc
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Arming/AP_Arming.cpp
View File

@ -357,7 +357,6 @@ bool AP_Arming::gps_checks(bool report)
} }
} }
#if CONFIG_HAL_BOARD != HAL_BOARD_SITL
if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_GPS_CONFIG)) { if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_GPS_CONFIG)) {
uint8_t first_unconfigured = gps.first_unconfigured_gps(); uint8_t first_unconfigured = gps.first_unconfigured_gps();
if (first_unconfigured != AP_GPS::GPS_ALL_CONFIGURED) { if (first_unconfigured != AP_GPS::GPS_ALL_CONFIGURED) {
@ -370,7 +369,6 @@ bool AP_Arming::gps_checks(bool report)
return false; return false;
} }
} }
#endif
return true; return true;
} }