rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

REVONANO uncrustify

Browse Source
This commit is contained in:
abeck70 2015-06-02 08:38:27 +10:00
parent 5ea8636424
commit ae26eea363
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,7 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
bankLabels << "1 (1)" << "2 (2,7,11)" << "3 (3)" << "4 (4)" << "5 (5-6)" << "6 (8-10,12)";
channelBanks << 1 << 2 << 3 << 4 << 5 << 5 << 2 << 6 << 6 << 6 << 2 << 6;
}
}
}
int i = 0;
foreach(QString banklabel, bankLabels) {

7
ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp
View File

@ -55,7 +55,7 @@ bool InputPage::validatePage()
getWizard()->setInputType(SetupWizard::INPUT_SBUS);
} else if (ui->spectrumButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_DSM);
} else if (ui->multiplexButton->isChecked()){
} else if (ui->multiplexButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_SRXL);
} else {
getWizard()->setInputType(SetupWizard::INPUT_PWM);
@ -81,15 +81,20 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
switch (selectedType) {
case VehicleConfigurationSource::INPUT_PWM:
return data.RM_RcvrPort != HwSettings::RM_RCVRPORT_PWM;
case VehicleConfigurationSource::INPUT_PPM:
return data.RM_RcvrPort != HwSettings::RM_RCVRPORT_PPM;
case VehicleConfigurationSource::INPUT_SBUS:
return data.RM_MainPort != HwSettings::RM_MAINPORT_SBUS;
case VehicleConfigurationSource::INPUT_SRXL:
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_SRXL;
case VehicleConfigurationSource::INPUT_DSM:
// TODO: Handle all of the DSM types ?? Which is most common?
return data.RM_MainPort != HwSettings::RM_MAINPORT_DSM;
default: return true;
}
break;