aboutsummaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorjgoppert <james.goppert@gmail.com>2013-03-18 16:18:58 -0400
committerjgoppert <james.goppert@gmail.com>2013-03-18 16:18:58 -0400
commit9c9873bcc112a604d6c43888bf121b27d101317b (patch)
tree6544fc02d1fed146f3708cee85b4cf92e00b92ef /apps/examples
parent90f9b154eb895aaf321819b00948653b0de5d407 (diff)
downloadpx4-firmware-9c9873bcc112a604d6c43888bf121b27d101317b.tar.gz
px4-firmware-9c9873bcc112a604d6c43888bf121b27d101317b.tar.bz2
px4-firmware-9c9873bcc112a604d6c43888bf121b27d101317b.zip
Fixed PID roc2Thr param names/ added them to controldemo.
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/control_demo/params.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/examples/control_demo/params.c b/apps/examples/control_demo/params.c
index 8db61d4d4..527709629 100644
--- a/apps/examples/control_demo/params.c
+++ b/apps/examples/control_demo/params.c
@@ -58,7 +58,14 @@ PARAM_DEFINE_FLOAT(FWB_V_MAX, 16.0f); // maximum commanded velocity
// rate of climb
// this is what rate of climb is commanded (in m/s)
-// when the throttle stick is fully defelcted in simple mode
+// when the pitch stick is fully defelcted in simple mode
PARAM_DEFINE_FLOAT(FWB_ROC_MAX, 1.0f);
+// rate of climb -> thr
+PARAM_DEFINE_FLOAT(FWB_ROC2THR_P, 0.01f); // altitude to throttle PID
+PARAM_DEFINE_FLOAT(FWB_ROC2THR_I, 0.0f);
+PARAM_DEFINE_FLOAT(FWB_ROC2THR_D, 0.0f);
+PARAM_DEFINE_FLOAT(FWB_ROC2THR_D_LP, 0.0f);
+PARAM_DEFINE_FLOAT(FWB_ROC2THR_I_MAX, 0.0f);
+
PARAM_DEFINE_FLOAT(FWB_TRIM_THR, 0.8f); // trim throttle (0,1)