Merge pull request #234 from julianoes/master

Small fix to ControlWidget

Merge pull request #234 from julianoes/master
Small fix to ControlWidget
edd68abf · Lorenz Meier · cf176d0c · 38b96adf · edd68abf
Commit edd68abf authored Feb 19, 2013 by Lorenz Meier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

UASControlWidget.cc src/ui/uas/UASControlWidget.cc +6 -0

No files found.
--- a/src/ui/uas/UASControlWidget.cc
+++ b/src/ui/uas/UASControlWidget.cc
@@ -178,6 +178,12 @@ void UASControlWidget::transmitMode()
    UASInterface* mav = UASManager::instance()->getUASForId(this->uas);
    if (mav)
    {
+        // include armed state
+        if (engineOn)
+            uasMode |= MAV_MODE_FLAG_SAFETY_ARMED;
+        else
+            uasMode &= ~MAV_MODE_FLAG_SAFETY_ARMED;
+
        mav->setMode(uasMode);
        QString mode = ui.modeComboBox->currentText();