diff options
author | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
---|---|---|
committer | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
commit | 137564b4a6b78c82a4c38ebd02782c531f259c19 (patch) | |
tree | d83e97fca1c3a8e052cf957e6a12b44dc1d8dafa /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | |
parent | 7724e3d889eecd6733c6e85341a9f0b97faa37cf (diff) | |
parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
download | px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.gz px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.bz2 px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.zip |
Merge master with the exception of ubx.cpp and ubx.h
Diffstat (limited to 'src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp')
-rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 6 |
1 files changed, 0 insertions, 6 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 5b877cd77..116d3cc63 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 @@ -232,8 +232,6 @@ private: float throttle_land_max; - float loiter_hold_radius; - float heightrate_p; float speedrate_p; @@ -277,8 +275,6 @@ private: param_t throttle_land_max; - param_t loiter_hold_radius; - param_t heightrate_p; param_t speedrate_p; @@ -441,7 +437,6 @@ FixedwingPositionControl::FixedwingPositionControl() : _parameter_handles.l1_period = param_find("FW_L1_PERIOD"); _parameter_handles.l1_damping = param_find("FW_L1_DAMPING"); - _parameter_handles.loiter_hold_radius = param_find("FW_LOITER_R"); _parameter_handles.airspeed_min = param_find("FW_AIRSPD_MIN"); _parameter_handles.airspeed_trim = param_find("FW_AIRSPD_TRIM"); @@ -513,7 +508,6 @@ FixedwingPositionControl::parameters_update() /* L1 control parameters */ param_get(_parameter_handles.l1_damping, &(_parameters.l1_damping)); param_get(_parameter_handles.l1_period, &(_parameters.l1_period)); - param_get(_parameter_handles.loiter_hold_radius, &(_parameters.loiter_hold_radius)); param_get(_parameter_handles.airspeed_min, &(_parameters.airspeed_min)); param_get(_parameter_handles.airspeed_trim, &(_parameters.airspeed_trim)); |