From 8ff3b79986d5452906a2655dd49e9e8527c576c8 Mon Sep 17 00:00:00 2001
From: Claudio Chies <61051109+Claudio-Chies@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:54:22 +0200
Subject: [PATCH] MSG: unified arming check message field naming

---
 msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg   | 4 ++--
 msg/px4_msgs_old/msg/ArmingCheckRequestV0.msg | 2 +-
 msg/versioned/ArmingCheckReply.msg            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg b/msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg
index c417d6a4f0..81c2753330 100644
--- a/msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg
+++ b/msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg
@@ -1,9 +1,9 @@
-uint32 MESSAGE_VERSION = 0
+uint32 MESSAGE_VERSION = 1
 
 uint64 timestamp # time since system start (microseconds)
 
 uint8 request_id
-uint8 registration_id
+uint8 arming_check_id
 
 uint8 HEALTH_COMPONENT_INDEX_NONE = 0
 
diff --git a/msg/px4_msgs_old/msg/ArmingCheckRequestV0.msg b/msg/px4_msgs_old/msg/ArmingCheckRequestV0.msg
index 0f7b1ec729..9c463fc1b6 100644
--- a/msg/px4_msgs_old/msg/ArmingCheckRequestV0.msg
+++ b/msg/px4_msgs_old/msg/ArmingCheckRequestV0.msg
@@ -5,7 +5,7 @@
 # The request is sent regularly, even while armed, so that the FMU always knows the current arming state for external modes, and can forward it to ground stations.
 #
 # The reply will include the published request_id, allowing correlation of all arming check information for a particular request.
-# The reply will also include the registration_id for each external component, provided to it during the registration process (RegisterExtComponentReply).
+# The reply will also include the arming_check_id for each external component, provided to it during the registration process (RegisterExtComponentReply).
 
 uint32 MESSAGE_VERSION = 0
 
diff --git a/msg/versioned/ArmingCheckReply.msg b/msg/versioned/ArmingCheckReply.msg
index 7ba4ad7bf3..a61a67581e 100644
--- a/msg/versioned/ArmingCheckReply.msg
+++ b/msg/versioned/ArmingCheckReply.msg
@@ -4,15 +4,15 @@
 # The response contains the current set of external mode requirements, and a queue of events indicating recent failures to set the mode (which the FMU may then forward to a ground station).
 # The request is sent regularly to all registered ROS modes, even while armed, so that the FMU always knows and can forward the current state.
 #
-# Note that the external component is identified by its registration_id, which is allocated to the component during registration (arming_check_id in RegisterExtComponentReply).
+# Note that the external component is identified by its arming_check_id, which is allocated to the component during registration in RegisterExtComponentReply.
 # The message is not used by internal/FMU components, as their mode requirements are known at compile time.
 
-uint32 MESSAGE_VERSION  = 1
+uint32 MESSAGE_VERSION  = 2
 
 uint64 timestamp # [us] Time since system start.
 
 uint8 request_id       # Id of ArmingCheckRequest for which this is a response.
-uint8 registration_id  # Id of external component emitting this response.
+uint8 arming_check_id  # Id of external component emitting this response.
 
 uint8 HEALTH_COMPONENT_INDEX_NONE = 0  # Index of health component for which this response applies.