diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-06 21:53:51 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-06 21:53:51 +0100 |
commit | b086bdf21ef593331da8c48cc21468ff823cdc01 (patch) | |
tree | 85bf8eb5d3c2c62a2252f5d6a4ebe7bf982daaf5 /src/lib/external_lgpl/tecs/tecs.h | |
parent | f2b46389ee8c8e9dd73ad9ac1fc8170c759e8b1c (diff) | |
parent | 320745003783c6306996a1e6339ec91bfefcc7d0 (diff) | |
download | px4-firmware-b086bdf21ef593331da8c48cc21468ff823cdc01.tar.gz px4-firmware-b086bdf21ef593331da8c48cc21468ff823cdc01.tar.bz2 px4-firmware-b086bdf21ef593331da8c48cc21468ff823cdc01.zip |
Merge remote-tracking branch 'upstream/master' into launchdetector
Conflicts:
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
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() { |