[paparazzi-commits] [5707] more changing spektrum names

[antoine drouin]

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

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-26 
14:03:31 UTC (rev 5706)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-26 
14:18:08 UTC (rev 5707)
@@ -150,7 +150,6 @@
 test_rc_spektrum.CFLAGS += -DUSE_RADIO_CONTROL
 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_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                    
             \

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
       2010-08-26 14:03:31 UTC (rev 5706)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
       2010-08-26 14:18:08 UTC (rev 5707)
@@ -7,7 +7,9 @@
 
 ap.CFLAGS += -DUSE_RADIO_CONTROL 
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
 ap.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"booz/radio_control/booz_radio_control_spektrum.h\"
+ifeq ($(BOARD), booz)
 ap.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
+endif
 ap.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
 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