From 287238f5eeaa23976bfe9236e0f4b423cfe7e813 Mon Sep 17 00:00:00 2001 From: Roel Schiphorst Date: Mon, 19 Dec 2022 19:44:18 +0100 Subject: [PATCH 1/2] use latest mavlink definitions for MAV_ODID_ARM_STATUS --- RemoteIDModule/DroneCAN.cpp | 2 +- RemoteIDModule/mavlink.cpp | 2 +- RemoteIDModule/transport.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RemoteIDModule/DroneCAN.cpp b/RemoteIDModule/DroneCAN.cpp index 54690f6..2952f5f 100644 --- a/RemoteIDModule/DroneCAN.cpp +++ b/RemoteIDModule/DroneCAN.cpp @@ -92,7 +92,7 @@ void DroneCAN::arm_status_send(void) uint8_t buffer[DRONECAN_REMOTEID_ARMSTATUS_MAX_SIZE]; dronecan_remoteid_ArmStatus arm_status {}; - const uint8_t status = parse_fail==nullptr?MAV_ODID_GOOD_TO_ARM:MAV_ODID_PRE_ARM_FAIL_GENERIC; + const uint8_t status = parse_fail==nullptr?MAV_ODID_ARM_STATUS_GOOD_TO_ARM:MAV_ODID_ARM_STATUS_PRE_ARM_FAIL_GENERIC; const char *reason = parse_fail==nullptr?"":parse_fail; arm_status.status = status; diff --git a/RemoteIDModule/mavlink.cpp b/RemoteIDModule/mavlink.cpp index fd35553..cf6403b 100644 --- a/RemoteIDModule/mavlink.cpp +++ b/RemoteIDModule/mavlink.cpp @@ -273,7 +273,7 @@ void MAVLinkSerial::process_packet(mavlink_status_t &status, mavlink_message_t & void MAVLinkSerial::arm_status_send(void) { - const uint8_t status = parse_fail==nullptr?MAV_ODID_GOOD_TO_ARM:MAV_ODID_PRE_ARM_FAIL_GENERIC; + const uint8_t status = parse_fail==nullptr?MAV_ODID_ARM_STATUS_GOOD_TO_ARM:MAV_ODID_ARM_STATUS_PRE_ARM_FAIL_GENERIC; const char *reason = parse_fail==nullptr?"":parse_fail; mavlink_msg_open_drone_id_arm_status_send( chan, diff --git a/RemoteIDModule/transport.cpp b/RemoteIDModule/transport.cpp index 8a4f212..9f98eac 100644 --- a/RemoteIDModule/transport.cpp +++ b/RemoteIDModule/transport.cpp @@ -37,11 +37,11 @@ uint8_t Transport::arm_status_check(const char *&reason) const uint32_t max_age_other_ms = 22000; const uint32_t now_ms = millis(); - uint8_t status = MAV_ODID_PRE_ARM_FAIL_GENERIC; + uint8_t status = MAV_ODID_ARM_STATUS_PRE_ARM_FAIL_GENERIC; //return status OK if we have enabled the force arm option if (g.options & OPTIONS_FORCE_ARM_OK) { - status = MAV_ODID_GOOD_TO_ARM; + status = MAV_ODID_ARM_STATUS_GOOD_TO_ARM; return status; } @@ -62,7 +62,7 @@ uint8_t Transport::arm_status_check(const char *&reason) } else if (system.operator_latitude == 0 && system.operator_longitude == 0) { reason = "Bad operator location"; } else if (reason == nullptr) { - status = MAV_ODID_GOOD_TO_ARM; + status = MAV_ODID_ARM_STATUS_GOOD_TO_ARM; } return status; From f99015d2119ea8fcb39527802683798e0f133fbb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jan 2023 17:46:17 +1100 Subject: [PATCH 2/2] mavlink: submodule update --- modules/mavlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mavlink b/modules/mavlink index d1e6dc1..806a3ba 160000 --- a/modules/mavlink +++ b/modules/mavlink @@ -1 +1 @@ -Subproject commit d1e6dc15d93fb3050a263ece956baa4993dce144 +Subproject commit 806a3ba7499da677ded35226d6ff88e5a100c4c2