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

OP-1756 Uncrustify

Browse Source
This commit is contained in:
m_thread 2015-03-01 22:49:53 +01:00
parent 4046439433
commit 1c4a861211
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::CONTROLLER_CC3D:
prefix = "cc-";
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
suffix = "-oneshot";
}
break;

10
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
View File

@ -46,7 +46,7 @@ OutputCalibrationPage::OutputCalibrationPage(SetupWizard *wizard, QWidget *paren
connect(ui->calibrateAllMotors, SIGNAL(toggled(bool)), this, SLOT(calibrateAllMotorsChanged()));
// move the code that was here to setupVehicle() so we can determine which image to use.
m_vehicleScene = new QGraphicsScene(this);
m_vehicleScene = new QGraphicsScene(this);
ui->vehicleView->setScene(m_vehicleScene);
}
@ -407,8 +407,8 @@ bool OutputCalibrationPage::validatePage()
if (!isFinished()) {
m_currentWizardIndex++;
if (ui->calibrateAllMotors->isChecked() &&
m_currentWizardIndex > 0 &&
m_wizardIndexes[m_currentWizardIndex - 1] == 1) {
m_currentWizardIndex > 0 &&
m_wizardIndexes[m_currentWizardIndex - 1] == 1) {
while (!isFinished() && m_wizardIndexes[m_currentWizardIndex] == 1) {
m_currentWizardIndex++;
}
@ -465,7 +465,7 @@ void OutputCalibrationPage::customBackClicked()
void OutputCalibrationPage::getCurrentChannels(QList<quint16> &channels)
{
if (ui->calibrateAllMotors->isChecked()) {
for(int i = 1; i < m_channelIndex.size(); i++) {
for (int i = 1; i < m_channelIndex.size(); i++) {
if (m_vehicleElementTypes[i + 1] == MOTOR) {
channels << m_channelIndex[i];
}
@ -630,7 +630,7 @@ void OutputCalibrationPage::on_servoButton_toggled(bool checked)
void OutputCalibrationPage::on_servoCenterAngleSlider_valueChanged(int position)
{
Q_UNUSED(position);
quint16 value = ui->servoCenterAngleSlider->value();
quint16 value = ui->servoCenterAngleSlider->value();
m_calibrationUtil->setChannelOutputValue(value);
QList<quint16> currentChannels;

2
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
View File

@ -73,7 +73,7 @@ private slots:
void on_calibrateAllMotors_toggled(bool checked);
private:
enum ElementType{ FULL, FRAME, MOTOR, SERVO };
enum ElementType { FULL, FRAME, MOTOR, SERVO };
void setupVehicle();
void startWizard();
void setupVehicleItems();