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

AP_Arming: allow sketches to use AP_Arming without OpenDroneID

Browse Source
This commit is contained in:
Andy Piper 2022-10-14 14:43:20 +01:00 committed by Andrew Tridgell
parent d99e5b91d8
commit c1fbdd5972
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1618,7 +1618,7 @@ AP_Arming::Required AP_Arming::arming_required()
{
#if AP_OPENDRONEID_ENABLED
// cannot be disabled if OpenDroneID is present
if (AP::opendroneid().enabled()) {
if (AP_OpenDroneID::get_singleton() != nullptr && AP::opendroneid().enabled()) {
if (require != Required::YES_MIN_PWM && require != Required::YES_ZERO_PWM) {
return Required::YES_MIN_PWM;
}