Allow Advanced Config for all firmware types

src/ui/QGCConfigView.cc

@@ -2,8 +2,6 @@
 #include "ui_QGCConfigView.h"
 #include "UASManager.h"
 #include "QGCPX4VehicleConfig.h"
-#include "QGCVehicleConfig.h"
-#include "QGCPX4VehicleConfig.h"
 #include "MainWindow.h"
 
 QGCConfigView::QGCConfigView(QWidget *parent) :
@@ -16,22 +14,13 @@ QGCConfigView::QGCConfigView(QWidget *parent) :
 
     connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(activeUASChanged(UASInterface*)));
 
-    // The config screens are required for firmware uploading
-    if (MainWindow::instance()->getCustomMode() == MainWindow::CUSTOM_MODE_PX4) {
-
-        ui->gridLayout->removeWidget(ui->waitingLabel);
-        ui->waitingLabel->setVisible(false);
-        delete ui->waitingLabel;
-        ui->waitingLabel = NULL;
-
-        config = new QGCPX4VehicleConfig();
-        ui->gridLayout->addWidget(config);
-
-    } else {
-        //don't show a configuration widget if no vehicle is connected
-        //show a placeholder informational widget instead
-    }
+    ui->gridLayout->removeWidget(ui->waitingLabel);
+    ui->waitingLabel->setVisible(false);
+    delete ui->waitingLabel;
+    ui->waitingLabel = NULL;
 
+    config = new QGCPX4VehicleConfig();
+    ui->gridLayout->addWidget(config);
 }
 
 QGCConfigView::~QGCConfigView()
@@ -68,30 +57,12 @@ void QGCConfigView::activeUASChanged(UASInterface* uas)
             }
         }
 
-        int autopilotType = mav->getAutopilotType();
-        switch (autopilotType) {
-        case MAV_AUTOPILOT_PX4:
-            {
-                QGCPX4VehicleConfig* px4config = qobject_cast<QGCPX4VehicleConfig*>(config);
-                if (!px4config) {
-                    if (config)
-                        delete config;
-                    config = new QGCPX4VehicleConfig();
-                    ui->gridLayout->addWidget(config);
-                }
-            }
-            break;
-        default:
-            {
-                QGCVehicleConfig* generalconfig = qobject_cast<QGCVehicleConfig*>(config);
-                if (!generalconfig) {
-                    if (config)
-                        delete config;
-                    config = new QGCVehicleConfig();
-                    ui->gridLayout->addWidget(config);
-                }
-            }
-            break;
+        QGCPX4VehicleConfig* px4config = qobject_cast<QGCPX4VehicleConfig*>(config);
+        if (!px4config) {
+            if (config)
+                delete config;
+            config = new QGCPX4VehicleConfig();
+            ui->gridLayout->addWidget(config);
         }
     }
     else {

src/ui/QGCPX4VehicleConfig.cc

@@ -270,10 +270,12 @@ void QGCPX4VehicleConfig::setActiveUAS(UASInterface* active)
 
     // Since a system is now connected, enable the VehicleConfig UI.
     // Enable buttons
+    
+    bool px4Firmware = mav->getAutopilotType() == MAV_AUTOPILOT_PIXHAWK;
+    ui->airframeMenuButton->setEnabled(px4Firmware);
+    ui->sensorMenuButton->setEnabled(px4Firmware);
+    ui->rcMenuButton->setEnabled(px4Firmware);
     ui->advancedMenuButton->setEnabled(true);
-    ui->airframeMenuButton->setEnabled(true);
-    ui->sensorMenuButton->setEnabled(true);
-    ui->rcMenuButton->setEnabled(true);
 }
 
 void QGCPX4VehicleConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value)