mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-19 01:41:30 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
50 lines
1.7 KiB
C
50 lines
1.7 KiB
C
/**
|
|
* @file FusionCalibration.h
|
|
* @author Seb Madgwick
|
|
* @brief Gyroscope, accelerometer, and magnetometer calibration models.
|
|
*/
|
|
|
|
#ifndef FUSION_CALIBRATION_H
|
|
#define FUSION_CALIBRATION_H
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Includes
|
|
|
|
#include "FusionMath.h"
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Inline functions
|
|
|
|
/**
|
|
* @brief Gyroscope and accelerometer calibration model.
|
|
* @param uncalibrated Uncalibrated measurement.
|
|
* @param misalignment Misalignment matrix.
|
|
* @param sensitivity Sensitivity.
|
|
* @param offset Offset.
|
|
* @return Calibrated measurement.
|
|
*/
|
|
static inline FusionVector FusionCalibrationInertial(const FusionVector uncalibrated, const FusionMatrix misalignment,
|
|
const FusionVector sensitivity, const FusionVector offset)
|
|
{
|
|
return FusionMatrixMultiplyVector(misalignment,
|
|
FusionVectorHadamardProduct(FusionVectorSubtract(uncalibrated, offset), sensitivity));
|
|
}
|
|
|
|
/**
|
|
* @brief Magnetometer calibration model.
|
|
* @param uncalibrated Uncalibrated measurement.
|
|
* @param softIronMatrix Soft-iron matrix.
|
|
* @param hardIronOffset Hard-iron offset.
|
|
* @return Calibrated measurement.
|
|
*/
|
|
static inline FusionVector FusionCalibrationMagnetic(const FusionVector uncalibrated, const FusionMatrix softIronMatrix,
|
|
const FusionVector hardIronOffset)
|
|
{
|
|
return FusionMatrixMultiplyVector(softIronMatrix, FusionVectorSubtract(uncalibrated, hardIronOffset));
|
|
}
|
|
|
|
#endif
|
|
|
|
//------------------------------------------------------------------------------
|
|
// End of file
|