Skip to content

Commit

Permalink
fixing compile from rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
orneryd committed Jun 6, 2018
1 parent c37d23c commit 6a03953
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/filter/kalman.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ void update_kalman_covariance(volatile axisData_t *gyroRateData)
arm_sqrt_f32(varStruct.yVar * varStruct.zVar, &squirt);
varStruct.yzCorrelation = varStruct.xyCoVar/squirt;

kalmanFilterStateRate[ROLL].r = ABS((varStruct.xMean + (varStruct.yMean * varStruct.xyCorrelation) + (varStruct.zMean * varStruct.xyCorrelation)) * VARIANCE_SCALE;
kalmanFilterStateRate[PITCH].r = ABS((varStruct.yMean + (varStruct.xMean * varStruct.xyCorrelation) + (varStruct.zMean * varStruct.yzCorrelation)) * VARIANCE_SCALE;
kalmanFilterStateRate[YAW].r = ABS((varStruct.zMean + (varStruct.yMean * varStruct.yzCorrelation) + (varStruct.xMean * varStruct.xzCorrelation)) * VARIANCE_SCALE;
kalmanFilterStateRate[ROLL].r = ABS((varStruct.xMean + (varStruct.yMean * varStruct.xyCorrelation) + (varStruct.zMean * varStruct.xyCorrelation))) * VARIANCE_SCALE;
kalmanFilterStateRate[PITCH].r = ABS((varStruct.yMean + (varStruct.xMean * varStruct.xyCorrelation) + (varStruct.zMean * varStruct.yzCorrelation))) * VARIANCE_SCALE;
kalmanFilterStateRate[YAW].r = ABS((varStruct.zMean + (varStruct.yMean * varStruct.yzCorrelation) + (varStruct.xMean * varStruct.xzCorrelation))) * VARIANCE_SCALE;
}

inline float kalman_process(kalman_t* kalmanState, volatile float input, volatile float accReading) {
Expand Down

0 comments on commit 6a03953

Please sign in to comment.