rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

Merge branch 'rel-14.10' into laurent/OP-1556_Wizard_polishing

Browse Source
This commit is contained in:
Laurent Lalanne 2014-10-29 20:59:05 +01:00
commit 94dd983363
3 changed files with 1552 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1549
ground/openpilotgcs/share/openpilotgcs/cloudconfig/multirotor/BlackoutMiniH-Multirotor-QuadrocopterX-37cefe693f6.optmpl Normal file
View File

File diff suppressed because one or more lines are too long

3
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -591,6 +591,7 @@ void ConfigInputWidget::wzBack()
void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step) void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
{ {
ui->wzText2->clear(); ui->wzText2->clear();
ui->wzNext->setText(tr("Next"));
switch (step) { switch (step) {
case wizardWelcome: case wizardWelcome:
@ -863,13 +864,13 @@ void ConfigInputWidget::setChannel(int newChan)
if (manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("Accessory") || if (manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("Accessory") ||
manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("FlightMode")) { manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("FlightMode")) {
ui->wzNext->setEnabled(true); ui->wzNext->setEnabled(true);
ui->wzNext->setText(tr("Next/Skip"));
ui->wzText->setText(ui->wzText->text() + tr(" Alternatively, click Next to skip this channel.")); ui->wzText->setText(ui->wzText->text() + tr(" Alternatively, click Next to skip this channel."));
} else { } else {
ui->wzNext->setEnabled(false); ui->wzNext->setEnabled(false);
} }
setMoveFromCommand(newChan); setMoveFromCommand(newChan);
currentChannelNum = newChan; currentChannelNum = newChan;
channelDetected = false; channelDetected = false;
} }

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

@ -170,7 +170,7 @@ int SetupWizard::nextId() const
} }
case PAGE_BIAS_CALIBRATION: case PAGE_BIAS_CALIBRATION:
if (getVehicleType() == VEHICLE_MULTI && getEscType() == ESC_RAPID) { if (getVehicleType() == VEHICLE_MULTI) {
return PAGE_ESC_CALIBRATION; return PAGE_ESC_CALIBRATION;
} else { } else {
return PAGE_OUTPUT_CALIBRATION; return PAGE_OUTPUT_CALIBRATION;