[paparazzi-commits] [5585] one more moving to rotorcraft

[antoine drouin]

Revision: 5585
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5585
Author:   poine
Date:     2010-08-22 21:01:41 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
one more moving to rotorcraft

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile

Removed Paths:
-------------
    paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_skytraq.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_ublox.makefile

Deleted: paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_skytraq.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_skytraq.makefile        
2010-08-22 20:56:46 UTC (rev 5584)
+++ paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_skytraq.makefile        
2010-08-22 21:01:41 UTC (rev 5585)
@@ -1,14 +0,0 @@
-
-ap.srcs += $(SRC_BOOZ)/booz_gps.c
-ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_skytraq.h\"
-ap.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400 -DUART0_VIC_SLOT=5
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart0 -DGPS_LED=4
-else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart1 -DGPS_LED=3
-endif
-
-sim.CFLAGS += -DUSE_GPS
-sim.srcs += $(SRC_BOOZ)/booz_gps.c

Deleted: paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_ublox.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_ublox.makefile  
2010-08-22 20:56:46 UTC (rev 5584)
+++ paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_ublox.makefile  
2010-08-22 21:01:41 UTC (rev 5585)
@@ -1,13 +0,0 @@
-
-ap.srcs += $(SRC_BOOZ)/booz_gps.c
-ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_ubx.h\"
-ap.srcs += $(SRC_BOOZ)/gps/booz_gps_ubx.c
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400 -DUART0_VIC_SLOT=5
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart0 -DGPS_LED=4
-else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart1 -DGPS_LED=3
-endif
-sim.CFLAGS += -DUSE_GPS
-sim.srcs += $(SRC_BOOZ)/booz_gps.c

Copied: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile 
(from rev 5579, 
paparazzi3/trunk/conf/autopilot/subsystems/booz_gps_skytraq.makefile)
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile  
                        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile  
2010-08-22 21:01:41 UTC (rev 5585)
@@ -0,0 +1,15 @@
+
+ap.srcs += $(SRC_BOOZ)/booz_gps.c
+ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_skytraq.h\"
+ap.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
+
+ap.CFLAGS += -DUSE_$(GPS_PORT) -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
+ap.CFLAGS += -DUSE_GPS -DGPS_LINK=$(GPS_PORT) -DGPS_LED=$(GPS_LED)
+
+ifeq ($(ARCHI), arm7)
+ap.CFLAGS += -D$(GPS_PORT)_VIC_SLOT=5
+endif
+
+
+sim.CFLAGS += -DUSE_GPS
+sim.srcs += $(SRC_BOOZ)/booz_gps.c