[paparazzi-commits] [5314] more subsystem makefile stuff

[Felix Ruess]

Revision: 5314
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5314
Author:   flixr
Date:     2010-08-11 18:46:27 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
more subsystem makefile stuff

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/fixedwing_common.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_gyro.makefile
    paparazzi3/trunk/conf/autopilot/tiny.makefile

Modified: paparazzi3/trunk/conf/autopilot/fixedwing_common.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing_common.makefile   2010-08-11 
18:46:20 UTC (rev 5313)
+++ paparazzi3/trunk/conf/autopilot/fixedwing_common.makefile   2010-08-11 
18:46:27 UTC (rev 5314)
@@ -1,10 +1,10 @@
 
 
 
-SRC_FIXEDWING=./
+SRC_FIXEDWING=.
 SRC_FIXEDWING_ARCH=$(SRC_FIXEDWING)/$(ARCH)
 SRC_FIXEDWING_TEST=$(SRC_FIXEDWING)/
 
-CFG_FIXEDWING=$(PAPARAZZI_SRC)/conf/autopilot/
+CFG_FIXEDWING=$(PAPARAZZI_SRC)/conf/autopilot
 
 FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile 
    2010-08-11 18:46:20 UTC (rev 5313)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile 
    2010-08-11 18:46:27 UTC (rev 5314)
@@ -1,6 +1,9 @@
 # attitude via IR sensors and standard assignment for tiny and twog
 
-ap.CFLAGS += -DUSE_$(ADC_CHANNEL_IR1) -DUSE_$(ADC_CHANNEL_IR2) 
-DUSE_$(ADC_CHANNEL_IR_TOP)
+ap.CFLAGS += -DADC_CHANNEL_IR1=$(ADC_IR1) -DUSE_$(ADC_IR1)
+ap.CFLAGS += -DADC_CHANNEL_IR2=$(ADC_IR2) -DUSE_$(ADC_IR2)
+ap.CFLAGS += -DADC_CHANNEL_IR_TOP=$(ADC_IR_TOP) -DUSE_$(ADC_IR_TOP)
+ap.CFLAGS += -DADC_CHANNEL_IR_NB_SAMPLES=$(ADC_IR_NB_SAMPLES)
 
 ap.CFLAGS += -DINFRARED
 ap.srcs += $(SRC_FIXEDWING)/infrared.c

Modified: paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_gyro.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_gyro.makefile  
2010-08-11 18:46:20 UTC (rev 5313)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_gyro.makefile  
2010-08-11 18:46:27 UTC (rev 5314)
@@ -1,5 +1,7 @@
 # Standard setup for roll stabilization with gyro on a tiny or twog
 
-ap.CFLAGS      += -DUSE_$(ADC_CHANNEL_GYRO_ROLL)
-ap.CFLAGS      += -DGYRO -DADXRS150
-ap.srcs        += $(SRC_FIXEDWING)/gyro.c
+ap.CFLAGS += -DADC_CHANNEL_GYRO_ROLL=$(ADC_GYRO_ROLL) -DUSE_$(ADC_GYRO_ROLL)
+ap.CFLAGS += -DADC_CHANNEL_GYRO_NB_SAMPLES=$(ADC_GYRO_NB_SAMPLES)
+
+ap.CFLAGS += -DGYRO -DADXRS150
+ap.srcs += $(SRC_FIXEDWING)/gyro.c

Modified: paparazzi3/trunk/conf/autopilot/tiny.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-08-11 18:46:20 UTC 
(rev 5313)
+++ paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-08-11 18:46:27 UTC 
(rev 5314)
@@ -16,13 +16,20 @@
 LPC21ISP_XTAL = 12000
 
 
-# default settings for tiny and twog
+### default settings for tiny and twog
 GPS_UART_NR    = 0
 GPS_BAUD       = 38400
 MODEM_UART_NR = 1
 MODEM_BAUD = 57600
 
-# a test program to setup actuators 
+ADC_IR1 = ADC_1
+ADC_IR2 = ADC_2
+ADC_IR_TOP = ADC_0
+ADC_IR_NB_SAMPLES = 16
+ADC_GYRO_ROLL = ADC_3
+ADC_GYRO_NB_SAMPLES = 16
+
+# a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
 setup_actuators.TARGET = setup_actuators
@@ -63,7 +70,7 @@
 usb_tunnel_0.TARGETDIR = usb_tunnel_0
 usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 
-DUART0_BAUD=B115200
 usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
-usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c 
+usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
 usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
 usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
 usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
@@ -74,9 +81,7 @@
 usb_tunnel_1.TARGETDIR = usb_tunnel_1
 usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 
-DUART1_BAUD=B115200
 usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
-usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c 
+usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
 usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
 usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
 usb_tunnel_1.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
-
-