Skip to content

Commit f29b062

Browse files
tatsuypeterbarker
authored andcommitted
AP_OpenDroneID: rename EnforceArming to EnforcePreArmChecks (NFC)
1 parent 730c7aa commit f29b062

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

libraries/AP_OpenDroneID/AP_OpenDroneID.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const AP_Param::GroupInfo AP_OpenDroneID::var_info[] = {
6868
// @Param: OPTIONS
6969
// @DisplayName: OpenDroneID options
7070
// @Description: Options for OpenDroneID subsystem
71-
// @Bitmask: 0:EnforceArming, 1:AllowNonGPSPosition, 2:LockUASIDOnFirstBasicIDRx
71+
// @Bitmask: 0:EnforcePreArmChecks, 1:AllowNonGPSPosition, 2:LockUASIDOnFirstBasicIDRx
7272
AP_GROUPINFO("OPTIONS", 4, AP_OpenDroneID, _options, 0),
7373

7474
// @Param: BARO_ACC
@@ -162,7 +162,7 @@ bool AP_OpenDroneID::pre_arm_check(char* failmsg, uint8_t failmsg_len)
162162
{
163163
WITH_SEMAPHORE(_sem);
164164

165-
if (!option_enabled(Options::EnforceArming)) {
165+
if (!option_enabled(Options::EnforcePreArmChecks)) {
166166
return true;
167167
}
168168

libraries/AP_OpenDroneID/AP_OpenDroneID.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class AP_OpenDroneID
113113
char id_str[21];
114114
bool bootloader_flashed;
115115
enum Options : int16_t {
116-
EnforceArming = (1U << 0U),
116+
EnforcePreArmChecks = (1U << 0U),
117117
AllowNonGPSPosition = (1U << 1U),
118118
LockUASIDOnFirstBasicIDRx = (1U << 2U),
119119
};

0 commit comments

Comments
 (0)