AP_GPS: remove check for GPS_SKIP_SIRF_NMEA

This commit is contained in:
Lucas De Marchi 2015-11-03 11:28:31 -02:00 committed by Andrew Tridgell
parent c32d323cd6
commit 1a9b57da1f

View File

@ -264,7 +264,6 @@ AP_GPS::detect_instance(uint8_t instance)
hal.console->print(" SBP ");
new_gps = new AP_GPS_SBP(*this, state[instance], _port[instance]);
}
#if !defined(GPS_SKIP_SIRF_NMEA)
// save a bit of code space on a 1280
else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_SIRF) &&
AP_GPS_SIRF::_detect(dstate->sirf_detect_state, data)) {
@ -280,7 +279,6 @@ AP_GPS::detect_instance(uint8_t instance)
new_gps = new AP_GPS_NMEA(*this, state[instance], _port[instance]);
}
}
#endif
}
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4