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

Merged in f5soh/librepilot/LP-590_Gyro_calibration_boardleveltrim (pull request #505)

Browse Source 
LP-590 Gyro/Accel calibration boardleveltrim

Approved-by: Julian Lilov <jdl@abv.bg>
Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Philippe Renon <philippe_renon@yahoo.fr>
This commit is contained in:
Lalanne Laurent 2018-04-29 17:27:39 +00:00 committed by Philippe Renon
commit a4dfa85a58
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/gcs/src/plugins/config/calibration/gyrobiascalibrationmodel.cpp
View File

@ -69,9 +69,13 @@ void GyroBiasCalibrationModel::start()
// Disable gyro bias correction while calibrating // Disable gyro bias correction while calibrating
attitudeSettingsData.BiasCorrectGyro = AttitudeSettings::BIASCORRECTGYRO_FALSE; attitudeSettingsData.BiasCorrectGyro = AttitudeSettings::BIASCORRECTGYRO_FALSE;
// Zero board rotation // Zero board rotation
attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = 0; attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = 0;
attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = 0; attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = 0;
attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = 0; attitudeSettingsData.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = 0;
// Zero board level trim
attitudeSettingsData.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL] = 0;
attitudeSettingsData.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH] = 0;
attitudeSettings->setData(attitudeSettingsData); attitudeSettings->setData(attitudeSettingsData);
UAVObject::Metadata gyroStateMetadata = gyroState->getMetadata(); UAVObject::Metadata gyroStateMetadata = gyroState->getMetadata();

32
ground/gcs/src/plugins/config/configrevowidget.cpp
View File

@ -238,19 +238,25 @@ void ConfigRevoWidget::storeAndClearBoardRotation()
if (!isBoardRotationStored) { if (!isBoardRotationStored) {
UAVObjectUpdaterHelper updateHelper; UAVObjectUpdaterHelper updateHelper;
// Store current board rotation // Store current board rotation and board level trim
isBoardRotationStored = true; isBoardRotationStored = true;
AttitudeSettings *attitudeSettings = AttitudeSettings::GetInstance(getObjectManager()); AttitudeSettings *attitudeSettings = AttitudeSettings::GetInstance(getObjectManager());
Q_ASSERT(attitudeSettings); Q_ASSERT(attitudeSettings);
AttitudeSettings::DataFields data = attitudeSettings->getData(); AttitudeSettings::DataFields data = attitudeSettings->getData();
storedBoardRotation[AttitudeSettings::BOARDROTATION_YAW] = data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW]; storedBoardRotation[AttitudeSettings::BOARDROTATION_YAW] = data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW];
storedBoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL]; storedBoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL];
storedBoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH]; storedBoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH];
storedBoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL] = data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL];
storedBoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH] = data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH];
// Set board rotation to no rotation // Set board rotation to zero
data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = 0; data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = 0;
data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = 0; data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = 0;
data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = 0; data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = 0;
// Set board level trim to zero
data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL] = 0;
data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH] = 0;
attitudeSettings->setData(data, false); attitudeSettings->setData(data, false);
updateHelper.doObjectAndWait(attitudeSettings); updateHelper.doObjectAndWait(attitudeSettings);
@ -281,13 +287,15 @@ void ConfigRevoWidget::recallBoardRotation()
// Recall current board rotation // Recall current board rotation
isBoardRotationStored = false; isBoardRotationStored = false;
// Restore the flight controller board rotation // Restore the flight controller board rotation and board level trim
AttitudeSettings *attitudeSettings = AttitudeSettings::GetInstance(getObjectManager()); AttitudeSettings *attitudeSettings = AttitudeSettings::GetInstance(getObjectManager());
Q_ASSERT(attitudeSettings); Q_ASSERT(attitudeSettings);
AttitudeSettings::DataFields data = attitudeSettings->getData(); AttitudeSettings::DataFields data = attitudeSettings->getData();
data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = storedBoardRotation[AttitudeSettings::BOARDROTATION_YAW]; data.BoardRotation[AttitudeSettings::BOARDROTATION_YAW] = storedBoardRotation[AttitudeSettings::BOARDROTATION_YAW];
data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = storedBoardRotation[AttitudeSettings::BOARDROTATION_ROLL]; data.BoardRotation[AttitudeSettings::BOARDROTATION_ROLL] = storedBoardRotation[AttitudeSettings::BOARDROTATION_ROLL];
data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = storedBoardRotation[AttitudeSettings::BOARDROTATION_PITCH]; data.BoardRotation[AttitudeSettings::BOARDROTATION_PITCH] = storedBoardRotation[AttitudeSettings::BOARDROTATION_PITCH];
data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL] = storedBoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_ROLL];
data.BoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH] = storedBoardLevelTrim[AttitudeSettings::BOARDLEVELTRIM_PITCH];
attitudeSettings->setData(data, false); attitudeSettings->setData(data, false);
updateHelper.doObjectAndWait(attitudeSettings); updateHelper.doObjectAndWait(attitudeSettings);

3
ground/gcs/src/plugins/config/configrevowidget.h
View File

@ -62,7 +62,8 @@ private:
Ui_RevoSensorsWidget *m_ui; Ui_RevoSensorsWidget *m_ui;
// Board rotation store/recall for FC and for aux mag // Board rotation store/recall for FC and for aux mag
qint16 storedBoardRotation[3]; float storedBoardRotation[3];
float storedBoardLevelTrim[2];
qint16 auxMagStoredBoardRotation[3]; qint16 auxMagStoredBoardRotation[3];
bool isBoardRotationStored; bool isBoardRotationStored;