[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6356] fix some more fixedwing control settings afte
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6356] fix some more fixedwing control settings after rename |
|
Date: |
Fri, 05 Nov 2010 16:24:18 +0000 |
Revision: 6356
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6356
Author: flixr
Date: 2010-11-05 16:24:18 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
fix some more fixedwing control settings after rename
Modified Paths:
--------------
paparazzi3/trunk/conf/settings/fw_ctl_n.xml
paparazzi3/trunk/conf/settings/fw_h_ctl_a_settings.xml
paparazzi3/trunk/conf/settings/tune_agr_climb.xml
paparazzi3/trunk/conf/settings/tuning.xml
paparazzi3/trunk/conf/settings/tuningJH.xml
paparazzi3/trunk/conf/settings/tuning_ins.xml
paparazzi3/trunk/conf/settings/tuning_tp_auto.xml
Modified: paparazzi3/trunk/conf/settings/fw_ctl_n.xml
===================================================================
--- paparazzi3/trunk/conf/settings/fw_ctl_n.xml 2010-11-05 16:24:10 UTC (rev
6355)
+++ paparazzi3/trunk/conf/settings/fw_ctl_n.xml 2010-11-05 16:24:18 UTC (rev
6356)
@@ -11,7 +11,7 @@
<dl_setting MAX="0" MIN="-15000" STEP="250" VAR="h_ctl_roll_rate_gain"
shortname="roll_dgain" param="H_CTL_ROLL_RATE_GAIN"/>
<dl_setting MAX="0" MIN="-55000" STEP="250" VAR="h_ctl_pitch_pgain"
shortname="pitch_pgain" param="H_CTL_PITCH_PGAIN"/>
<dl_setting MAX="0" MIN="-55000" STEP="250" VAR="h_ctl_pitch_dgain"
shortname="pitch_dgain" param="H_CTL_PITCH_DGAIN"/>
- <dl_setting MAX=".3" MIN="0." STEP="0.001" VAR="h_ctl_pitch_of_roll"
shortname="pitch_of_roll" param="H_CTL_PITCH_OF_ROLL" module="fw_h_ctl_a"/>
+ <dl_setting MAX=".3" MIN="0." STEP="0.001" VAR="h_ctl_pitch_of_roll"
shortname="pitch_of_roll" param="H_CTL_PITCH_OF_ROLL"
module="stabilization/stabilization_adaptive"/>
<dl_setting MAX="5000" MIN="0" STEP="100"
VAR="h_ctl_aileron_of_throttle" shortname="aileron_of_throttle"/>
<dl_setting MAX="60" MIN="0" STEP="1" VAR="h_ctl_roll_max_setpoint"
shortname="max_roll" param="H_CTL_ROLL_MAX_SETPOINT" unit="rad" alt_unit="deg"
alt_unit_coef="0.0174533"/>
@@ -22,11 +22,11 @@
</dl_settings>
<dl_settings name="climb">
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="fw_v_ctl" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE"/>
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="guidance/guidance_v" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE"/>
<dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_pitch_pgain" shortname="pitch_p"
param="V_CTL_AUTO_PITCH_PGAIN"/>
<dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_pitch_igain" shortname="pitch_i"
param="V_CTL_AUTO_PITCH_IGAIN"/>
- <dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_pitch_dgain" shortname="pitch_d" param="V_CTL_AUTO_PITCH_DGAIN"
module="fw_v_ctl_n"/>
+ <dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_pitch_dgain" shortname="pitch_d" param="V_CTL_AUTO_PITCH_DGAIN"
module="guidance/guidance_v_n"/>
<dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_throttle_pgain" shortname="throttle_p"
param="V_CTL_AUTO_THROTTLE_PGAIN"/>
<dl_setting MAX="0" MIN="-0.1" STEP="0.001"
VAR="v_ctl_auto_throttle_igain" shortname="throttle_i"
param="V_CTL_AUTO_THROTTLE_IGAIN"/>
Modified: paparazzi3/trunk/conf/settings/fw_h_ctl_a_settings.xml
===================================================================
--- paparazzi3/trunk/conf/settings/fw_h_ctl_a_settings.xml 2010-11-05
16:24:10 UTC (rev 6355)
+++ paparazzi3/trunk/conf/settings/fw_h_ctl_a_settings.xml 2010-11-05
16:24:18 UTC (rev 6356)
@@ -4,13 +4,13 @@
<settings>
<dl_settings>
- <dl_settings NAME="fw_h_ctl_a">
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_Kffa"
module="fw_h_ctl_a" shortname="roll_Kffa"/>
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_Kffd"
module="fw_h_ctl_a" shortname="roll_Kffd"/>
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_Kffa"
module="fw_h_ctl_a" shortname="pitch_Kffa"/>
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_Kffd"
module="fw_h_ctl_a" shortname="pitch_Kffd"/>
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_igain"
module="fw_h_ctl_a" handler="SetRollIGain"/>
- <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_igain"
module="fw_h_ctl_a" handler="SetPitchIGain"/>
+ <dl_settings NAME="stabilization/stabilization_adaptive">
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_Kffa"
module="stabilization/stabilization_adaptive" shortname="roll_Kffa"/>
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_Kffd"
module="stabilization/stabilization_adaptive" shortname="roll_Kffd"/>
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_Kffa"
module="stabilization/stabilization_adaptive" shortname="pitch_Kffa"/>
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_Kffd"
module="stabilization/stabilization_adaptive" shortname="pitch_Kffd"/>
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_roll_igain"
module="stabilization/stabilization_adaptive" handler="SetRollIGain"/>
+ <dl_setting MAX="0" MIN="-5000" STEP="10" VAR="h_ctl_pitch_igain"
module="stabilization/stabilization_adaptive" handler="SetPitchIGain"/>
</dl_settings>
</dl_settings>
</settings>
Modified: paparazzi3/trunk/conf/settings/tune_agr_climb.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tune_agr_climb.xml 2010-11-05 16:24:10 UTC
(rev 6355)
+++ paparazzi3/trunk/conf/settings/tune_agr_climb.xml 2010-11-05 16:24:18 UTC
(rev 6356)
@@ -3,12 +3,12 @@
<settings>
<dl_settings NAME="control">
<dl_settings NAME="agr">
- <dl_setting MAX="1.0" MIN="0." STEP="0.05" VAR="agr_climb_throttle"
shortname="climb_throttle" module="fw_v_ctl" param="AGR_CLIMB_THROTTLE"/>
- <dl_setting MAX="0.5" MIN="-0.1" STEP="0.05" VAR="agr_climb_pitch"
shortname="climb_pitch" module="fw_v_ctl" param="AGR_CLIMB_PITCH"/>
- <dl_setting MAX="1.0" MIN="0." STEP="0.1" VAR="agr_climb_nav_ratio"
shortname="climb_nav_ratio" module="fw_v_ctl" param="AGR_CLIMB_NAV_RATIO"/>
- <dl_setting MAX="1.0" MIN="0." STEP="0.05"
VAR="agr_descent_throttle" shortname="descent_throttle" module="fw_v_ctl"
param="AGR_DESCENT_THROTTLE"/>
- <dl_setting MAX="0.1" MIN="-0.5" STEP="0.05" VAR="agr_descent_pitch"
shortname="descent_ptich" module="fw_v_ctl" param="AGR_DESCENT_PITCH"/>
- <dl_setting MAX="1.0" MIN="0." STEP="0.1"
VAR="agr_descent_nav_ratio" shortname="descent_nav_ratio" module="fw_v_ctl"
param="AGR_DESCENT_NAV_RATIO"/>
+ <dl_setting MAX="1.0" MIN="0." STEP="0.05" VAR="agr_climb_throttle"
shortname="climb_throttle" module="guidance/guidance_v"
param="AGR_CLIMB_THROTTLE"/>
+ <dl_setting MAX="0.5" MIN="-0.1" STEP="0.05" VAR="agr_climb_pitch"
shortname="climb_pitch" module="guidance/guidance_v" param="AGR_CLIMB_PITCH"/>
+ <dl_setting MAX="1.0" MIN="0." STEP="0.1" VAR="agr_climb_nav_ratio"
shortname="climb_nav_ratio" module="guidance/guidance_v"
param="AGR_CLIMB_NAV_RATIO"/>
+ <dl_setting MAX="1.0" MIN="0." STEP="0.05"
VAR="agr_descent_throttle" shortname="descent_throttle"
module="guidance/guidance_v" param="AGR_DESCENT_THROTTLE"/>
+ <dl_setting MAX="0.1" MIN="-0.5" STEP="0.05" VAR="agr_descent_pitch"
shortname="descent_ptich" module="guidance/guidance_v"
param="AGR_DESCENT_PITCH"/>
+ <dl_setting MAX="1.0" MIN="0." STEP="0.1"
VAR="agr_descent_nav_ratio" shortname="descent_nav_ratio"
module="guidance/guidance_v" param="AGR_DESCENT_NAV_RATIO"/>
</dl_settings>
</dl_settings>
</settings>
Modified: paparazzi3/trunk/conf/settings/tuning.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tuning.xml 2010-11-05 16:24:10 UTC (rev
6355)
+++ paparazzi3/trunk/conf/settings/tuning.xml 2010-11-05 16:24:18 UTC (rev
6356)
@@ -65,7 +65,7 @@
</dl_settings>
<dl_settings name="auto_throttle">
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="fw_v_ctl" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE">
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="guidance/guidance_v" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE">
<strip_button name="Loiter" value="0.1"/>
<strip_button name="Cruise" value="0"/>
<strip_button name="Dash" value="1"/>
Modified: paparazzi3/trunk/conf/settings/tuningJH.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tuningJH.xml 2010-11-05 16:24:10 UTC (rev
6355)
+++ paparazzi3/trunk/conf/settings/tuningJH.xml 2010-11-05 16:24:18 UTC (rev
6356)
@@ -56,7 +56,7 @@
</dl_settings>
<dl_settings name="auto_throttle">
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="fw_v_ctl" handler="SetCruiseThrottle">
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="guidance/guidance_v" handler="SetCruiseThrottle">
<strip_button name="Dash" value="1"/>
<strip_button name="Loiter" value="0.5"/>
<strip_button name="Cruise" value="0"/>
Modified: paparazzi3/trunk/conf/settings/tuning_ins.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tuning_ins.xml 2010-11-05 16:24:10 UTC
(rev 6355)
+++ paparazzi3/trunk/conf/settings/tuning_ins.xml 2010-11-05 16:24:18 UTC
(rev 6356)
@@ -55,7 +55,7 @@
</dl_settings>
<dl_settings name="auto_throttle">
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="fw_v_ctl" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE">
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="guidance/guidance_v" handler="SetCruiseThrottle"
param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE">
<strip_button name="Loiter" value="0.1"/>
<strip_button name="Cruise" value="0"/>
<strip_button name="Dash" value="1"/>
Modified: paparazzi3/trunk/conf/settings/tuning_tp_auto.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tuning_tp_auto.xml 2010-11-05 16:24:10 UTC
(rev 6355)
+++ paparazzi3/trunk/conf/settings/tuning_tp_auto.xml 2010-11-05 16:24:18 UTC
(rev 6356)
@@ -47,7 +47,7 @@
</dl_settings>
<dl_settings name="auto_throttle">
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="fw_v_ctl" handler="SetCruiseThrottle">
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle"
module="guidance/guidance_v" handler="SetCruiseThrottle">
<strip_button name="Dash" value="1"/>
<strip_button name="Loiter" value="0.1"/>
<strip_button name="Cruise" value="0"/>
@@ -55,7 +55,7 @@
<dl_setting MAX="0.00" MIN="-0.05" STEP="0.005"
VAR="v_ctl_auto_throttle_pgain" shortname="throttle_pgain"/>
- <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_igain" shortname="throttle_igain" module="fw_v_ctl"
handler="SetAutoThrottleIgain"/>
+ <dl_setting MAX="1" MIN="0.0" STEP="0.05"
VAR="v_ctl_auto_throttle_igain" shortname="throttle_igain"
module="guidance/guidance_v" handler="SetAutoThrottleIgain"/>
<dl_setting MAX="2" MIN="0.0" STEP="0.1"
VAR="v_ctl_auto_throttle_dgain" shortname="throttle_dgain"/>
<dl_setting MAX="1" MIN="0" STEP="0.01"
VAR="v_ctl_auto_throttle_climb_throttle_increment" shortname="throttle_incr"/>
<dl_setting MAX="1" MIN="0" STEP="0.01"
VAR="v_ctl_auto_throttle_pitch_of_vz_pgain" shortname="pitch_of_vz"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6356] fix some more fixedwing control settings after rename,
Felix Ruess <=