[paparazzi-commits] [6253] fix RC_OK defines (was RADIO_CONTROL_OK for booz)

[Felix Ruess]

Revision: 6253
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6253
Author:   flixr
Date:     2010-10-25 21:59:03 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
fix RC_OK defines (was RADIO_CONTROL_OK for booz)

Modified Paths:
--------------
    
paparazzi3/trunk/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
    
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    paparazzi3/trunk/sw/airborne/csc/mercury_main.c
    paparazzi3/trunk/sw/airborne/lisa/lisa_stm_passthrough_main.c
    paparazzi3/trunk/sw/airborne/subsystems/radio_control/joby.c

Modified: 
paparazzi3/trunk/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
===================================================================
--- 
paparazzi3/trunk/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
    2010-10-25 21:58:55 UTC (rev 6252)
+++ 
paparazzi3/trunk/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
    2010-10-25 21:59:03 UTC (rev 6253)
@@ -75,7 +75,7 @@
           rc_spk_parser_status = RC_SPK_STA_UNINIT;                     \
           radio_control.frame_cpt++;                                   \
           radio_control.time_since_last_frame = 0;                     \
-          radio_control.status = RADIO_CONTROL_OK;                     \
+          radio_control.status = RC_OK;                        \
       uint8_t i;                                                       \
       for (i=0;i<RADIO_CONTROL_NB_CHANNEL;i++) {                       \
         const int16_t tmp = (rc_spk_parser_buf[2*i]<<8) +              \

Modified: 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    2010-10-25 21:58:55 UTC (rev 6252)
+++ 
paparazzi3/trunk/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    2010-10-25 21:59:03 UTC (rev 6253)
@@ -440,7 +440,7 @@
     if (ChannelCnt >= (MaxChannelNum + 1)) {
       radio_control.frame_cpt++;
       radio_control.time_since_last_frame = 0;
-      radio_control.status = RADIO_CONTROL_OK;
+      radio_control.status = RC_OK;
       for (int i = 0; i < (MaxChannelNum + 1); i++) {
         radio_control.values[i] = SpektrumBuf[i];
         if (i == RADIO_THROTTLE ) {

Modified: paparazzi3/trunk/sw/airborne/csc/mercury_main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/csc/mercury_main.c     2010-10-25 21:58:55 UTC 
(rev 6252)
+++ paparazzi3/trunk/sw/airborne/csc/mercury_main.c     2010-10-25 21:59:03 UTC 
(rev 6253)
@@ -100,7 +100,7 @@
   radio_control.values[RADIO_THROTTLE] = 
-CSC_RC_SCALE*((msg->left_stick_vertical_and_flap_mix & ~(3 << 13)) - 
CSC_RC_OFFSET);
 
   radio_control.time_since_last_frame = 0;
-  radio_control.status = RADIO_CONTROL_OK;
+  radio_control.status = RC_OK;
 }
 
 static inline void csc_main_init( void ) {

Modified: paparazzi3/trunk/sw/airborne/lisa/lisa_stm_passthrough_main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/lisa_stm_passthrough_main.c       
2010-10-25 21:58:55 UTC (rev 6252)
+++ paparazzi3/trunk/sw/airborne/lisa/lisa_stm_passthrough_main.c       
2010-10-25 21:59:03 UTC (rev 6253)
@@ -146,7 +146,7 @@
 #ifdef PASSTHROUGH_CYGNUS
        return;
 #endif
-       if (radio_control.status == RADIO_CONTROL_REALLY_LOST) {
+       if (radio_control.status == RC_REALLY_LOST) {
                const static int32_t commands_failsafe[COMMANDS_NB] = 
COMMANDS_FAILSAFE;
                SetActuatorsFromCommands(commands_failsafe);
        }

Modified: paparazzi3/trunk/sw/airborne/subsystems/radio_control/joby.c
===================================================================
--- paparazzi3/trunk/sw/airborne/subsystems/radio_control/joby.c        
2010-10-25 21:58:55 UTC (rev 6252)
+++ paparazzi3/trunk/sw/airborne/subsystems/radio_control/joby.c        
2010-10-25 21:59:03 UTC (rev 6253)
@@ -45,7 +45,7 @@
       // all channels read, reset parser and handle message
       parser.current_channel = -1;
       radio_control.frame_cpt++;
-      radio_control.status = RADIO_CONTROL_OK;
+      radio_control.status = RC_OK;
       radio_control.time_since_last_frame = 0;
       if (callback != NULL)
     callback();