diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c index ec3afeeade..e8b990a02c 100644 --- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c +++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c @@ -48,6 +48,10 @@ float v_ctl_climb_setpoint; uint8_t v_ctl_climb_mode; uint8_t v_ctl_auto_throttle_submode; +#ifndef V_CTL_AUTO_THROTTLE_DGAIN +#define V_CTL_AUTO_THROTTLE_DGAIN 0. +#endif + /* "auto throttle" inner loop parameters */ float v_ctl_auto_throttle_cruise_throttle; float v_ctl_auto_throttle_nominal_cruise_throttle; @@ -126,7 +130,7 @@ void v_ctl_init( void ) { v_ctl_auto_throttle_climb_throttle_increment = V_CTL_AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT; v_ctl_auto_throttle_pgain = ABS(V_CTL_AUTO_THROTTLE_PGAIN); v_ctl_auto_throttle_igain = ABS(V_CTL_AUTO_THROTTLE_IGAIN); - v_ctl_auto_throttle_dgain = 0.; + v_ctl_auto_throttle_dgain = ABS(V_CTL_AUTO_THROTTLE_DGAIN); v_ctl_auto_throttle_sum_err = 0.; v_ctl_auto_throttle_pitch_of_vz_pgain = V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_PGAIN; v_ctl_auto_throttle_pitch_of_vz_dgain = V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_DGAIN; diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c index 9fec2eb886..86e3a5269d 100644 --- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c +++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c @@ -49,6 +49,10 @@ float v_ctl_climb_setpoint; uint8_t v_ctl_climb_mode; uint8_t v_ctl_auto_throttle_submode; +#ifndef V_CTL_AUTO_THROTTLE_DGAIN +#define V_CTL_AUTO_THROTTLE_DGAIN 0. +#endif + /* "auto throttle" inner loop parameters */ float v_ctl_auto_throttle_cruise_throttle; float v_ctl_auto_throttle_nominal_cruise_throttle; @@ -131,7 +135,7 @@ void v_ctl_init( void ) { v_ctl_auto_throttle_climb_throttle_increment = V_CTL_AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT; v_ctl_auto_throttle_pgain = ABS(V_CTL_AUTO_THROTTLE_PGAIN); v_ctl_auto_throttle_igain = ABS(V_CTL_AUTO_THROTTLE_IGAIN); - v_ctl_auto_throttle_dgain = 0.; + v_ctl_auto_throttle_dgain = ABS(V_CTL_AUTO_THROTTLE_DGAIN); v_ctl_auto_throttle_sum_err = 0.; v_ctl_auto_throttle_pitch_of_vz_pgain = V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_PGAIN; v_ctl_auto_throttle_pitch_of_vz_dgain = V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_DGAIN;