Merge branch 'master' into dataman_state_nav_rewrite

1 files changed, 8 insertions, 8 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();
 }