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

uncrustify

Browse Source
This commit is contained in:
Alessio Morale 2014-09-24 01:05:37 +02:00
parent 5b968389a0
commit adc9821cd3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
View File

@ -101,7 +101,7 @@ SixPointCalibrationModel::SixPointCalibrationModel(QObject *parent) :
revoCalibration = RevoCalibration::GetInstance(getObjectManager()); revoCalibration = RevoCalibration::GetInstance(getObjectManager());
Q_ASSERT(revoCalibration); Q_ASSERT(revoCalibration);
auxMagSettings = AuxMagSettings::GetInstance(getObjectManager()); auxMagSettings = AuxMagSettings::GetInstance(getObjectManager());
Q_ASSERT(auxMagSettings); Q_ASSERT(auxMagSettings);
accelGyroSettings = AccelGyroSettings::GetInstance(getObjectManager()); accelGyroSettings = AccelGyroSettings::GetInstance(getObjectManager());
@ -440,7 +440,7 @@ void SixPointCalibrationModel::compute()
double Be_length; double Be_length;
RevoCalibration::DataFields revoCalibrationData = revoCalibration->getData(); RevoCalibration::DataFields revoCalibrationData = revoCalibration->getData();
AuxMagSettings::DataFields auxCalibrationData = auxMagSettings->getData(); AuxMagSettings::DataFields auxCalibrationData = auxMagSettings->getData();
AccelGyroSettings::DataFields accelGyroSettingsData = accelGyroSettings->getData(); AccelGyroSettings::DataFields accelGyroSettingsData = accelGyroSettings->getData();
HomeLocation::DataFields homeLocationData = homeLocation->getData(); HomeLocation::DataFields homeLocationData = homeLocation->getData();
@ -521,8 +521,8 @@ void SixPointCalibrationModel::compute()
if (good_calibration) { if (good_calibration) {
m_dirty = true; m_dirty = true;
if (calibratingMag) { if (calibratingMag) {
result.revoCalibrationData = revoCalibrationData; result.revoCalibrationData = revoCalibrationData;
result.auxMagSettingsData = auxCalibrationData; result.auxMagSettingsData = auxCalibrationData;
displayInstructions(tr("Magnetometer calibration completed successfully."), WizardModel::Success); displayInstructions(tr("Magnetometer calibration completed successfully."), WizardModel::Success);
} }
if (calibratingAccel) { if (calibratingAccel) {

4
ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.h
View File

@ -92,14 +92,14 @@ public:
UAVObject::Metadata accelStateMetadata; UAVObject::Metadata accelStateMetadata;
UAVObject::Metadata magSensorMetadata; UAVObject::Metadata magSensorMetadata;
UAVObject::Metadata auxMagSensorMetadata; UAVObject::Metadata auxMagSensorMetadata;
AuxMagSettings::DataFields auxMagSettings; AuxMagSettings::DataFields auxMagSettings;
RevoCalibration::DataFields revoCalibrationData; RevoCalibration::DataFields revoCalibrationData;
AccelGyroSettings::DataFields accelGyroSettingsData; AccelGyroSettings::DataFields accelGyroSettingsData;
} Memento; } Memento;
typedef struct { typedef struct {
RevoCalibration::DataFields revoCalibrationData; RevoCalibration::DataFields revoCalibrationData;
AuxMagSettings::DataFields auxMagSettingsData; AuxMagSettings::DataFields auxMagSettingsData;
AccelGyroSettings::DataFields accelGyroSettingsData; AccelGyroSettings::DataFields accelGyroSettingsData;
} Result; } Result;