Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: HAL_RUNCAM_ENABLED -> AP_CAMERA_RUNCAM_ENABLED

This commit is contained in:
Andy Piper 2024-09-13 16:47:31 +01:00
parent 00c9d013dd
commit ee56d90f95
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1291,7 +1291,7 @@ bool AP_Arming::fence_checks(bool display_failure)
} }
#endif // AP_FENCE_ENABLED #endif // AP_FENCE_ENABLED
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
bool AP_Arming::camera_checks(bool display_failure) bool AP_Arming::camera_checks(bool display_failure)
{ {
if (check_enabled(ARMING_CHECK_CAMERA)) { if (check_enabled(ARMING_CHECK_CAMERA)) {
@ -1309,7 +1309,7 @@ bool AP_Arming::camera_checks(bool display_failure)
} }
return true; return true;
} }
#endif // HAL_RUNCAM_ENABLED #endif // AP_CAMERA_RUNCAM_ENABLED
#if OSD_ENABLED #if OSD_ENABLED
bool AP_Arming::osd_checks(bool display_failure) const bool AP_Arming::osd_checks(bool display_failure) const
@ -1603,7 +1603,7 @@ bool AP_Arming::pre_arm_checks(bool report)
#if HAL_PROXIMITY_ENABLED #if HAL_PROXIMITY_ENABLED
& proximity_checks(report) & proximity_checks(report)
#endif #endif
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
& camera_checks(report) & camera_checks(report)
#endif #endif
#if OSD_ENABLED #if OSD_ENABLED