aboutsummaryrefslogtreecommitdiff
path: root/src/lib/ecl/attitude_fw
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-28 11:14:22 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-28 11:14:22 +0200
commitd0c59ffe54dfffdef750684f5d8de09b83135862 (patch)
treedd47adb62576ca639823753fd7ffc4638421b709 /src/lib/ecl/attitude_fw
parent0104f070c6f469df6acdb308ae54638e017813c0 (diff)
downloadpx4-firmware-d0c59ffe54dfffdef750684f5d8de09b83135862.tar.gz
px4-firmware-d0c59ffe54dfffdef750684f5d8de09b83135862.tar.bz2
px4-firmware-d0c59ffe54dfffdef750684f5d8de09b83135862.zip
First stab at actual controller
Diffstat (limited to 'src/lib/ecl/attitude_fw')
-rw-r--r--src/lib/ecl/attitude_fw/ecl_roll_controller.cpp11
-rw-r--r--src/lib/ecl/attitude_fw/ecl_roll_controller.h4
2 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
index 2f8129e82..b28ecdabe 100644
--- a/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
+++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
@@ -37,10 +37,12 @@
*
*/
+#include "../ecl.h"
#include "ecl_roll_controller.h"
ECL_RollController::ECL_RollController() :
_last_run(0),
+ _tc(0.1f),
_last_output(0.0f),
_integrator(0.0f),
_rate_error(0.0f),
@@ -52,6 +54,15 @@ ECL_RollController::ECL_RollController() :
float ECL_RollController::control(float roll_setpoint, float roll, float roll_rate,
float scaler, bool lock_integrator, float airspeed_min, float airspeed_max, float aspeed)
{
+ /* get the usual dt estimate */
+ uint64_t dt_micros = ecl_elapsed_time(&_last_run);
+ _last_run = ecl_absolute_time();
+
+ float dt = (dt_micros > 500000) ? 0.0f : dt_micros / 1000000;
+
+
+
+
return 0.0f;
}
diff --git a/src/lib/ecl/attitude_fw/ecl_roll_controller.h b/src/lib/ecl/attitude_fw/ecl_roll_controller.h
index d2b796131..bba9ae163 100644
--- a/src/lib/ecl/attitude_fw/ecl_roll_controller.h
+++ b/src/lib/ecl/attitude_fw/ecl_roll_controller.h
@@ -54,7 +54,9 @@ public:
void reset_integrator();
void set_time_constant(float time_constant) {
- _tc = time_constant;
+ if (time_constant > 0.1f && time_constant < 3.0f) {
+ _tc = time_constant;
+ }
}
void set_k_p(float k_p) {
_k_p = k_p;