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.
41 lines
1.1 KiB
C
41 lines
1.1 KiB
C
/**
|
|
* @file FusionOffset.h
|
|
* @author Seb Madgwick
|
|
* @brief Gyroscope offset correction algorithm for run-time calibration of the
|
|
* gyroscope offset.
|
|
*/
|
|
|
|
#ifndef FUSION_OFFSET_H
|
|
#define FUSION_OFFSET_H
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Includes
|
|
|
|
#include "FusionMath.h"
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Definitions
|
|
|
|
/**
|
|
* @brief Gyroscope offset algorithm structure. Structure members are used
|
|
* internally and must not be accessed by the application.
|
|
*/
|
|
typedef struct {
|
|
float filterCoefficient;
|
|
unsigned int timeout;
|
|
unsigned int timer;
|
|
FusionVector gyroscopeOffset;
|
|
} FusionOffset;
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Function declarations
|
|
|
|
void FusionOffsetInitialise(FusionOffset *const offset, const unsigned int sampleRate);
|
|
|
|
FusionVector FusionOffsetUpdate(FusionOffset *const offset, FusionVector gyroscope);
|
|
|
|
#endif
|
|
|
|
//------------------------------------------------------------------------------
|
|
// End of file
|