[paparazzi-commits] [4987] removed kill switch value for users without kill switch from telemetry again

[Felix Ruess]

Revision: 4987
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4987
Author:   flixr
Date:     2010-06-20 11:55:58 +0000 (Sun, 20 Jun 2010)
Log Message:
-----------
removed kill switch value for users without kill switch from telemetry again

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-06-20 11:55:50 UTC 
(rev 4986)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-06-20 11:55:58 UTC 
(rev 4987)
@@ -94,16 +94,28 @@
 
 #ifdef USE_RADIO_CONTROL
 #define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan, 
RADIO_CONTROL_NB_CHANNEL, radio_control.values)
-#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {                             
     \
-    DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan,                                   
     \
-                                     
&radio_control.values[RADIO_CONTROL_ROLL],     \
-                                     
&radio_control.values[RADIO_CONTROL_PITCH],    \
-                                     &radio_control.values[RADIO_CONTROL_YAW], 
     \
-                                     
&radio_control.values[RADIO_CONTROL_THROTTLE], \
-                                     
&radio_control.values[RADIO_CONTROL_MODE],     \
-                                     
&radio_control.values[RADIO_CONTROL_KILL_SWITCH],     \
-                                     &radio_control.status);}
-
+#ifdef RADIO_CONTROL_KILL_SWITCH
+#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {                      \
+    DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan,                            \
+                                      
&radio_control.values[RADIO_CONTROL_ROLL], \
+                                      
&radio_control.values[RADIO_CONTROL_PITCH], \
+                                      
&radio_control.values[RADIO_CONTROL_YAW], \
+                                      
&radio_control.values[RADIO_CONTROL_THROTTLE], \
+                                      
&radio_control.values[RADIO_CONTROL_MODE], \
+                                      
&radio_control.values[RADIO_CONTROL_KILL_SWITCH], \
+                                      &radio_control.status);}
+#else //RADIO_CONTROL_KILL_SWITCH not defined
+#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {                      \
+    int16_t foo = 0;                                                    \
+    DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(_chan,                            \
+                                      
&radio_control.values[RADIO_CONTROL_ROLL], \
+                                      
&radio_control.values[RADIO_CONTROL_PITCH], \
+                                      
&radio_control.values[RADIO_CONTROL_YAW], \
+                                      
&radio_control.values[RADIO_CONTROL_THROTTLE], \
+                                      
&radio_control.values[RADIO_CONTROL_MODE], \
+                                      &foo,                             \
+                                      &radio_control.status);}
+#endif //RADIO_CONTROL_KILL_SWITCH
 #else
 #define PERIODIC_SEND_RC(_chan) {}
 #define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {}