Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-23 04:45:37 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

add usb_tunnel to setup.makefile

Browse Source
This commit is contained in:
Felix Ruess
2010-10-08 21:48:56 +00:00
parent aa94b041e0
commit 2cd8849e28
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/microjet_example.xml
+2
View File
@@ -186,6 +186,8 @@
<firmware name="setup">
<target name="tunnel" board="tiny_1.1" />
<target name="usb_tunnel_0" board="tiny_1.1" />
<target name="usb_tunnel_1" board="tiny_1.1" />
<target name="setup_actuators" board="tiny_1.1" />
</firmware>
conf/airframes/twinjet_example.xml
+4 -2
View File
@@ -33,8 +33,10 @@
</firmware>
<firmware name="setup">
<target name="tunnel" board="twog_1" />
<target name="setup_actuators" board="twog_1" />
<target name="tunnel" board="twog_1" />
<target name="usb_tunnel_0" board="twog_1" />
<target name="usb_tunnel_1" board="twog_1" />
<target name="setup_actuators" board="twog_1" />
</firmware>
<servos>
conf/autopilot/setup.makefile
+30 -7
View File
@@ -14,21 +14,44 @@ SRC_SETUP_TEST=$(SRC_SETUP)/
SETUP_INC = -I$(SRC_SETUP) -I$(SRC_SETUP_ARCH)
$(TARGET).CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
# for the usb_tunnel we need to set PCLK higher
# so we just use tiny_2_1_1_usb.h as board file for the usb tunnels
ifeq ($(TARGET), usb_tunnel_0)
usb_tunnel_0.CFLAGS += -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\"
else
ifeq ($(TARGET), usb_tunnel_1)
usb_tunnel_1.CFLAGS += -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\"
else
$(TARGET).CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
endif
endif
# a test program to tunnel between both uart
tunnel.CFLAGS += -DFBW -DLED
tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
# a configuration program to access both uart through usb
usb_tunnel_0.CFLAGS += -DFBW -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)/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
usb_tunnel_1.CFLAGS += -DFBW -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)/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
# a test program to setup actuators
setup_actuators.CFLAGS += -DFBW -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017
setup_actuators.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DDOWNLINK_DEVICE=Uart1 -DPPRZ_UART=Uart1
setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ
setup_actuators.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DDOWNLINK_DEVICE=Uart1 -DPPRZ_UART=Uart1
setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ
setup_actuators.CFLAGS += -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1
setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c downlink.c actuators.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4017_hw.c main.c