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

Merge branch 'rel-nano-15.05' into abeck/nano-pathfollower

Browse Source
This commit is contained in:
abeck70 2015-05-29 21:44:36 +10:00
commit b7f3dd979e
4 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -356,8 +356,8 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
// Setup labels and combos for banks according to board type // Setup labels and combos for banks according to board type
if (board == 0x0903) { if (board == 0x0903) {
// Revolution family of boards 6 timer banks // Revolution family of boards 6 timer banks
bankLabels << "1 (1-2)" << "2 (3)" << "3 (4)" << "4 (5-6)" << "5 (7-8)" << "6 (9-10)"; bankLabels << "1 (1-2)" << "2 (3)" << "3 (4)" << "4 (5-6)" << "5 (7,12)" << "6 (8-11)";
channelBanks << 1 << 1 << 2 << 3 << 4 << 4 << 5 << 5 << 6 << 6; channelBanks << 1 << 1 << 2 << 3 << 4 << 4 << 5 << 6 << 6 << 6 << 6 << 5;
} else if (board == 0x0905) { } else if (board == 0x0905) {
// Revolution Nano // Revolution Nano
bankLabels << "1 (1)" << "2 (2,7,11)" << "3 (3)" << "4 (4)" << "5 (5-6)" << "6 (8-10,12)"; bankLabels << "1 (1)" << "2 (2,7,11)" << "3 (3)" << "4 (4)" << "5 (5-6)" << "6 (8-10,12)";

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

@ -49,6 +49,7 @@ void AutoUpdatePage::autoUpdate()
Q_ASSERT(uploader); Q_ASSERT(uploader);
m_isUpdating = true; m_isUpdating = true;
uploader->autoUpdate(ui->eraseSettings->isChecked()); uploader->autoUpdate(ui->eraseSettings->isChecked());
getWizard()->setRestartNeeded(true);
} }
void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value) void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)

20
ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
View File

@ -77,25 +77,7 @@ bool EscPage::isSynchOrOneShotAvailable()
switch (getWizard()->getControllerType()) { switch (getWizard()->getControllerType()) {
case SetupWizard::CONTROLLER_NANO: case SetupWizard::CONTROLLER_NANO:
switch (getWizard()->getVehicleType()) { available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
case SetupWizard::VEHICLE_MULTI:
switch (getWizard()->getVehicleSubType()) {
case SetupWizard::MULTI_ROTOR_TRI_Y:
case SetupWizard::MULTI_ROTOR_QUAD_X:
case SetupWizard::MULTI_ROTOR_QUAD_H:
case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
break;
default:
available = false;
break;
}
break;
default:
break;
}
break; break;
default: default:

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

@ -100,7 +100,9 @@ int SetupWizard::nextId() const
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_NANO: case CONTROLLER_NANO:
reboot(); if (isRestartNeeded()) {
reboot();
}
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_OPLINK: case CONTROLLER_OPLINK: