rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/thread/OP-1567_Wizard_fixes' into rel-14.10

Browse Source
This commit is contained in:
Fredrik Larsson 2014-10-24 03:36:04 +11:00
commit 75b9779a87
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
View File

@ -80,6 +80,9 @@ bool ControllerPage::isComplete() const
bool ControllerPage::validatePage()
{
getWizard()->setControllerType((SetupWizard::CONTROLLER_TYPE)ui->boardTypeCombo->itemData(ui->boardTypeCombo->currentIndex()).toInt());
if (getWizard()->getControllerType() == SetupWizard::CONTROLLER_CC || getWizard()->getControllerType() == SetupWizard::CONTROLLER_CC3D) {
getWizard()->setGpsType(SetupWizard::GPS_DISABLED);
}
return true;
}

1
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -58,6 +58,7 @@ SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent), VehicleConfiguratio
m_controllerType(CONTROLLER_UNKNOWN),
m_vehicleType(VEHICLE_UNKNOWN), m_inputType(INPUT_UNKNOWN), m_escType(ESC_UNKNOWN),
m_servoType(SERVO_UNKNOWN), m_vehicleTemplate(NULL),
m_gpsType(GPS_DISABLED), m_airspeedType(AIRSPEED_DISABLED),
m_calibrationPerformed(false), m_restartNeeded(false), m_connectionManager(0)
{
setWindowTitle(tr("OpenPilot Setup Wizard"));