[paparazzi-commits] [5725] polishing

[Eric]

Revision: 5725
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5725
Author:   lamestllama
Date:     2010-08-27 15:24:09 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
polishing

Modified Paths:
--------------
    
paparazzi3/trunk/sw/airborne/booz/arch/stm32/radio_control/booz_radio_control_spektrum_arch.h

Modified: 
paparazzi3/trunk/sw/airborne/booz/arch/stm32/radio_control/booz_radio_control_spektrum_arch.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/arch/stm32/radio_control/booz_radio_control_spektrum_arch.h
       2010-08-27 13:48:05 UTC (rev 5724)
+++ 
paparazzi3/trunk/sw/airborne/booz/arch/stm32/radio_control/booz_radio_control_spektrum_arch.h
       2010-08-27 15:24:09 UTC (rev 5725)
@@ -25,21 +25,13 @@
 #ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
 #define BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
 
-#include "std.h"
-#include "uart.h"
 
 /* 
  * All Spektrum and JR 2.4 GHz transmitters
  * have the same channel assignments.
  */ 
  
-/* reverse some channels to suit Paparazzi conventions          */
-/* the maximum number of channels a Spektrum can transmit is 12 */
-#ifndef RADIO_CONTROL_SPEKTRUM_SIGNS 
-#define RADIO_CONTROL_SPEKTRUM_SIGNS {1,1,-1,1,1,-1,1,1,1,1,1,1}
-#endif
 
-
 #ifndef RADIO_CONTROL_NB_CHANNEL 
 #define RADIO_CONTROL_NB_CHANNEL 12
 #endif 
@@ -49,18 +41,9 @@
 #define RADIO_CONTROL_ROLL       1
 #define RADIO_CONTROL_PITCH      2
 #define RADIO_CONTROL_YAW        3
-
-#ifndef RADIO_CONTROL_MODE
-#define RADIO_CONTROL_MODE       4
-#endif
-
 #define RADIO_CONTROL_GEAR       4
 #define RADIO_CONTROL_FLAP       5
-
-#ifndef RADIO_CONTROL_KILL 
-#define RADIO_CONTROL_KILL       6
-#endif
-
+#define RADIO_CONTROL_AUX1       5
 #define RADIO_CONTROL_AUX2       6
 #define RADIO_CONTROL_AUX3       7
 #define RADIO_CONTROL_AUX4       8
@@ -68,9 +51,23 @@
 #define RADIO_CONTROL_AUX6       10
 #define RADIO_CONTROL_AUX7       11
 
+/* reverse some channels to suit Paparazzi conventions          */
+/* the maximum number of channels a Spektrum can transmit is 12 */
+#ifndef RADIO_CONTROL_SPEKTRUM_SIGNS 
+#define RADIO_CONTROL_SPEKTRUM_SIGNS {1,1,-1,1,1,-1,1,1,1,1,1,1}
+#endif
 
+/* really for a 9 channel transmitter 
+   we would swap the order of these */
+#ifndef RADIO_CONTROL_MODE
+#define RADIO_CONTROL_MODE       RADIO_CONTROL_GEAR 
+#endif
 
+#ifndef RADIO_CONTROL_KILL 
+#define RADIO_CONTROL_KILL       RADIO_CONTROL_AUX2
+#endif
 
 
 extern void RadioControlEventImp(void (*_received_frame_handler)(void));
+
 #endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H */