[paparazzi-commits] [4295]

[Pascal Brisset]

Revision: 4295
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4295
Author:   hecto
Date:     2009-10-21 14:05:39 +0000 (Wed, 21 Oct 2009)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi3/trunk/conf/settings/booz2_cam.xml
    paparazzi3/trunk/sw/ground_segment/joystick/xbox_booz_nav.xml

Modified: paparazzi3/trunk/conf/settings/booz2_cam.xml
===================================================================
--- paparazzi3/trunk/conf/settings/booz2_cam.xml        2009-10-20 11:58:35 UTC 
(rev 4294)
+++ paparazzi3/trunk/conf/settings/booz2_cam.xml        2009-10-21 14:05:39 UTC 
(rev 4295)
@@ -4,8 +4,11 @@
     <dl_settings NAME="CAM">
       <dl_setting var="booz2_cam_mode" MIN="0" STEP="1" MAX="3" 
module="booz2_cam" shortname="mode" values="NONE|MAN|HEADING|WP" 
handler="SetCamMode">
         <strip_button name="CN" value="0"/>
+        <strip_button name="CM" value="1"/>
         <strip_button name="CH" value="2"/>
         <strip_button name="CWP" value="3"/>
+        <key_press key="F1" value="0"/>
+        <key_press key="F2" value="1"/>
       </dl_setting>
       <dl_setting var="booz2_cam_tilt_pwm" min="1000" step="1" max="2000" 
module="booz2_cam" shortname="tilt_pwm"/>
       <dl_setting var="booz2_cam_tilt" min="-90" step="1" max="45" 
module="booz2_cam" shortname="tilt" alt_unit="deg" alt_unit_coef="0.0139882">

Modified: paparazzi3/trunk/sw/ground_segment/joystick/xbox_booz_nav.xml
===================================================================
--- paparazzi3/trunk/sw/ground_segment/joystick/xbox_booz_nav.xml       
2009-10-20 11:58:35 UTC (rev 4294)
+++ paparazzi3/trunk/sw/ground_segment/joystick/xbox_booz_nav.xml       
2009-10-21 14:05:39 UTC (rev 4295)
@@ -14,13 +14,13 @@
    <field name="h_mode" value="IndexOfEnum(NAV)"/>
    <field name="v_mode" value="IndexOfEnum(NAV)"/>
    <field name="v_sp"   value="(up-down)*42"/>
-   <field name="h_sp_1" value="roll"/>
-   <field name="h_sp_2" value="pitch"/>
+   <field name="h_sp_1" value="0-pitch"/>
+   <field name="h_sp_2" value="roll"/>
    <field name="h_sp_3" value="yaw"/>
   </message>
 
   <message class="ground" name="DL_SETTING">
-    <field name="index" value="IndexOfSetting(booz2_cam_tilt)"/>
+    <field name="index" value="IndexOfSetting(booz2_cam_tilt_pwm)"/>
     <field name="value" value="Scale(tilt, 1000, 2000)"/>
   </message>