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

OP-1222 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-08-26 22:34:58 +02:00
parent a4d2582cec
commit b31ee46724
14 changed files with 99 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -151,7 +151,6 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
m_aircraft->fwAileron2Label->setText("Aileron 2"); m_aircraft->fwAileron2Label->setText("Aileron 2");
m_aircraft->fwElevator1Label->setText("Elevator 1"); m_aircraft->fwElevator1Label->setText("Elevator 1");
m_aircraft->fwElevator2Label->setText("Elevator 2"); m_aircraft->fwElevator2Label->setText("Elevator 2");
} else if (frameType == "FixedWingVtail" || frameType == "Vtail") { } else if (frameType == "FixedWingVtail" || frameType == "Vtail") {
// do nothing for now // do nothing for now
} else if (frameType == "FixedWingElevon" || frameType == "Elevon") { } else if (frameType == "FixedWingElevon" || frameType == "Elevon") {
@ -187,7 +186,6 @@ void ConfigFixedWingWidget::setupUI(QString frameType)
void ConfigFixedWingWidget::setupEnabledControls(QString frameType) void ConfigFixedWingWidget::setupEnabledControls(QString frameType)
{ {
// disable all motor channel boxes // disable all motor channel boxes
for (int i = 1; i <= 8; i++) { for (int i = 1; i <= 8; i++) {
// do it manually so we can turn off any error decorations // do it manually so we can turn off any error decorations
@ -311,9 +309,7 @@ QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets()
setConfigData(config); setConfigData(config);
m_aircraft->fwStatusLabel->setText(tr("Configuration OK")); m_aircraft->fwStatusLabel->setText(tr("Configuration OK"));
} else if (m_aircraft->fixedWingType->currentText() == "elevon") {
}
else if (m_aircraft->fixedWingType->currentText() == "elevon") {
airframeType = "FixedWingElevon"; airframeType = "FixedWingElevon";
setupFrameElevon(airframeType); setupFrameElevon(airframeType);
@ -338,7 +334,6 @@ QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets()
setupFixedWingElevonMixer(mixerMatrix); setupFixedWingElevonMixer(mixerMatrix);
m_aircraft->fwStatusLabel->setText(tr("Configuration OK")); m_aircraft->fwStatusLabel->setText(tr("Configuration OK"));
} }
// Remove Feed Forward, it is pointless on a plane: // Remove Feed Forward, it is pointless on a plane:
@ -528,8 +523,6 @@ bool ConfigFixedWingWidget::setupFrameElevon(QString airframeType)
m_aircraft->fwStatusLabel->setText("Mixer generated"); m_aircraft->fwStatusLabel->setText("Mixer generated");
return true; return true;
} }
/** /**
@ -550,7 +543,8 @@ void ConfigFixedWingWidget::setupElevonServo(int channel, double pitch, double r
/** /**
This function sets up the elevon fixed wing mixer values. This function sets up the elevon fixed wing mixer values.
*/ */
bool ConfigFixedWingWidget::setupFixedWingElevonMixer(double mixerFactors[8][3]){ bool ConfigFixedWingWidget::setupFixedWingElevonMixer(double mixerFactors[8][3])
{
UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject(QString("MixerSettings"))); UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject(QString("MixerSettings")));
Q_ASSERT(mixer); Q_ASSERT(mixer);
@ -672,4 +666,3 @@ void ConfigFixedWingWidget::enableControls(bool enable)
setupEnabledControls(m_aircraft->fixedWingType->currentText()); setupEnabledControls(m_aircraft->fixedWingType->currentText());
} }
} }

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

@ -103,8 +103,7 @@ void AirSpeedPage::setupAirSpeedPageTypesCombo()
} }
void AirSpeedPage::updateAvailableTypes() void AirSpeedPage::updateAvailableTypes()
{ {}
}
// TODO // TODO
void AirSpeedPage::updateImageAndDescription() void AirSpeedPage::updateImageAndDescription()
@ -132,5 +131,4 @@ void AirSpeedPage::updateImageAndDescription()
ui->typeGraphicsView->fitInView(m_airspeedPic, Qt::KeepAspectRatio); ui->typeGraphicsView->fitInView(m_airspeedPic, Qt::KeepAspectRatio);
ui->typeDescription->setText(description); ui->typeDescription->setText(description);
} }

1
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.h
View File

@ -62,7 +62,6 @@ private:
private slots: private slots:
void updateImageAndDescription(); void updateImageAndDescription();
}; };
#endif // AIRSPEEDPAGE_H #endif // AIRSPEEDPAGE_H

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

@ -101,8 +101,7 @@ void FixedWingPage::setupFixedWingTypesCombo()
} }
void FixedWingPage::updateAvailableTypes() void FixedWingPage::updateAvailableTypes()
{ {}
}
void FixedWingPage::updateImageAndDescription() void FixedWingPage::updateImageAndDescription()
{ {
@ -129,5 +128,4 @@ void FixedWingPage::updateImageAndDescription()
ui->typeGraphicsView->fitInView(m_fixedwingPic, Qt::KeepAspectRatio); ui->typeGraphicsView->fitInView(m_fixedwingPic, Qt::KeepAspectRatio);
ui->typeDescription->setText(description); ui->typeDescription->setText(description);
} }

1
ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.h
View File

@ -62,7 +62,6 @@ private:
private slots: private slots:
void updateImageAndDescription(); void updateImageAndDescription();
}; };
#endif // FIXEDWINGPAGE_H #endif // FIXEDWINGPAGE_H

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

@ -148,6 +148,7 @@ int SetupWizard::nextId() const
switch (getVehicleType()) { switch (getVehicleType()) {
case VEHICLE_FIXEDWING: case VEHICLE_FIXEDWING:
return PAGE_AIRFRAMESTAB_FIXEDWING; return PAGE_AIRFRAMESTAB_FIXEDWING;
// TODO: Pages for Multi and heli // TODO: Pages for Multi and heli
case VEHICLE_MULTI: case VEHICLE_MULTI:
case VEHICLE_HELI: case VEHICLE_HELI:

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

@ -254,6 +254,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
ActuatorSettings *actSettings = ActuatorSettings::GetInstance(m_uavoManager); ActuatorSettings *actSettings = ActuatorSettings::GetInstance(m_uavoManager);
qint16 escFrequence = LEGACY_ESC_FREQUENCE; qint16 escFrequence = LEGACY_ESC_FREQUENCE;
switch (m_configSource->getEscType()) { switch (m_configSource->getEscType()) {
case VehicleConfigurationSource::ESC_STANDARD: case VehicleConfigurationSource::ESC_STANDARD:
escFrequence = LEGACY_ESC_FREQUENCE; escFrequence = LEGACY_ESC_FREQUENCE;
@ -1549,7 +1550,6 @@ void VehicleConfigurationHelper::setupOctoCopter()
void VehicleConfigurationHelper::setupElevon() void VehicleConfigurationHelper::setupElevon()
{ {
mixerChannelSettings channels[10]; mixerChannelSettings channels[10];
GUIConfigDataUnion guiSettings = getGUIConfigData(); GUIConfigDataUnion guiSettings = getGUIConfigData();