Merge pull request #760 from mavlink/flighttermination

Flighttermination mavlink command
11 years ago · ab2e600c25
2 changed files with 2 additions and 1 deletions
--- a/libs/mavlink/include/mavlink/v1.0
+++ b/libs/mavlink/include/mavlink/v1.0
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit 950958de0de346d0ec13272b73ec7393f6a858fc
+Subproject commit 04b1ad5b284d5e916858ca9f928e93d97bbf6ad9
--- a/src/ui/designer/QGCCommandButton.cc
+++ b/src/ui/designer/QGCCommandButton.cc
@ -83,6 +83,7 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
				@@ -83,6 +83,7 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
    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->addItem("MAV_CMD_DO_FLIGHTTERMINATION", MAV_CMD_DO_FLIGHTTERMINATION);
    ui->editCommandComboBox->setEditable(true);

    init();