Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Compass: fixed build with AP_Periph compass

Browse Source
This commit is contained in:
Andrew Tridgell 2021-06-06 10:51:03 +10:00
parent b23afc4a9e
commit f2b7d44772
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Compass/AP_Compass.cpp
View File

@ -1440,12 +1440,14 @@ bool Compass::is_replacement_mag(uint32_t devid) {
return false; return false;
} }
#if COMPASS_MAX_UNREG_DEV > 0
// Check that its not an unused additional mag // Check that its not an unused additional mag
for (uint8_t i = 0; i<COMPASS_MAX_UNREG_DEV; i++) { for (uint8_t i = 0; i<COMPASS_MAX_UNREG_DEV; i++) {
if (_previously_unreg_mag[i] == devid) { if (_previously_unreg_mag[i] == devid) {
return false; return false;
} }
} }
#endif
// Check that its not previously setup mag // Check that its not previously setup mag
for (StateIndex i(0); i<COMPASS_MAX_INSTANCES; i++) { for (StateIndex i(0); i<COMPASS_MAX_INSTANCES; i++) {
@ -1465,6 +1467,7 @@ void Compass::remove_unreg_dev_id(uint32_t devid)
return; return;
} }
#if COMPASS_MAX_UNREG_DEV > 0
for (uint8_t i = 0; i<COMPASS_MAX_UNREG_DEV; i++) { for (uint8_t i = 0; i<COMPASS_MAX_UNREG_DEV; i++) {
if ((uint32_t)extra_dev_id[i] == devid) { if ((uint32_t)extra_dev_id[i] == devid) {
extra_dev_id[i].set_and_save(0); extra_dev_id[i].set_and_save(0);
@ -1472,6 +1475,7 @@ void Compass::remove_unreg_dev_id(uint32_t devid)
} }
} }
#endif #endif
#endif
} }
void Compass::_reset_compass_id() void Compass::_reset_compass_id()
@ -1486,7 +1490,7 @@ void Compass::_reset_compass_id()
} }
if (!_get_state(i).registered) { if (!_get_state(i).registered) {
_priority_did_stored_list[i].set_and_save(0); _priority_did_stored_list[i].set_and_save(0);
gcs().send_text(MAV_SEVERITY_ALERT, "Mag: Compass #%d with DEVID %lu removed", uint8_t(i), (unsigned long)_priority_did_list[i]); GCS_SEND_TEXT(MAV_SEVERITY_ALERT, "Mag: Compass #%d with DEVID %lu removed", uint8_t(i), (unsigned long)_priority_did_list[i]);
} }
} }