diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-04 13:15:23 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-15 10:13:49 +0100 |
| commit | d2940462455652add86e454be3376f2c23b822bb (patch) | |
| tree | f2b1a3dfc47fa5ab5a8d8498ffc228f829c8d6b2 | |
| parent | 53ffde30c257a00f4760e93cfb3b02bac085f682 (diff) | |
| download | px4-firmware-d2940462455652add86e454be3376f2c23b822bb.tar.gz px4-firmware-d2940462455652add86e454be3376f2c23b822bb.tar.bz2 px4-firmware-d2940462455652add86e454be3376f2c23b822bb.zip | |
fw yaw: add enum for method selection
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp | 17 | ||||
| -rw-r--r-- | src/lib/ecl/attitude_fw/ecl_yaw_controller.h | 13 |
2 files changed, 26 insertions, 4 deletions
diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp index 9c386a3e8..f85c622e4 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp @@ -61,8 +61,10 @@ ECL_YawController::~ECL_YawController() float ECL_YawController::control_attitude(const struct ECL_ControlData &ctl_data) { switch (_coordinated_method) { - case 0: + case COORD_METHOD_OPEN: return control_attitude_impl_openloop(ctl_data); + case COORD_METHOD_CLOSEACC: + return control_attitude_impl_accclosedloop(ctl_data); default: static hrt_abstime last_print = 0; if (hrt_elapsed_time(&last_print) > 5e6) { @@ -76,7 +78,8 @@ float ECL_YawController::control_attitude(const struct ECL_ControlData &ctl_data float ECL_YawController::control_bodyrate(const struct ECL_ControlData &ctl_data) { switch (_coordinated_method) { - case 0: + case COORD_METHOD_OPEN: + case COORD_METHOD_CLOSEACC: return control_bodyrate_impl(ctl_data); default: static hrt_abstime last_print = 0; @@ -176,6 +179,11 @@ float ECL_YawController::control_bodyrate_impl(const struct ECL_ControlData &ctl _bodyrate_setpoint = -sinf(ctl_data.roll) * ctl_data.pitch_rate_setpoint + cosf(ctl_data.roll)*cosf(ctl_data.pitch) * _rate_setpoint; + /* Close the acceleration loop if _coordinated_method wants this: change body_rate setpoint */ + if (_coordinated_method == COORD_METHOD_CLOSEACC) { + //XXX + } + /* Transform estimation to body angular rates (jacobian) */ float yaw_bodyrate = -sinf(ctl_data.roll) * ctl_data.pitch_rate + cosf(ctl_data.roll)*cosf(ctl_data.pitch) * ctl_data.yaw_rate; @@ -212,3 +220,8 @@ float ECL_YawController::control_bodyrate_impl(const struct ECL_ControlData &ctl return math::constrain(_last_output, -1.0f, 1.0f); } + +float ECL_YawController::control_attitude_impl_accclosedloop(const struct ECL_ControlData &ctl_data) { + /* dont set a rate setpoint */ + return 0.0f; +} diff --git a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h index ab7dce2b1..b108ad98d 100644 --- a/src/lib/ecl/attitude_fw/ecl_yaw_controller.h +++ b/src/lib/ecl/attitude_fw/ecl_yaw_controller.h @@ -76,11 +76,20 @@ public: protected: float _coordinated_min_speed; - int32_t _coordinated_method;; - float control_attitude_impl_openloop(const struct ECL_ControlData &ctl_data); + enum { + COORD_METHOD_OPEN = 0, + COORD_METHOD_CLOSEACC = 1, + }; + + int32_t _coordinated_method; + float control_bodyrate_impl(const struct ECL_ControlData &ctl_data); + float control_attitude_impl_openloop(const struct ECL_ControlData &ctl_data); + + float control_attitude_impl_accclosedloop(const struct ECL_ControlData &ctl_data); + }; #endif // ECL_YAW_CONTROLLER_H |