aboutsummaryrefslogtreecommitdiff
path: root/apps/controllib/fixedwing.hpp
diff options
context:
space:
mode:
authorJames Goppert <jgoppert@l1.(none)>2013-04-14 20:09:38 -0400
committerJames Goppert <james.goppert@gmail.com>2013-05-08 13:51:34 -0400
commit3ed93430060228b64893119a439187725d35d7ec (patch)
tree105b045030fe4d9cfe77278cf773ad39fb805011 /apps/controllib/fixedwing.hpp
parent078ae23cfa00e2128d08d87dc015a3ca116f342e (diff)
downloadpx4-firmware-3ed93430060228b64893119a439187725d35d7ec.tar.gz
px4-firmware-3ed93430060228b64893119a439187725d35d7ec.tar.bz2
px4-firmware-3ed93430060228b64893119a439187725d35d7ec.zip
HIL pressure fix.
Diffstat (limited to 'apps/controllib/fixedwing.hpp')
-rw-r--r--apps/controllib/fixedwing.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/controllib/fixedwing.hpp b/apps/controllib/fixedwing.hpp
index 281cbb4cb..4323beeb3 100644
--- a/apps/controllib/fixedwing.hpp
+++ b/apps/controllib/fixedwing.hpp
@@ -310,9 +310,9 @@ private:
BlockLimit _theLimit;
BlockLimit _vLimit;
- // altitude/ roc hold
+ // altitude/ climb rate hold
BlockPID _h2Thr;
- BlockPID _roc2Thr;
+ BlockPID _cr2Thr;
// guidance
BlockWaypointGuidance _guide;
@@ -323,7 +323,7 @@ private:
BlockParam<float> _trimRdr;
BlockParam<float> _trimThr;
BlockParam<float> _vCmd;
- BlockParam<float> _rocMax;
+ BlockParam<float> _crMax;
struct pollfd _attPoll;
vehicle_global_position_setpoint_s _lastPosCmd;