diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-02 00:33:36 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-02 00:33:36 +0200 |
commit | a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c (patch) | |
tree | 74065b07dc620e8e22751563d548a140b17966e4 /src/modules/fw_pos_control_l1 | |
parent | 43b9d96cf4306bc472d16956f5437dbef7c630c0 (diff) | |
parent | 4cd66a3242aa2dfb03a3e58ffcc8d27e1350b7ac (diff) | |
download | px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.tar.gz px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.tar.bz2 px4-firmware-a9fd5ed90ad67a8081aec3dd3c05034c3d64f81c.zip |
Merged master to gnss_rework
Diffstat (limited to 'src/modules/fw_pos_control_l1')
-rw-r--r-- | src/modules/fw_pos_control_l1/landingslope.cpp | 16 | ||||
-rw-r--r-- | src/modules/fw_pos_control_l1/landingslope.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/fw_pos_control_l1/landingslope.cpp b/src/modules/fw_pos_control_l1/landingslope.cpp index 8ce465fe8..42e00da05 100644 --- a/src/modules/fw_pos_control_l1/landingslope.cpp +++ b/src/modules/fw_pos_control_l1/landingslope.cpp @@ -46,16 +46,16 @@ #include <unistd.h> #include <mathlib/mathlib.h> -void Landingslope::update(float landing_slope_angle_rad, - float flare_relative_alt, - float motor_lim_relative_alt, - float H1_virt) +void Landingslope::update(float landing_slope_angle_rad_new, + float flare_relative_alt_new, + float motor_lim_relative_alt_new, + float H1_virt_new) { - _landing_slope_angle_rad = landing_slope_angle_rad; - _flare_relative_alt = flare_relative_alt; - _motor_lim_relative_alt = motor_lim_relative_alt; - _H1_virt = H1_virt; + _landing_slope_angle_rad = landing_slope_angle_rad_new; + _flare_relative_alt = flare_relative_alt_new; + _motor_lim_relative_alt = motor_lim_relative_alt_new; + _H1_virt = H1_virt_new; calculateSlopeValues(); } diff --git a/src/modules/fw_pos_control_l1/landingslope.h b/src/modules/fw_pos_control_l1/landingslope.h index b54fd501c..a5975ad43 100644 --- a/src/modules/fw_pos_control_l1/landingslope.h +++ b/src/modules/fw_pos_control_l1/landingslope.h @@ -123,10 +123,10 @@ public: float getFlareCurveAbsoluteAltitudeSave(float wp_distance, float bearing_lastwp_currwp, float bearing_airplane_currwp, float wp_altitude); - void update(float landing_slope_angle_rad, - float flare_relative_alt, - float motor_lim_relative_alt, - float H1_virt); + void update(float landing_slope_angle_rad_new, + float flare_relative_alt_new, + float motor_lim_relative_alt_new, + float H1_virt_new); inline float landing_slope_angle_rad() {return _landing_slope_angle_rad;} |