diff options
| author | Thomas Gubler <thomasgubler@student.ethz.ch> | 2013-10-31 13:33:52 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@student.ethz.ch> | 2013-10-31 13:33:52 +0100 |
| commit | cf862bf810f9c6e86f0b756b71e57796d523bdae (patch) | |
| tree | a6a51633c18c6c0b169adc0ab964ef4ec90059fd /src/lib | |
| parent | c20aee6327035ab8127bb0f030d0ac3af13e47ea (diff) | |
| parent | d944eeabf08620413c4d99c26de339fd6f6e7e8c (diff) | |
| download | px4-firmware-cf862bf810f9c6e86f0b756b71e57796d523bdae.tar.gz px4-firmware-cf862bf810f9c6e86f0b756b71e57796d523bdae.tar.bz2 px4-firmware-cf862bf810f9c6e86f0b756b71e57796d523bdae.zip | |
Merge branch 'tecs_experimental_prate' into fw_staging_ouputlimit_master_heightrate
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/external_lgpl/tecs/tecs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/external_lgpl/tecs/tecs.cpp b/src/lib/external_lgpl/tecs/tecs.cpp index baf893dd2..5cbc19dbb 100644 --- a/src/lib/external_lgpl/tecs/tecs.cpp +++ b/src/lib/external_lgpl/tecs/tecs.cpp @@ -228,7 +228,7 @@ void TECS::_update_height_demand(float demand, float state) // // printf("hgt_dem: %6.2f hgt_dem_adj: %6.2f hgt_dem_last: %6.2f hgt_rate_dem: %6.2f\n", _hgt_dem, _hgt_dem_adj, _hgt_dem_adj_last, // // _hgt_rate_dem); - _hgt_dem_adj = 0.05f * demand + 0.95f * _hgt_dem_adj_last; + _hgt_dem_adj = demand;//0.025f * demand + 0.975f * _hgt_dem_adj_last; _hgt_dem_adj_last = _hgt_dem_adj; _hgt_rate_dem = (_hgt_dem_adj-state)*0.1f; //xxx: parameter |