aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mc_pos_control_multiplatform/mc_pos_control.h
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-02-22 13:02:22 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-02-24 20:33:32 +0100
commita56c16dfab948517007ad570d67f02dd4e2edb60 (patch)
tree724c2534edbbaba37271a3edc63248baa558fe9d /src/modules/mc_pos_control_multiplatform/mc_pos_control.h
parentf1c6b24f7a80f88baf272bc0b947f7e9649bee27 (diff)
downloadpx4-firmware-a56c16dfab948517007ad570d67f02dd4e2edb60.tar.gz
px4-firmware-a56c16dfab948517007ad570d67f02dd4e2edb60.tar.bz2
px4-firmware-a56c16dfab948517007ad570d67f02dd4e2edb60.zip
multiplatform port of #1741: move params from att control to pos control
Diffstat (limited to 'src/modules/mc_pos_control_multiplatform/mc_pos_control.h')
-rw-r--r--src/modules/mc_pos_control_multiplatform/mc_pos_control.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/mc_pos_control_multiplatform/mc_pos_control.h b/src/modules/mc_pos_control_multiplatform/mc_pos_control.h
index b754ccf01..59b663b9f 100644
--- a/src/modules/mc_pos_control_multiplatform/mc_pos_control.h
+++ b/src/modules/mc_pos_control_multiplatform/mc_pos_control.h
@@ -126,6 +126,9 @@ protected:
px4::ParameterFloat tilt_max_air;
px4::ParameterFloat land_speed;
px4::ParameterFloat tilt_max_land;
+ px4::ParameterFloat man_roll_max;
+ px4::ParameterFloat man_pitch_max;
+ px4::ParameterFloat man_yaw_max;
} _params_handles; /**< handles for interesting parameters */
struct {
@@ -134,6 +137,9 @@ protected:
float tilt_max_air;
float land_speed;
float tilt_max_land;
+ float man_roll_max;
+ float man_pitch_max;
+ float man_yaw_max;
math::Vector<3> pos_p;
math::Vector<3> vel_p;