Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-12 19:03:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: add and use AP_GPS_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2023-06-20 16:40:34 +10:00 committed by Peter Barker
parent 6f292c02da
commit a6a691cce3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/GCS_MAVLink/GCS.cpp
View File

@ -184,7 +184,7 @@ void GCS::update_sensor_status_flags()
} }
#endif #endif
#if !defined(HAL_BUILD_AP_PERIPH) || defined(HAL_PERIPH_ENABLE_GPS) #if AP_GPS_ENABLED
const AP_GPS &gps = AP::gps(); const AP_GPS &gps = AP::gps();
if (gps.status() > AP_GPS::NO_GPS) { if (gps.status() > AP_GPS::NO_GPS) {
control_sensors_present |= MAV_SYS_STATUS_SENSOR_GPS; control_sensors_present |= MAV_SYS_STATUS_SENSOR_GPS;
@ -226,7 +226,7 @@ void GCS::update_sensor_status_flags()
bool logging_present = logger.logging_present(); bool logging_present = logger.logging_present();
bool logging_enabled = logger.logging_enabled(); bool logging_enabled = logger.logging_enabled();
bool logging_healthy = !logger.logging_failed(); bool logging_healthy = !logger.logging_failed();
#if !defined(HAL_BUILD_AP_PERIPH) || defined(HAL_PERIPH_ENABLE_GPS) #if AP_GPS_ENABLED
// some GPS units do logging, so they have to be healthy too: // some GPS units do logging, so they have to be healthy too:
logging_present |= gps.logging_present(); logging_present |= gps.logging_present();
logging_enabled |= gps.logging_enabled(); logging_enabled |= gps.logging_enabled();