[paparazzi-commits] [6248] fix some spektrum makefiles

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6248] fix some spektrum makefiles

From:	Felix Ruess
Subject:	[paparazzi-commits] [6248] fix some spektrum makefiles
Date:	Mon, 25 Oct 2010 21:58:26 +0000
Revision: 6248
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6248
Author:   flixr
Date:     2010-10-25 21:58:26 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
fix some spektrum makefiles

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
    paparazzi3/trunk/conf/airframes/UofAdelaide/lisa_a1000.xml
    paparazzi3/trunk/conf/airframes/esden/lisa_asctec.xml
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/rotorcraft.xml
    
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-10-25 21:58:19 UTC 
(rev 6247)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-10-25 21:58:26 UTC 
(rev 6248)
@@ -194,7 +194,7 @@
     </target>
     <subsystem name="radio_control" type="spektrum">
       <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
-             
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
+             value="\\\"subsystems/radio_control/spektrum_dx7se.h\\\""/>
     </subsystem>
     <subsystem name="imu" type="b2_v1.1"/>
 

Modified: paparazzi3/trunk/conf/airframes/UofAdelaide/lisa_a1000.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/UofAdelaide/lisa_a1000.xml  2010-10-25 
21:58:19 UTC (rev 6247)
+++ paparazzi3/trunk/conf/airframes/UofAdelaide/lisa_a1000.xml  2010-10-25 
21:58:26 UTC (rev 6248)
@@ -174,7 +174,7 @@
 
 ap.CFLAGS += -DMODEM_BAUD=B57600
 
-ap.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7eu.h\"
+ap.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7eu.h\"
 ap.CFLAGS += -DGPS_USE_LATLONG
 ap.CFLAGS += -DGPS_PORT_ID=GPS_PORT_UART1
 

Modified: paparazzi3/trunk/conf/airframes/esden/lisa_asctec.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/esden/lisa_asctec.xml       2010-10-25 
21:58:19 UTC (rev 6247)
+++ paparazzi3/trunk/conf/airframes/esden/lisa_asctec.xml       2010-10-25 
21:58:26 UTC (rev 6248)
@@ -185,7 +185,7 @@
 
 ap.CFLAGS += -DMODEM_BAUD=B57600
 
-ap.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7se_joby.h\"
+ap.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7se_joby.h\"
 
 include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
 include $(CFG_BOOZ)/booz2_autopilot.makefile

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-10-25 
21:58:19 UTC (rev 6247)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-10-25 
21:58:26 UTC (rev 6248)
@@ -201,12 +201,12 @@
 test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
 endif
 test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
-test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
+test_rc_spektrum.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.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_TIM6_IRQ
 test_rc_spektrum.srcs   += $(SRC_SUBSYSTEMS)/radio_control.c                   
              \
-                          
$(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c          \
-                          
$(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c
+                          subsystems/radio_control/spektrum.c          \
+                          $(SRC_ARCH)/subsystems/radio_control/spektrum_arch.c
 
 
 #
@@ -644,7 +644,7 @@
 test_manual.srcs += $(SRC_BOOZ)/booz2_commands.c
 
 test_manual.CFLAGS += -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH)
-#test_manual.srcs   += $(SRC_FIRMWARE)/actuators/actuators_pwm.c 
+#test_manual.srcs   += $(SRC_FIRMWARE)/actuators/actuators_pwm.c
 test_manual.srcs   += 
$(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
 test_manual.srcs   += $(SRC_FIRMWARE)/actuators/actuators_heli.c
 
@@ -655,9 +655,9 @@
 test_manual.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
 endif
 test_manual.CFLAGS += 
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
-test_manual.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
+test_manual.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
 test_manual.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_PRIMARY_PORT=$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)
 test_manual.CFLAGS += 
-DOVERRIDE_$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)_IRQ_HANDLER -DUSE_TIM6_IRQ
 test_manual.srcs   += $(SRC_SUBSYSTEMS)/radio_control.c                        
         \
-                     $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c   
       \
