Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into fw_wiz

ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp

@@ -45,11 +45,8 @@ FixedWingPage::FixedWingPage(SetupWizard *wizard, QWidget *parent) :
     setupFixedWingTypesCombo();
 
     // Default to Aileron setup
-    ui->typeCombo->setCurrentIndex(0);
     connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(updateImageAndDescription()));
-    ui->typeGraphicsView->setSceneRect(m_fixedwingPic->boundingRect());
+    ui->typeCombo->setCurrentIndex(0);
-    ui->typeGraphicsView->fitInView(m_fixedwingPic, Qt::KeepAspectRatio);
-
 }
 
 FixedWingPage::~FixedWingPage()
@@ -71,15 +68,26 @@ bool FixedWingPage::validatePage()
     return true;
 }
 
-void FixedWingPage::resizeEvent(QResizeEvent *event)
+void FixedWingPage::fitInView()
 {
-    Q_UNUSED(event);
     if (m_fixedwingPic) {
         ui->typeGraphicsView->setSceneRect(m_fixedwingPic->boundingRect());
         ui->typeGraphicsView->fitInView(m_fixedwingPic, Qt::KeepAspectRatio);
     }
 }
 
+void FixedWingPage::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+    fitInView();
+}
+
+void FixedWingPage::showEvent(QShowEvent *event)
+{
+    Q_UNUSED(event);
+    fitInView();
+}
+
 void FixedWingPage::setupFixedWingTypesCombo()
 {
     ui->typeCombo->addItem(tr("Aileron Dual Servos"), SetupWizard::FIXED_WING_DUAL_AILERON);
@@ -98,8 +106,6 @@ void FixedWingPage::updateAvailableTypes()
 
 void FixedWingPage::updateImageAndDescription()
 {
-
-
     SetupWizard::VEHICLE_SUB_TYPE type = (SetupWizard::VEHICLE_SUB_TYPE)ui->typeCombo->itemData(ui->typeCombo->currentIndex()).toInt();
     QString elementId   = "";
     QString description = m_descriptions.at(ui->typeCombo->currentIndex());
@@ -125,4 +131,3 @@ void FixedWingPage::updateImageAndDescription()
     ui->typeDescription->setText(description);
 
 }
-

ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.h

@@ -48,8 +48,10 @@ public:
     void initializePage();
     bool validatePage();
 
+    void fitInView();
 protected:
     void resizeEvent(QResizeEvent *event);
+    void showEvent(QShowEvent *event);
 
 private:
     Ui::FixedWingPage *ui;
@@ -60,6 +62,7 @@ private:
 
 private slots:
     void updateImageAndDescription();
+
 };
 
 #endif // FIXEDWINGPAGE_H

ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp

@@ -185,12 +185,12 @@ void OutputCalibrationPage::setupVehicle()
         break;
     case SetupWizard::FIXED_WING_AILERON:
         loadSVGFile(FIXEDWING_SVG_FILE);
-        m_wizardIndexes << 0 << 1 << 2 << 3 << 4 << 2 << 3 << 4 << 2 << 3 << 4 << 2 << 3 << 4;
+        m_wizardIndexes << 0 << 1 << 2 << 3 << 4 << 2 << 3 << 4 << 2 << 3 << 4;
-        m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-ail-left" << "ail2-ail-right" << "ail2-rudder" << "ail2-elevator";
+        m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-aileron" << "ail2-rudder" << "ail2-elevator";
-        m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 2 << 2 << 3 << 3 << 3 << 4 << 4 << 4 << 5 << 5 << 5;
+        m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 2 << 2 << 3 << 3 << 3 << 4 << 4 << 4;
-        m_channelIndex << 0 << 2 << 0 << 0 << 0 << 1 << 1 << 1 << 3 << 3 << 3 << 4 << 4 << 4;
+        m_channelIndex << 0 << 2 << 0 << 0 << 0 << 4 << 4 << 4 << 1 << 1 << 1;
 
-        setupActuatorMinMaxAndNeutral(3, 3, 5);
+        setupActuatorMinMaxAndNeutral(3, 3, 4);
 
         getWizard()->setActuatorSettings(m_actuatorSettings);
         break;

ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.cpp

@@ -59,6 +59,6 @@ bool VehiclePage::validatePage()
 
 void VehiclePage::initializePage()
 {
-    ui->fixedwingButton->setEnabled(getWizard()->getControllerType() == SetupWizard::CONTROLLER_REVO ||
+    //ui->fixedwingButton->setEnabled(getWizard()->getControllerType() == SetupWizard::CONTROLLER_REVO ||
-                                    getWizard()->getControllerType() == SetupWizard::CONTROLLER_NANO);
+    //                                getWizard()->getControllerType() == SetupWizard::CONTROLLER_NANO);
 }