[paparazzi-commits] [5221] handle more buttons in the usb_stick library

[Gautier Hattenberger]

Revision: 5221
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5221
Author:   gautier
Date:     2010-08-04 18:08:27 +0000 (Wed, 04 Aug 2010)
Log Message:
-----------
handle more buttons in the usb_stick library

Modified Paths:
--------------
    paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.c
    paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.h

Modified: paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.c
===================================================================
--- paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.c     2010-08-04 
17:33:58 UTC (rev 5220)
+++ paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.c     2010-08-04 
18:08:27 UTC (rev 5221)
@@ -73,7 +73,7 @@
 
 struct stick_code_param_ stick_init_param = {
   0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-  0, {0, 0, 0, 0, 0, 0}
+  0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
 //struct ff_effect effect;
@@ -300,13 +300,17 @@
       (stick_button_values >> 13) & 1,
       (stick_button_values >> 14) & 1,
       (stick_button_values >> 15) & 1);
-  dbgprintf(stderr,"axis %d %d %d %d %d %d\n",
+  dbgprintf(stderr,"axis %d %d %d %d %d %d %d %d %d %d\n",
       stick_axis_values[0],
       stick_axis_values[1],
       stick_axis_values[2],
       stick_axis_values[3],
       stick_axis_values[4],
-      stick_axis_values[5]);
+      stick_axis_values[5],
+      stick_axis_values[6],
+      stick_axis_values[7],
+      stick_axis_values[8],
+      stick_axis_values[9]);
 
   return 0;
 }

Modified: paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.h
===================================================================
--- paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.h     2010-08-04 
17:33:58 UTC (rev 5220)
+++ paparazzi3/trunk/sw/ground_segment/joystick/usb_stick.h     2010-08-04 
18:08:27 UTC (rev 5221)
@@ -28,7 +28,7 @@
 
 /* Max number of axis and buttons */
 #define STICK_BUTTON_COUNT    16
-#define STICK_AXIS_COUNT      6
+#define STICK_AXIS_COUNT      10
 
 /* Default values for the options */
 #define STICK_INPUT_DEV_MAX   15