[paparazzi-commits] [6247] fix radio control channels for spektrum (RADIO_CONTROL_<channel> to RADIO_<channel>)

[Felix Ruess]

Revision: 6247
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6247
Author:   flixr
Date:     2010-10-25 21:58:19 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
fix radio control channels for spektrum (RADIO_CONTROL_<channel> to 
RADIO_<channel>)

Modified Paths:
--------------
    
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
    
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h
    
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
    
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h

Modified: 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
    2010-10-25 21:58:12 UTC (rev 6246)
+++ 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
    2010-10-25 21:58:19 UTC (rev 6247)
@@ -37,19 +37,19 @@
 #endif
 
 
-#define RADIO_CONTROL_THROTTLE   0
-#define RADIO_CONTROL_ROLL       1
-#define RADIO_CONTROL_PITCH      2
-#define RADIO_CONTROL_YAW        3
-#define RADIO_CONTROL_GEAR       4
-#define RADIO_CONTROL_FLAP       5
-#define RADIO_CONTROL_AUX1       5
-#define RADIO_CONTROL_AUX2       6
-#define RADIO_CONTROL_AUX3       7
-#define RADIO_CONTROL_AUX4       8
-#define RADIO_CONTROL_AUX5       9
-#define RADIO_CONTROL_AUX6       10
-#define RADIO_CONTROL_AUX7       11
+#define RADIO_THROTTLE   0
+#define RADIO_ROLL       1
+#define RADIO_PITCH      2
+#define RADIO_YAW        3
+#define RADIO_GEAR       4
+#define RADIO_FLAP       5
+#define RADIO_AUX1       5
+#define RADIO_AUX2       6
+#define RADIO_AUX3       7
+#define RADIO_AUX4       8
+#define RADIO_AUX5       9
+#define RADIO_AUX6       10
+#define RADIO_AUX7       11
 
 /* reverse some channels to suit Paparazzi conventions          */
 /* the maximum number of channels a Spektrum can transmit is 12 */
@@ -59,8 +59,8 @@
 
 /* really for a 9 channel transmitter
    we would swap the order of these */
-#ifndef RADIO_CONTROL_MODE
-#define RADIO_CONTROL_MODE       RADIO_CONTROL_GEAR
+#ifndef RADIO_MODE
+#define RADIO_MODE       RADIO_CONTROL_GEAR
 #endif
 
 extern void RadioControlEventImp(void (*_received_frame_handler)(void));

Modified: 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h  
    2010-10-25 21:58:12 UTC (rev 6246)
+++ 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h  
    2010-10-25 21:58:19 UTC (rev 6247)
@@ -26,15 +26,15 @@
 
 #define RADIO_CONTROL_NB_CHANNEL 9
 
-#define RADIO_CONTROL_THROTTLE   0
-#define RADIO_CONTROL_YAW        1
-#define RADIO_CONTROL_PITCH      2
-#define RADIO_CONTROL_ROLL       3
-#define RADIO_CONTROL_GEAR       4
-#define RADIO_CONTROL_MODE       5
-#define RADIO_CONTROL_AUX2       6
-#define RADIO_CONTROL_AUX3       7
-#define RADIO_CONTROL_KILL       8
+#define RADIO_THROTTLE   0
+#define RADIO_YAW        1
+#define RADIO_PITCH      2
+#define RADIO_ROLL       3
+#define RADIO_GEAR       4
+#define RADIO_MODE       5
+#define RADIO_AUX2       6
+#define RADIO_AUX3       7
+#define RADIO_KILL       8
 
 #define RC_JOBY_SYNC_2 0x12
 

Modified: 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
        2010-10-25 21:58:12 UTC (rev 6246)
+++ 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
        2010-10-25 21:58:19 UTC (rev 6247)
@@ -24,14 +24,14 @@
 #ifndef RADIO_CONTROL_SPEKTRUM_DX7SE_H
 #define RADIO_CONTROL_SPEKTRUM_DX7SE_H
 
-#define RADIO_CONTROL_NB_CHANNEL 7
-#define RADIO_CONTROL_ROLL       0
-#define RADIO_CONTROL_THROTTLE   1
-#define RADIO_CONTROL_PITCH      2
-#define RADIO_CONTROL_YAW        3
-#define RADIO_CONTROL_AUX3       4
-#define RADIO_CONTROL_MODE       5
-#define RADIO_CONTROL_AUX4       6
+#define RADIO_NB_CHANNEL 7
+#define RADIO_ROLL       0
+#define RADIO_THROTTLE   1
+#define RADIO_PITCH      2
+#define RADIO_YAW        3
+#define RADIO_AUX3       4
+#define RADIO_MODE       5
+#define RADIO_AUX4       6
 
 #define RC_SPK_SYNC_2 0x12
 

Modified: 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
   2010-10-25 21:58:12 UTC (rev 6246)
+++ 
paparazzi3/trunk/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
   2010-10-25 21:58:19 UTC (rev 6247)
@@ -26,12 +26,12 @@
 
 #define RADIO_CONTROL_NB_CHANNEL 7
 
-#define RADIO_CONTROL_ROLL       0
-#define RADIO_CONTROL_THROTTLE   5
-#define RADIO_CONTROL_PITCH      3
-#define RADIO_CONTROL_YAW        6
-#define RADIO_CONTROL_MODE       1
-#define RADIO_CONTROL_KILL_SWITCH 4
+#define RADIO_ROLL       0
+#define RADIO_THROTTLE   5
+#define RADIO_PITCH      3
+#define RADIO_YAW        6
+#define RADIO_MODE       1
+#define RADIO_KILL_SWITCH 4
 
 #define RC_SPK_SYNC_2 0x01