diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-24 23:49:36 +0400 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-24 23:49:36 +0400 |
commit | 9ffc70de405fb3e85e6367c4e875747315472aae (patch) | |
tree | 344065f98e2471b96938e57b073874b5cadc10fd /src/lib/external_lgpl/tecs/tecs.h | |
parent | d8fdade6aba5e0bd2b56c206d09da4a92fda5fa0 (diff) | |
parent | 926c4701c71fb2689025decbc454d14c6df85e76 (diff) | |
download | px4-firmware-9ffc70de405fb3e85e6367c4e875747315472aae.tar.gz px4-firmware-9ffc70de405fb3e85e6367c4e875747315472aae.tar.bz2 px4-firmware-9ffc70de405fb3e85e6367c4e875747315472aae.zip |
Merge branch 'beta_mavlink' into beta_mavlink2
Diffstat (limited to 'src/lib/external_lgpl/tecs/tecs.h')
-rw-r--r-- | src/lib/external_lgpl/tecs/tecs.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/external_lgpl/tecs/tecs.h b/src/lib/external_lgpl/tecs/tecs.h index d1ebacda1..5cafb1c79 100644 --- a/src/lib/external_lgpl/tecs/tecs.h +++ b/src/lib/external_lgpl/tecs/tecs.h @@ -28,16 +28,7 @@ class __EXPORT TECS { public: TECS() : - - _airspeed_enabled(false), - _throttle_slewrate(0.0f), - _climbOutDem(false), - _hgt_dem_prev(0.0f), - _hgt_dem_adj_last(0.0f), - _hgt_dem_in_old(0.0f), - _TAS_dem_last(0.0f), - _TAS_dem_adj(0.0f), - _TAS_dem(0.0f), + _pitch_dem(0.0f), _integ1_state(0.0f), _integ2_state(0.0f), _integ3_state(0.0f), @@ -45,8 +36,16 @@ public: _integ5_state(0.0f), _integ6_state(0.0f), _integ7_state(0.0f), - _pitch_dem(0.0f), _last_pitch_dem(0.0f), + _vel_dot(0.0f), + _TAS_dem(0.0f), + _TAS_dem_last(0.0f), + _hgt_dem_in_old(0.0f), + _hgt_dem_adj_last(0.0f), + _hgt_dem_prev(0.0f), + _TAS_dem_adj(0.0f), + _STEdotErrLast(0.0f), + _climbOutDem(false), _SPE_dem(0.0f), _SKE_dem(0.0f), _SPEdot_dem(0.0f), @@ -55,9 +54,9 @@ public: _SKE_est(0.0f), _SPEdot(0.0f), _SKEdot(0.0f), - _vel_dot(0.0f), - _STEdotErrLast(0.0f) { - + _airspeed_enabled(false), + _throttle_slewrate(0.0f) + { } bool airspeed_sensor_enabled() { |