diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
| commit | 20728e83f5acc52c5b96d6bdb93767375562dbe2 (patch) | |
| tree | 03ec8ac1215ecbfcee8dbffacd351fcb781d96c8 /src/modules/fw_pos_control_l1 | |
| parent | 53b3498db440f8ecf8779ce7f3df55351c84852f (diff) | |
| parent | 2d4fc9eea1d693bafeeacc1e929d1906418ee3b0 (diff) | |
| download | px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.gz px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.bz2 px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fw_autoland
Diffstat (limited to 'src/modules/fw_pos_control_l1')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 5 | ||||
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index 219c6ffa6..14dcc085c 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -192,6 +192,7 @@ private: float pitch_limit_min; float pitch_limit_max; + float roll_limit; float throttle_min; float throttle_max; float throttle_cruise; @@ -225,6 +226,7 @@ private: param_t pitch_limit_min; param_t pitch_limit_max; + param_t roll_limit; param_t throttle_min; param_t throttle_max; param_t throttle_cruise; @@ -343,6 +345,7 @@ FixedwingPositionControl::FixedwingPositionControl() : _parameter_handles.pitch_limit_min = param_find("FW_P_LIM_MIN"); _parameter_handles.pitch_limit_max = param_find("FW_P_LIM_MAX"); + _parameter_handles.roll_limit = param_find("FW_R_LIM"); _parameter_handles.throttle_min = param_find("FW_THR_MIN"); _parameter_handles.throttle_max = param_find("FW_THR_MAX"); _parameter_handles.throttle_cruise = param_find("FW_THR_CRUISE"); @@ -405,6 +408,7 @@ FixedwingPositionControl::parameters_update() param_get(_parameter_handles.pitch_limit_min, &(_parameters.pitch_limit_min)); param_get(_parameter_handles.pitch_limit_max, &(_parameters.pitch_limit_max)); + param_get(_parameter_handles.roll_limit, &(_parameters.roll_limit)); param_get(_parameter_handles.throttle_min, &(_parameters.throttle_min)); param_get(_parameter_handles.throttle_max, &(_parameters.throttle_max)); param_get(_parameter_handles.throttle_cruise, &(_parameters.throttle_cruise)); @@ -426,6 +430,7 @@ FixedwingPositionControl::parameters_update() _l1_control.set_l1_damping(_parameters.l1_damping); _l1_control.set_l1_period(_parameters.l1_period); + _l1_control.set_l1_roll_limit(math::radians(_parameters.roll_limit)); _tecs.set_time_const(_parameters.time_const); _tecs.set_min_sink_rate(_parameters.min_sink_rate); diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c b/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c index c39df9ae3..3bb872405 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c @@ -67,6 +67,9 @@ PARAM_DEFINE_FLOAT(FW_P_LIM_MIN, -45.0f); PARAM_DEFINE_FLOAT(FW_P_LIM_MAX, 45.0f); +PARAM_DEFINE_FLOAT(FW_R_LIM, 45.0f); + + PARAM_DEFINE_FLOAT(FW_THR_MIN, 0.0f); |