From 17772afdaabd446ba5b7ddccca1f8d4fed433d39 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Sat, 27 Oct 2012 19:43:03 +0200 Subject: [PATCH] fw control: fixed parameter reloading, disabled old fw control app --- apps/fixedwing_att_control/fixedwing_att_control_att.c | 2 +- apps/fixedwing_att_control/fixedwing_att_control_rate.c | 2 +- nuttx/configs/px4fmu/nsh/appconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/fixedwing_att_control/fixedwing_att_control_att.c b/apps/fixedwing_att_control/fixedwing_att_control_att.c index 9c784e98ed..c691c69388 100644 --- a/apps/fixedwing_att_control/fixedwing_att_control_att.c +++ b/apps/fixedwing_att_control/fixedwing_att_control_att.c @@ -121,7 +121,7 @@ int fixedwing_att_control_attitude(const struct vehicle_attitude_setpoint_s *att } /* load new parameters with lower rate */ - if (counter % 2500 == 0) { + if (counter % 100 == 0) { /* update parameters from storage */ parameters_update(&h, &p); } diff --git a/apps/fixedwing_att_control/fixedwing_att_control_rate.c b/apps/fixedwing_att_control/fixedwing_att_control_rate.c index 7c17e70f31..24dce199f8 100644 --- a/apps/fixedwing_att_control/fixedwing_att_control_rate.c +++ b/apps/fixedwing_att_control/fixedwing_att_control_rate.c @@ -170,7 +170,7 @@ int fixedwing_att_control_rates(const struct vehicle_rates_setpoint_s *rate_sp, } /* load new parameters with lower rate */ - if (counter % 2500 == 0) { + if (counter % 100 == 0) { /* update parameters from storage */ pid_set_parameters(&roll_rate_controller, p.rollrate_p, p.rollrate_i, 0, p.rollrate_awu, p.rollrate_lim); pid_set_parameters(&pitch_rate_controller, p.pitchrate_p, p.pitchrate_i, 0, p.pitchrate_awu, p.pitchrate_lim); diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 1b55746814..46df8a45df 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -76,7 +76,7 @@ CONFIGURED_APPS += sensors CONFIGURED_APPS += ardrone_interface CONFIGURED_APPS += multirotor_att_control CONFIGURED_APPS += multirotor_pos_control -CONFIGURED_APPS += fixedwing_control +#CONFIGURED_APPS += fixedwing_control CONFIGURED_APPS += fixedwing_att_control CONFIGURED_APPS += fixedwing_pos_control CONFIGURED_APPS += position_estimator