From 54304bc59db496cec37397f466dc4418b5b9dae0 Mon Sep 17 00:00:00 2001
From: PX4BuildBot <bot@pixhawk.org>
Date: Mon, 17 Oct 2016 20:47:05 +0000
Subject: [PATCH] autogenerated headers for rev
 https://github.com/mavlink/mavlink/tree/fdb0c2a46df7b50c458efb53feb6b3311fd7ec90

---
 common/common.h                | 2 +-
 message_definitions/common.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/common.h b/common/common.h
index db24df3..3f295b3 100644
--- a/common/common.h
+++ b/common/common.h
@@ -124,7 +124,7 @@ typedef enum MAV_MODE_FLAG
    MAV_MODE_FLAG_STABILIZE_ENABLED=16, /* 0b00010000 system stabilizes electronically its attitude (and optionally position). It needs however further control inputs to move around. | */
    MAV_MODE_FLAG_HIL_ENABLED=32, /* 0b00100000 hardware in the loop simulation. All motors / actuators are blocked, but internal software is full operational. | */
    MAV_MODE_FLAG_MANUAL_INPUT_ENABLED=64, /* 0b01000000 remote control input is enabled. | */
-   MAV_MODE_FLAG_SAFETY_ARMED=128, /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. | */
+   MAV_MODE_FLAG_SAFETY_ARMED=128, /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. Additional note: this flag is to be ignore when sent in the command MAV_CMD_DO_SET_MODE and MAV_CMD_COMPONENT_ARM_DISARM shall be used instead. The flag can still be used to report the armed state. | */
    MAV_MODE_FLAG_ENUM_END=129, /*  | */
 } MAV_MODE_FLAG;
 #endif
diff --git a/message_definitions/common.xml b/message_definitions/common.xml
index 7505c0f..7c01156 100644
--- a/message_definitions/common.xml
+++ b/message_definitions/common.xml
@@ -169,7 +169,7 @@
           <enum name="MAV_MODE_FLAG">
                 <description>These flags encode the MAV mode.</description>
                 <entry value="128" name="MAV_MODE_FLAG_SAFETY_ARMED">
-                     <description>0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly.</description>
+                     <description>0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. Additional note: this flag is to be ignore when sent in the command MAV_CMD_DO_SET_MODE and MAV_CMD_COMPONENT_ARM_DISARM shall be used instead. The flag can still be used to report the armed state.</description>
                 </entry>
                 <entry value="64" name="MAV_MODE_FLAG_MANUAL_INPUT_ENABLED">
                      <description>0b01000000 remote control input is enabled.</description>