diff options
| author | Johan Jansen <jnsn.johan@gmail.com> | 2015-02-05 13:18:32 +0100 |
|---|---|---|
| committer | Johan Jansen <jnsn.johan@gmail.com> | 2015-02-11 13:38:59 +0100 |
| commit | 7287dc3c4ccd92b8bfb1f6d990d42c661d9f4b96 (patch) | |
| tree | 355a15ca82dc38941ab91470d50c7c2ea15f2c10 /src/modules/ekf_att_pos_estimator/estimator_22states.h | |
| parent | 022208e998ec6c1594b7493c35d15d5358587d86 (diff) | |
| download | px4-firmware-7287dc3c4ccd92b8bfb1f6d990d42c661d9f4b96.tar.gz px4-firmware-7287dc3c4ccd92b8bfb1f6d990d42c661d9f4b96.tar.bz2 px4-firmware-7287dc3c4ccd92b8bfb1f6d990d42c661d9f4b96.zip | |
AttPosEKF: Replace custom min/max functions with c++ standard
Diffstat (limited to 'src/modules/ekf_att_pos_estimator/estimator_22states.h')
| -rw-r--r-- | src/modules/ekf_att_pos_estimator/estimator_22states.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/modules/ekf_att_pos_estimator/estimator_22states.h b/src/modules/ekf_att_pos_estimator/estimator_22states.h index 221a17ba7..de21a75ca 100644 --- a/src/modules/ekf_att_pos_estimator/estimator_22states.h +++ b/src/modules/ekf_att_pos_estimator/estimator_22states.h @@ -274,11 +274,7 @@ public: static void quat2Tnb(Mat3f &Tnb, const float (&quat)[4]); - static float sq(float valIn); - - static float maxf(float valIn1, float valIn2); - - static float min(float valIn1, float valIn2); + static inline float sq(float valIn) {return valIn * valIn;} void OnGroundCheck(); |