diff --git a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml index 1c5b759d6f..ebe980a382 100644 --- a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml +++ b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml @@ -202,7 +202,7 @@ - + diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml b/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml index 13b7bccc09..9441cd47f3 100644 --- a/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml +++ b/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml @@ -166,7 +166,7 @@ on - + diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml index 02293fe8a0..a556e7b5cf 100644 --- a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml +++ b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml @@ -187,7 +187,7 @@ - + diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml index 162e65e5b1..8fc35ef305 100644 --- a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml +++ b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml @@ -190,7 +190,7 @@ - + diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml index bd4bed638f..f6daae5b94 100644 --- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml +++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml @@ -177,7 +177,7 @@ - + diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml index e20c9f86d4..6db6cdb94c 100644 --- a/conf/airframes/flixr_discovery.xml +++ b/conf/airframes/flixr_discovery.xml @@ -326,7 +326,7 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation - + diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml index 27e69a994a..0121cf31da 100644 --- a/conf/airframes/mm/fixed-wing/drops.xml +++ b/conf/airframes/mm/fixed-wing/drops.xml @@ -182,7 +182,7 @@ - + diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml index 67547507be..ac73e64610 100644 --- a/conf/airframes/mm/fixed-wing/twinstarmm.xml +++ b/conf/airframes/mm/fixed-wing/twinstarmm.xml @@ -160,7 +160,7 @@ - + diff --git a/conf/airframes/mm/hangar/lila.xml b/conf/airframes/mm/hangar/lila.xml index 64f2aaa72e..ca5ffbff2a 100644 --- a/conf/airframes/mm/hangar/lila.xml +++ b/conf/airframes/mm/hangar/lila.xml @@ -148,7 +148,7 @@ - + diff --git a/conf/airframes/twinstar_example.xml b/conf/airframes/twinstar_example.xml index b66a3d4355..9d8e075d66 100644 --- a/conf/airframes/twinstar_example.xml +++ b/conf/airframes/twinstar_example.xml @@ -172,7 +172,7 @@ - + diff --git a/conf/settings/tuning.xml b/conf/settings/tuning.xml index 01e53fee9a..8a26c5cb11 100644 --- a/conf/settings/tuning.xml +++ b/conf/settings/tuning.xml @@ -35,7 +35,7 @@ - + diff --git a/conf/settings/tuning_ctl_adaptive.xml b/conf/settings/tuning_ctl_adaptive.xml index d15ca19cda..6cd59e02f6 100644 --- a/conf/settings/tuning_ctl_adaptive.xml +++ b/conf/settings/tuning_ctl_adaptive.xml @@ -11,7 +11,7 @@ - + diff --git a/conf/settings/tuning_ctl_new.xml b/conf/settings/tuning_ctl_new.xml index f49643ec8a..fdb2055bf9 100644 --- a/conf/settings/tuning_ctl_new.xml +++ b/conf/settings/tuning_ctl_new.xml @@ -11,7 +11,7 @@ - + diff --git a/conf/settings/tuning_infrared.xml b/conf/settings/tuning_infrared.xml index 1c6f27998d..d95b2320e4 100644 --- a/conf/settings/tuning_infrared.xml +++ b/conf/settings/tuning_infrared.xml @@ -50,7 +50,7 @@ - + diff --git a/conf/settings/tuning_loiter.xml b/conf/settings/tuning_loiter.xml index 360b81f8e9..eddd1b4900 100644 --- a/conf/settings/tuning_loiter.xml +++ b/conf/settings/tuning_loiter.xml @@ -49,7 +49,7 @@ - + diff --git a/conf/settings/tuning_pers.xml b/conf/settings/tuning_pers.xml index fb328ba364..16d47ce176 100644 --- a/conf/settings/tuning_pers.xml +++ b/conf/settings/tuning_pers.xml @@ -50,7 +50,7 @@ - + diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c index cf60c72dfa..c8e2ce8cb0 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c @@ -171,7 +171,7 @@ void h_ctl_init( void ) { h_ctl_pitch_setpoint = 0.; h_ctl_pitch_loop_setpoint = 0.; h_ctl_pitch_pgain = ABS(H_CTL_PITCH_PGAIN); - h_ctl_pitch_dgain = H_CTL_PITCH_DGAIN; + h_ctl_pitch_dgain = ABS(H_CTL_PITCH_DGAIN); h_ctl_pitch_igain = H_CTL_PITCH_IGAIN; h_ctl_pitch_sum_err = 0.; h_ctl_pitch_Kffa = H_CTL_PITCH_KFFA; @@ -416,7 +416,7 @@ inline static void h_ctl_pitch_loop( void ) { float cmd = h_ctl_pitch_Kffa * h_ctl_ref_pitch_accel + h_ctl_pitch_Kffd * h_ctl_ref_pitch_rate - h_ctl_pitch_pgain * err - + h_ctl_pitch_dgain * d_err + - h_ctl_pitch_dgain * d_err + h_ctl_pitch_igain * h_ctl_pitch_sum_err; cmd /= airspeed_ratio2; diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c index 19e354528b..0da264bbf5 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c @@ -141,7 +141,7 @@ void h_ctl_init( void ) { h_ctl_pitch_setpoint = 0.; h_ctl_pitch_loop_setpoint = 0.; h_ctl_pitch_pgain = ABS(H_CTL_PITCH_PGAIN); - h_ctl_pitch_dgain = H_CTL_PITCH_DGAIN; + h_ctl_pitch_dgain = ABS(H_CTL_PITCH_DGAIN); h_ctl_elevator_setpoint = 0; h_ctl_elevator_of_roll = H_CTL_ELEVATOR_OF_ROLL;