diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 14:56:13 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 14:56:13 +0200 |
| commit | b3fb2bf85042b8038dabcef770855145674743e9 (patch) | |
| tree | da01f6e2a83f55c306ad774630428f6e1bda73aa /src/modules/att_pos_estimator_ekf/KalmanNav.hpp | |
| parent | 5671df0af4e258ef0a83377cdbd50e59734aa00b (diff) | |
| parent | 0cadc5d14a7d3186902fc6d04cd97d55e213db6a (diff) | |
| download | px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.tar.gz px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.tar.bz2 px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.zip | |
Merge branch 'master' of github.com:PX4/Firmware into mixer_testing
Diffstat (limited to 'src/modules/att_pos_estimator_ekf/KalmanNav.hpp')
| -rw-r--r-- | src/modules/att_pos_estimator_ekf/KalmanNav.hpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/att_pos_estimator_ekf/KalmanNav.hpp b/src/modules/att_pos_estimator_ekf/KalmanNav.hpp index f01ee0355..799fc2fb9 100644 --- a/src/modules/att_pos_estimator_ekf/KalmanNav.hpp +++ b/src/modules/att_pos_estimator_ekf/KalmanNav.hpp @@ -166,19 +166,19 @@ protected: double lat, lon; /**< lat, lon radians */ float alt; /**< altitude, meters */ // parameters - control::BlockParam<float> _vGyro; /**< gyro process noise */ - control::BlockParam<float> _vAccel; /**< accelerometer process noise */ - control::BlockParam<float> _rMag; /**< magnetometer measurement noise */ - control::BlockParam<float> _rGpsVel; /**< gps velocity measurement noise */ - control::BlockParam<float> _rGpsPos; /**< gps position measurement noise */ - control::BlockParam<float> _rGpsAlt; /**< gps altitude measurement noise */ - control::BlockParam<float> _rPressAlt; /**< press altitude measurement noise */ - control::BlockParam<float> _rAccel; /**< accelerometer measurement noise */ - control::BlockParam<float> _magDip; /**< magnetic inclination with level */ - control::BlockParam<float> _magDec; /**< magnetic declination, clockwise rotation */ - control::BlockParam<float> _g; /**< gravitational constant */ - control::BlockParam<float> _faultPos; /**< fault detection threshold for position */ - control::BlockParam<float> _faultAtt; /**< fault detection threshold for attitude */ + control::BlockParamFloat _vGyro; /**< gyro process noise */ + control::BlockParamFloat _vAccel; /**< accelerometer process noise */ + control::BlockParamFloat _rMag; /**< magnetometer measurement noise */ + control::BlockParamFloat _rGpsVel; /**< gps velocity measurement noise */ + control::BlockParamFloat _rGpsPos; /**< gps position measurement noise */ + control::BlockParamFloat _rGpsAlt; /**< gps altitude measurement noise */ + control::BlockParamFloat _rPressAlt; /**< press altitude measurement noise */ + control::BlockParamFloat _rAccel; /**< accelerometer measurement noise */ + control::BlockParamFloat _magDip; /**< magnetic inclination with level */ + control::BlockParamFloat _magDec; /**< magnetic declination, clockwise rotation */ + control::BlockParamFloat _g; /**< gravitational constant */ + control::BlockParamFloat _faultPos; /**< fault detection threshold for position */ + control::BlockParamFloat _faultAtt; /**< fault detection threshold for attitude */ // status bool _attitudeInitialized; bool _positionInitialized; |