Enabled support for ARM / disarm action on component level

src/ui/designer/QGCCommandButton.cc

@@ -80,6 +80,7 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
     ui->editCommandComboBox->addItem("MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN", MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN);
     ui->editCommandComboBox->addItem("MAV_CMD_OVERRIDE_GOTO", MAV_CMD_OVERRIDE_GOTO);
     ui->editCommandComboBox->addItem("MAV_CMD_MISSION_START", MAV_CMD_MISSION_START);
+    ui->editCommandComboBox->addItem("MAV_CMD_COMPONENT_ARM_DISARM", MAV_CMD_COMPONENT_ARM_DISARM);
     ui->editCommandComboBox->setEditable(true);
 }
 
@@ -136,6 +137,7 @@ void QGCCommandButton::startEditMode()
     ui->commandButton->hide();
     ui->nameLabel->hide();
 
+    ui->editCommandComboBox->blockSignals(false);
     ui->editCommandComboBox->show();
     ui->editFinishButton->show();
     ui->editNameLabel->show();
@@ -158,6 +160,7 @@ void QGCCommandButton::startEditMode()
 
 void QGCCommandButton::endEditMode()
 {
+    ui->editCommandComboBox->blockSignals(true);
     ui->editCommandComboBox->hide();
     ui->editFinishButton->hide();
     ui->editNameLabel->hide();

thirdParty/mavlink/include/common/common.h

@@ -283,7 +283,8 @@ enum MAV_CMD
 	MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN=246, /* Request the reboot or shutdown of system components. |0: Do nothing for autopilot, 1: Reboot autopilot, 2: Shutdown autopilot.| 0: Do nothing for onboard computer, 1: Reboot onboard computer, 2: Shutdown onboard computer.| Reserved| Reserved| Empty| Empty| Empty|  */
 	MAV_CMD_OVERRIDE_GOTO=252, /* Hold / continue the current action |MAV_GOTO_DO_HOLD: hold MAV_GOTO_DO_CONTINUE: continue with next item in mission plan| MAV_GOTO_HOLD_AT_CURRENT_POSITION: Hold at current position MAV_GOTO_HOLD_AT_SPECIFIED_POSITION: hold at specified position| MAV_FRAME coordinate frame of hold point| Desired yaw angle in degrees| Latitude / X position| Longitude / Y position| Altitude / Z position|  */
 	MAV_CMD_MISSION_START=300, /* start running a mission |first_item: the first mission item to run| last_item:  the last mission item to run (after this item is run, the mission ends)|  */
-	MAV_CMD_ENUM_END=301, /*  | */
+	MAV_CMD_COMPONENT_ARM_DISARM=400, /* Arms / Disarms a component |1 to arm, 0 to disarm|  */
+	MAV_CMD_ENUM_END=401, /*  | */
 };
 #endif
 

thirdParty/mavlink/include/common/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sat Feb 25 17:32:04 2012"
+#define MAVLINK_BUILD_DATE "Sun Feb 26 16:49:33 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

thirdParty/mavlink/include/pixhawk/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sat Feb 25 17:32:04 2012"
+#define MAVLINK_BUILD_DATE "Sun Feb 26 16:49:33 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  

thirdParty/mavlink/message_definitions/common.xml

@@ -668,6 +668,10 @@
                     <param index="1">first_item: the first mission item to run</param>
                     <param index="2">last_item:  the last mission item to run (after this item is run, the mission ends)</param>
                </entry>
+              <entry value="400" name="MAV_CMD_COMPONENT_ARM_DISARM">
+                  <description>Arms / Disarms a component</description>
+                  <param index="1">1 to arm, 0 to disarm</param>
+              </entry>
           </enum>
           <enum name="MAV_DATA_STREAM">
                <description>Data stream IDs. A data stream is not a fixed set of messages, but rather a