[paparazzi-commits] [4967] added setting of fbw channel to tuning file

[Felix Ruess]

Revision: 4967
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4967
Author:   flixr
Date:     2010-06-16 12:50:15 +0000 (Wed, 16 Jun 2010)
Log Message:
-----------
added setting of fbw channel to tuning file

Modified Paths:
--------------
    paparazzi3/trunk/conf/settings/tuning.xml

Modified: paparazzi3/trunk/conf/settings/tuning.xml
===================================================================
--- paparazzi3/trunk/conf/settings/tuning.xml   2010-06-16 01:03:24 UTC (rev 
4966)
+++ paparazzi3/trunk/conf/settings/tuning.xml   2010-06-16 12:50:15 UTC (rev 
4967)
@@ -12,20 +12,20 @@
 
     <dl_settings NAME="mode">
       <dl_setting MAX="2" MIN="0" STEP="1" VAR="pprz_mode" module="autopilot"/>
-        <dl_setting MAX="1" MIN="0" STEP="1" VAR="alt_kalman_enabled" 
shortname="alt_kalman" module="estimator"/>
+      <dl_setting MAX="1" MIN="0" STEP="1" VAR="alt_kalman_enabled" 
shortname="alt_kalman" module="estimator"/>
       <dl_setting MAX="0" MIN="0" STEP="1" VAR="estimator_flight_time" 
shortname="flight time"/>
       <dl_setting MAX="1000" MIN="0" STEP="1" VAR="stage_time"/>
       <dl_setting MAX="1" MIN="0" STEP="1" VAR="launch"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle">
-      </dl_setting>
+      <dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle"/>
       <dl_setting MAX="2" MIN="0" STEP="1" 
VAR="telemetry_mode_Ap_DefaultChannel" shortname="tele_AP" module="downlink"/>
+      <dl_setting MAX="1" MIN="0" STEP="1" 
VAR="telemetry_mode_Fbw_DefaultChannel" shortname="tele_FBW" module="downlink"/>
       <dl_setting MAX="2" MIN="0" STEP="1" VAR="gps_reset" module="gps_ubx" 
handler="Reset" shortname="GPS reset"/>
 
       <dl_setting MAX="200" MIN="-200" STEP="10" VAR="nav_radius" module="nav" 
handler="SetNavRadius">
-        <strip_button icon="circle-right.png" name="Circle right" value="1"/>  
      
-        <strip_button icon="circle-left.png" name="Circle left" value="-1"/>   
     
-       <key_press key="greater" value="1"/>
-       <key_press key="less" value="-1"/>
+        <strip_button icon="circle-right.png" name="Circle right" value="1"/>
+        <strip_button icon="circle-left.png" name="Circle left" value="-1"/>
+        <key_press key="greater" value="1"/>
+        <key_press key="less" value="-1"/>
       </dl_setting>
     </dl_settings>
 
@@ -34,9 +34,9 @@
         <dl_setting MAX="0.3" MIN="-0.3" STEP="0.01" VAR="ir_roll_neutral" 
shortname="roll_neutral" param="IR_ROLL_NEUTRAL_DEFAULT" unit="rad"/>
         <dl_setting MAX="0.5" MIN="-0.3" STEP="0.01" VAR="ir_pitch_neutral" 
shortname="pitch_neutral" param="IR_PITCH_NEUTRAL_DEFAULT" unit="rad"/>
 
-  <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="ir_lateral_correction" 
shortname="360_lat_corr" module="infrared" param="IR_LATERAL_CORRECTION"/>
-  <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="ir_longitudinal_correction" 
shortname="360_log_corr" param="IR_LONGITUDINAL_CORRECTION"/>
-  <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="ir_vertical_correction" 
shortname="360_vert_corr" param="IR_VERTICAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="ir_lateral_correction" 
shortname="360_lat_corr" module="infrared" param="IR_LATERAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" 
VAR="ir_longitudinal_correction" shortname="360_log_corr" 
param="IR_LONGITUDINAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" 
VAR="ir_vertical_correction" shortname="360_vert_corr" 
param="IR_VERTICAL_CORRECTION"/>
 
         <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="ir_correction_left" 
shortname="corr_left" param="IR_CORRECTION_LEFT"/>
         <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="ir_correction_right" 
shortname="corr_right" param="IR_CORRECTION_RIGHT"/>
@@ -66,12 +66,12 @@
 
       <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">
-        <strip_button name="Dash" value="1"/>
-        <strip_button name="Loiter" value="0.1"/>
-        <strip_button name="Cruise" value="0"/>
-      </dl_setting>
-       
+          <strip_button name="Dash" value="1"/>
+          <strip_button name="Loiter" value="0.1"/>
+          <strip_button name="Cruise" value="0"/>
+        </dl_setting>
 
+
         <dl_setting MAX="0.00" MIN="-0.05" STEP="0.005" 
VAR="v_ctl_auto_throttle_pgain" shortname="throttle_pgain" 
param="V_CTL_AUTO_THROTTLE_PGAIN"/>
         <dl_setting MAX="1" MIN="0.0" STEP="0.05" 
VAR="v_ctl_auto_throttle_igain" shortname="throttle_igain" 
param="V_CTL_AUTO_THROTTLE_IGAIN"/>
         <dl_setting MAX="2" MIN="0.0" STEP="0.1" 
VAR="v_ctl_auto_throttle_dgain" shortname="throttle_dgain"/>
@@ -98,10 +98,9 @@
         <dl_setting MAX="2" MIN="1" STEP="1" VAR="nav_mode"/>
         <dl_setting MAX="5" MIN="-5" STEP="0.5" VAR="nav_climb"/>
         <dl_setting MAX="15" MIN="-15" STEP="1" VAR="fp_pitch"/>
-        <dl_setting MAX="50" MIN="-50" STEP="5" VAR="nav_shift" module="nav" 
handler="IncreaseShift" shortname="inc. shift">
-       </dl_setting>
-       <dl_setting MAX="50" MIN="5" STEP="0.5" VAR="nav_ground_speed_setpoint" 
shortname="ground speed"/>
-       <dl_setting MAX="0." MIN="-0.2" STEP="0.01" 
VAR="nav_ground_speed_pgain" shortname="ground speed pgain"/>
+        <dl_setting MAX="50" MIN="-50" STEP="5" VAR="nav_shift" module="nav" 
handler="IncreaseShift" shortname="inc. shift"/>
+        <dl_setting MAX="50" MIN="5" STEP="0.5" 
VAR="nav_ground_speed_setpoint" shortname="ground speed"/>
+        <dl_setting MAX="0." MIN="-0.2" STEP="0.01" 
VAR="nav_ground_speed_pgain" shortname="ground speed pgain"/>
         <dl_setting MAX="500" MIN="50" STEP="5" VAR="nav_survey_shift"/>
       </dl_settings>
     </dl_settings>