[paparazzi-commits] [5706] changing SPEKTRUM flag names

[antoine drouin]

Revision: 5706
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5706
Author:   poine
Date:     2010-08-26 14:03:31 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
changing SPEKTRUM flag names

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
    paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
    paparazzi3/trunk/sw/airborne/booz/test/booz2_test_radio_control.c

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-26 
13:31:39 UTC (rev 5705)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-26 
14:03:31 UTC (rev 5706)
@@ -151,9 +151,8 @@
 test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
 test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
 test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7se.h\"
-test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LINK=$(RADIO_CONTROL_LINK)
-#test_rc_spektrum.CFLAGS += -DUSE_$(RADIO_CONTROL_LINK) 
-D$(RADIO_CONTROL_LINK)_BAUD=B115200
-test_rc_spektrum.CFLAGS += -DOVERRIDE_$(RADIO_CONTROL_LINK)_IRQ_HANDLER 
-DUSE_TIM1_UP_IRQ
+test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_PRIMARY_PORT=$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)
+test_rc_spektrum.CFLAGS += 
-DOVERRIDE_$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)_IRQ_HANDLER -DUSE_TIM1_UP_IRQ
 test_rc_spektrum.srcs   += $(SRC_BOOZ)/booz_radio_control.c                    
             \
                            
$(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c          \
                           
$(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
       2010-08-26 13:31:39 UTC (rev 5705)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
       2010-08-26 14:03:31 UTC (rev 5706)
@@ -9,9 +9,8 @@
 ap.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"booz/radio_control/booz_radio_control_spektrum.h\"
 ap.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
 ap.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
-ap.CFLAGS += -DRADIO_CONTROL_LINK=$(RADIO_CONTROL_LINK)
-#ap.CFLAGS += -DUSE_$(RADIO_CONTROL_LINK) -D$(RADIO_CONTROL_LINK)_BAUD=B115200
-ap.CFLAGS += -DOVERRIDE_$(RADIO_CONTROL_LINK)_IRQ_HANDLER -DUSE_TIM1_UP_IRQ
+ap.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_PRIMARY_PORT=$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)
+ap.CFLAGS += -DOVERRIDE_$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)_IRQ_HANDLER 
-DUSE_TIM1_UP_IRQ
 
 ap.srcs += $(SRC_BOOZ)/booz_radio_control.c \
            $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c \

Modified: paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-08-26 13:31:39 UTC 
(rev 5705)
+++ paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-08-26 14:03:31 UTC 
(rev 5706)
@@ -41,7 +41,8 @@
 
 SYS_TIME_LED       = 1
 
-RADIO_CONTROL_LINK = UART3
+RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART3
+RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
 RADIO_CONTROL_LED  = 5
 
 MODEM_PORT=UART2

Modified: paparazzi3/trunk/sw/airborne/booz/test/booz2_test_radio_control.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/test/booz2_test_radio_control.c   
2010-08-26 13:31:39 UTC (rev 5705)
+++ paparazzi3/trunk/sw/airborne/booz/test/booz2_test_radio_control.c   
2010-08-26 14:03:31 UTC (rev 5706)
@@ -62,7 +62,7 @@
 
   RunOnceEvery(10, {radio_control_periodic();});
 
-  int16_t foo = 0;
+  int16_t foo = 0;//RC_PPM_SIGNED_TICS_OF_USEC(2050-1500);
   RunOnceEvery(10, 
     {DOWNLINK_SEND_BOOZ2_RADIO_CONTROL(DefaultChannel, \
                                       
&radio_control.values[RADIO_CONTROL_ROLL], \