diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-30 00:25:26 +0400 |
| commit | d2553bfd2930eb02664d564559fa361b80c63f61 (patch) | |
| tree | 21cda568519c33a261edaaa9c370cc9ba9c7f466 /src/modules/fixedwing_backside/fixedwing.cpp | |
| parent | 0789189c0588ebebd24a523f9639411be89c6a9b (diff) | |
| parent | 9b1de5004c673ebe8bdf68f1b518565cccd6b05b (diff) | |
| download | px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.gz px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.tar.bz2 px4-firmware-d2553bfd2930eb02664d564559fa361b80c63f61.zip | |
Merge branch 'master' into offboard2
Diffstat (limited to 'src/modules/fixedwing_backside/fixedwing.cpp')
| -rw-r--r-- | src/modules/fixedwing_backside/fixedwing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/fixedwing_backside/fixedwing.cpp b/src/modules/fixedwing_backside/fixedwing.cpp index f7c0b6148..cfae07275 100644 --- a/src/modules/fixedwing_backside/fixedwing.cpp +++ b/src/modules/fixedwing_backside/fixedwing.cpp @@ -175,14 +175,14 @@ void BlockMultiModeBacksideAutopilot::update() // the min/max velocity float v = _vLimit.update(sqrtf( _pos.vel_n * _pos.vel_n + - _pos.vy * _pos.vy + + _pos.vel_e * _pos.vel_e + _pos.vel_d * _pos.vel_d)); // limit velocity command between min/max velocity float vCmd = _vLimit.update(_vCmd.get()); // altitude hold - float dThrottle = _h2Thr.update(_missionCmd.current.altitude - _pos.alt); + float dThrottle = _h2Thr.update(_missionCmd.current.alt - _pos.alt); // heading hold float psiError = _wrap_pi(_guide.getPsiCmd() - _att.yaw); @@ -237,7 +237,7 @@ void BlockMultiModeBacksideAutopilot::update() // the min/max velocity float v = _vLimit.update(sqrtf( _pos.vel_n * _pos.vel_n + - _pos.vy * _pos.vy + + _pos.vel_e * _pos.vel_e + _pos.vel_d * _pos.vel_d)); // pitch channel -> rate of climb |