mirror of
https://github.com/ArduPilot/ardupilot.git
synced 2026-10-06 19:00:27 +08:00
AP_OpenDroneID: rename EnforceArming to EnforcePreArmChecks (NFC)
This commit is contained in:
committed by
Peter Barker
parent
730c7aa55d
commit
f29b062e40
@@ -68,7 +68,7 @@ const AP_Param::GroupInfo AP_OpenDroneID::var_info[] = {
|
||||
// @Param: OPTIONS
|
||||
// @DisplayName: OpenDroneID options
|
||||
// @Description: Options for OpenDroneID subsystem
|
||||
// @Bitmask: 0:EnforceArming, 1:AllowNonGPSPosition, 2:LockUASIDOnFirstBasicIDRx
|
||||
// @Bitmask: 0:EnforcePreArmChecks, 1:AllowNonGPSPosition, 2:LockUASIDOnFirstBasicIDRx
|
||||
AP_GROUPINFO("OPTIONS", 4, AP_OpenDroneID, _options, 0),
|
||||
|
||||
// @Param: BARO_ACC
|
||||
@@ -162,7 +162,7 @@ bool AP_OpenDroneID::pre_arm_check(char* failmsg, uint8_t failmsg_len)
|
||||
{
|
||||
WITH_SEMAPHORE(_sem);
|
||||
|
||||
if (!option_enabled(Options::EnforceArming)) {
|
||||
if (!option_enabled(Options::EnforcePreArmChecks)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ private:
|
||||
char id_str[21];
|
||||
bool bootloader_flashed;
|
||||
enum Options : int16_t {
|
||||
EnforceArming = (1U << 0U),
|
||||
EnforcePreArmChecks = (1U << 0U),
|
||||
AllowNonGPSPosition = (1U << 1U),
|
||||
LockUASIDOnFirstBasicIDRx = (1U << 2U),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user