Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 12:57:27 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

[ahrs] Integer rate integration fix

Browse Source
This commit is contained in:
Ewoud Smeur
2014-07-31 20:22:30 +02:00
parent 77000c097c
commit b050bda005
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/math/pprz_algebra_int.h
+16 -16
View File
@@ -101,10 +101,10 @@ struct Int32Quat {
struct Int64Quat { struct Int64Quat {
int32_t qi; int64_t qi;
int32_t qx; int64_t qx;
int32_t qy; int64_t qy;
int32_t qz; int64_t qz;
}; };
@@ -605,25 +605,25 @@ struct Int64Vect3 {
/** in place quaternion first order integration with constant rotational velocity. */ /** in place quaternion first order integration with constant rotational velocity. */
#define INT32_QUAT_INTEGRATE_FI(_q, _hr, _omega, _f) { \ #define INT32_QUAT_INTEGRATE_FI(_q, _hr, _omega, _f) { \
_hr.qi += -_omega.p*_q.qx - _omega.q*_q.qy - _omega.r*_q.qz; \ _hr.qi += - ((int64_t) _omega.p)*_q.qx - ((int64_t) _omega.q)*_q.qy - ((int64_t) _omega.r)*_q.qz; \
_hr.qx += _omega.p*_q.qi + _omega.r*_q.qy - _omega.q*_q.qz; \ _hr.qx += ((int64_t) _omega.p)*_q.qi + ((int64_t) _omega.r)*_q.qy - ((int64_t) _omega.q)*_q.qz; \
_hr.qy += _omega.q*_q.qi - _omega.r*_q.qx + _omega.p*_q.qz; \ _hr.qy += ((int64_t) _omega.q)*_q.qi - ((int64_t) _omega.r)*_q.qx + ((int64_t) _omega.p)*_q.qz; \
_hr.qz += _omega.r*_q.qi + _omega.q*_q.qx - _omega.p*_q.qy; \ _hr.qz += ((int64_t) _omega.r)*_q.qi + ((int64_t) _omega.q)*_q.qx - ((int64_t) _omega.p)*_q.qy; \
\ \
ldiv_t _div = ldiv(_hr.qi, ((1<<INT32_RATE_FRAC)*_f*2)); \ lldiv_t _div = lldiv(_hr.qi, ((1<<INT32_RATE_FRAC)*_f*2)); \
_q.qi+= _div.quot; \ _q.qi+= (int32_t) _div.quot; \
_hr.qi = _div.rem; \ _hr.qi = _div.rem; \
\ \
_div = ldiv(_hr.qx, ((1<<INT32_RATE_FRAC)*_f*2)); \ _div = lldiv(_hr.qx, ((1<<INT32_RATE_FRAC)*_f*2)); \
_q.qx+= _div.quot; \ _q.qx+= (int32_t) _div.quot; \
_hr.qx = _div.rem; \ _hr.qx = _div.rem; \
\ \
_div = ldiv(_hr.qy, ((1<<INT32_RATE_FRAC)*_f*2)); \ _div = lldiv(_hr.qy, ((1<<INT32_RATE_FRAC)*_f*2)); \
_q.qy+= _div.quot; \ _q.qy+= (int32_t) _div.quot; \
_hr.qy = _div.rem; \ _hr.qy = _div.rem; \
\ \
_div = ldiv(_hr.qz, ((1<<INT32_RATE_FRAC)*_f*2)); \ _div = lldiv(_hr.qz, ((1<<INT32_RATE_FRAC)*_f*2)); \
_q.qz+= _div.quot; \ _q.qz+= (int32_t) _div.quot; \
_hr.qz = _div.rem; \ _hr.qz = _div.rem; \
\ \
} }