Plugins: system_status change status field to system_status

Add comment to State.msg for system_status enum
mavlink · Dec 14, 2016 · d94c15c · d94c15c
1 parent 3b22ac0
commit d94c15c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mavros/src/plugins/sys_status.cpp b/mavros/src/plugins/sys_status.cpp
@@ -623,7 +623,7 @@ class SystemStatusPlugin : public plugin::PluginBase
 		state_msg->armed = false;
 		state_msg->guided = false;
 		state_msg->mode = "";
-		state_msg->status = enum_value(MAV_STATE::UNINIT);
+		state_msg->system_status = enum_value(MAV_STATE::UNINIT);
 
 		state_pub.publish(state_msg);
 	}
@@ -652,7 +652,7 @@ class SystemStatusPlugin : public plugin::PluginBase
 		state_msg->armed = hb.base_mode & enum_value(MAV_MODE_FLAG::SAFETY_ARMED);
 		state_msg->guided = hb.base_mode & enum_value(MAV_MODE_FLAG::GUIDED_ENABLED);
 		state_msg->mode = m_uas->str_mode_v10(hb.base_mode, hb.custom_mode);
-		state_msg->status = hb.system_status;
+		state_msg->system_status = hb.system_status;
 
 		state_pub.publish(state_msg);
 		hb_diag.tick(hb.type, hb.autopilot, state_msg->mode, hb.system_status);

diff --git a/mavros_msgs/msg/State.msg b/mavros_msgs/msg/State.msg
@@ -2,10 +2,14 @@
 #
 # Known modes listed here:
 # http://wiki.ros.org/mavros/CustomModes
+#
+# For system_status values
+# see http://mavlink.org/messages/common MAV_STATE
+#
 
 std_msgs/Header header
 bool connected
 bool armed
 bool guided
 string mode
-uint8 status
+uint8 system_status