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

AP_GPS: removed console print for GPS type

Browse Source 
it is now sent as a STATUSTEXT
This commit is contained in:
Andrew Tridgell 2016-02-24 14:13:34 +11:00
parent 1426ff2732
commit 14bd4ba2c7
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_GPS/AP_GPS.cpp
View File

@ -200,7 +200,6 @@ AP_GPS::detect_instance(uint8_t instance)
if (_type[instance] == GPS_TYPE_PX4) {
// check for explicitely chosen PX4 GPS beforehand
// it is not possible to autodetect it, nor does it require a real UART
hal.console->print(" PX4 ");
_broadcast_gps_type("PX4", instance, -1); // baud rate isn't valid
new_gps = new AP_GPS_PX4(*this, state[instance], _port[instance]);
goto found_gps;
@ -209,7 +208,6 @@ AP_GPS::detect_instance(uint8_t instance)
#if CONFIG_HAL_BOARD == HAL_BOARD_QURT
if (_type[instance] == GPS_TYPE_QURT) {
hal.console->print(" QURTGPS ");
_broadcast_gps_type("QURTGPS", instance, -1); // baud rate isn't valid
new_gps = new AP_GPS_QURT(*this, state[instance], _port[instance]);
goto found_gps;
@ -227,11 +225,9 @@ AP_GPS::detect_instance(uint8_t instance)
// by default the sbf/trimble gps outputs no data on its port, until configured.
if (_type[instance] == GPS_TYPE_SBF) {
hal.console->print(" SBF ");
_broadcast_gps_type("SBF", instance, -1); // baud rate isn't valid
new_gps = new AP_GPS_SBF(*this, state[instance], _port[instance]);
} else if ((_type[instance] == GPS_TYPE_GSOF)) {
hal.console->print(" GSOF ");
_broadcast_gps_type("GSOF", instance, -1); // baud rate isn't valid
new_gps = new AP_GPS_GSOF(*this, state[instance], _port[instance]);
}
@ -275,32 +271,27 @@ AP_GPS::detect_instance(uint8_t instance)
if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_UBLOX) &&
_baudrates[dstate->last_baud] >= 38400 &&
AP_GPS_UBLOX::_detect(dstate->ublox_detect_state, data)) {
hal.console->print(" ublox ");
_broadcast_gps_type("u-blox", instance, dstate->last_baud);
new_gps = new AP_GPS_UBLOX(*this, state[instance], _port[instance]);
}
else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_MTK19) &&
AP_GPS_MTK19::_detect(dstate->mtk19_detect_state, data)) {
hal.console->print(" MTK19 ");
_broadcast_gps_type("MTK19", instance, dstate->last_baud);
new_gps = new AP_GPS_MTK19(*this, state[instance], _port[instance]);
}
else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_MTK) &&
AP_GPS_MTK::_detect(dstate->mtk_detect_state, data)) {
hal.console->print(" MTK ");
_broadcast_gps_type("MTK", instance, dstate->last_baud);
new_gps = new AP_GPS_MTK(*this, state[instance], _port[instance]);
}
else if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_SBP) &&
AP_GPS_SBP::_detect(dstate->sbp_detect_state, data)) {
hal.console->print(" SBP ");
_broadcast_gps_type("SBP", instance, dstate->last_baud);
new_gps = new AP_GPS_SBP(*this, state[instance], _port[instance]);
}
// 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)) {
hal.console->print(" SIRF ");
_broadcast_gps_type("SIRF", instance, dstate->last_baud);
new_gps = new AP_GPS_SIRF(*this, state[instance], _port[instance]);
}
@ -309,7 +300,6 @@ AP_GPS::detect_instance(uint8_t instance)
// a MTK or UBLOX which has booted in NMEA mode
if ((_type[instance] == GPS_TYPE_AUTO || _type[instance] == GPS_TYPE_NMEA) &&
AP_GPS_NMEA::_detect(dstate->nmea_detect_state, data)) {
hal.console->print(" NMEA ");
_broadcast_gps_type("NMEA", instance, dstate->last_baud);
new_gps = new AP_GPS_NMEA(*this, state[instance], _port[instance]);
}