-                     
$(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c
+                     subsystems/radio_control/spektrum.c          \
+                     $(SRC_ARCH)/subsystems/radio_control/spektrum_arch.c

Modified: paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-10-25 
21:58:19 UTC (rev 6247)
+++ paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-10-25 
21:58:26 UTC (rev 6248)
@@ -357,12 +357,12 @@
 test_rc_24.srcs += downlink.c pprz_transport.c
 
 test_rc_24.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=2
-test_rc_24.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
-test_rc_24.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7se.h\"
+test_rc_24.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
+test_rc_24.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7se.h\"
 test_rc_24.CFLAGS += -DUSE_UART3 -DUART3_BAUD=B115200
 test_rc_24.CFLAGS += -DRADIO_CONTROL_LINK=Uart3
 test_rc_24.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
-                   $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c
+                   $(SRC_BOOZ)/subsystems/radio_control/spektrum.c
 #                  $(SRC_ARCH)/uart_hw.c
 
 
@@ -1104,10 +1104,10 @@
 
 # Radio control
 ptw.CFLAGS += -DUSE_RADIO_CONTROL
-ptw.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
-ptw.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7se.h\"
+ptw.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
+ptw.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7se.h\"
 ptw.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
-           $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c
+           $(SRC_BOOZ)/subsystems/radio_control/spektrum.c
 ptw.CFLAGS += -DRADIO_CONTROL_LED=6
 ptw.CFLAGS += -DUSE_UART3 -DUART3_BAUD=B115200
 ptw.CFLAGS += -DRADIO_CONTROL_LINK=Uart3

Modified: paparazzi3/trunk/conf/autopilot/rotorcraft.xml
===================================================================
--- paparazzi3/trunk/conf/autopilot/rotorcraft.xml      2010-10-25 21:58:19 UTC 
(rev 6247)
+++ paparazzi3/trunk/conf/autopilot/rotorcraft.xml      2010-10-25 21:58:26 UTC 
(rev 6248)
@@ -9,11 +9,11 @@
  </target>
 
  <target name="sim" description="The simulator">
- </target> 
+ </target>
 
  <subsystem name="radio_control" types="ppm,spektrum">
    <type name="spektrum">
-     <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
values="\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\""/>
+     <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
values="\"subsystems/radio_control/spektrum_dx7se.h\""/>
      <param name="RADIO_CONTROL_LINK" values="UART1|UART2|UART3|UART5"/>
    </type>
  </subsystem>

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
 2010-10-25 21:58:19 UTC (rev 6247)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
 2010-10-25 21:58:26 UTC (rev 6248)
@@ -4,16 +4,16 @@
 
 
 ifndef RADIO_CONTROL_SPEKTRUM_MODEL
-RADIO_CONTROL_SPEKTRUM_MODEL=\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\"
+RADIO_CONTROL_SPEKTRUM_MODEL=\"subsystems/radio_control/spektrum_dx7se.h\"
 endif
 
 stm_passthrough.CFLAGS += -DUSE_RADIO_CONTROL 
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
-stm_passthrough.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"booz/radio_control/booz_radio_control_spektrum.h\"
+stm_passthrough.CFLAGS += 
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
 stm_passthrough.CFLAGS += 
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
 stm_passthrough.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
 stm_passthrough.CFLAGS += -DRADIO_CONTROL_LINK=$(RADIO_CONTROL_LINK)
 stm_passthrough.CFLAGS += -DUSE_$(RADIO_CONTROL_LINK) 
-D$(RADIO_CONTROL_LINK)_BAUD=B115200
 stm_passthrough.srcs += $(SRC_SUBSYSTEMS)/radio_control.c                      
  \
-                        
$(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c \
-                        
$(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c
+                        $(SRC_SUBSYSTEMS)/radio_control/spektrum.c \
+                        $(SRC_ARCH)/subsystems/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-10-25 21:58:19 UTC (rev 6247)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
       2010-10-25 21:58:26 UTC (rev 6248)
@@ -2,11 +2,11 @@
 # Makefile for radio_control susbsytem in rotorcraft firmware
 #
 ifndef RADIO_CONTROL_SPEKTRUM_MODEL
-RADIO_CONTROL_SPEKTRUM_MODEL=\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\"
+RADIO_CONTROL_SPEKTRUM_MODEL=\"subsystems/radio_control/spektrum_dx7se.h\"
 endif
 
 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\"
+ap.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
 ifeq ($(BOARD), booz)
 ap.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
 endif
@@ -17,6 +17,6 @@
 ap.CFLAGS += -DOVERRIDE_$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)_IRQ_HANDLER 
-DUSE_TIM6_IRQ
 
 ap.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
-           $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c \
-          $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c
+           $(SRC_SUBSYSTEMS)/radio_control/spektrum.c \
+           $(SRC_ARCH)/subsystems/radio_control/spektrum_arch.c
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [6248] fix some spektrum makefiles, Felix Ruess <=
Prev by Date: [paparazzi-commits] [6247] fix radio control channels for spektrum (RADIO_CONTROL_<channel> to RADIO_<channel>)
Next by Date: [paparazzi-commits] [6239] start fixing booz radio control includes
Previous by thread: [paparazzi-commits] [6247] fix radio control channels for spektrum (RADIO_CONTROL_<channel> to RADIO_<channel>)
Next by thread: [paparazzi-commits] [6239] start fixing booz radio control includes
Index(es):
- Date
- Thread