[paparazzi-commits] [4527] add support for maxstream API mode in HITL with USB

[Pascal Brisset]

Revision: 4527
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4527
Author:   hecto
Date:     2010-02-02 21:49:23 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
 add support for maxstream API mode in HITL with USB

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/hitl_usb.xml
    paparazzi3/trunk/sw/airborne/print.h

Modified: paparazzi3/trunk/conf/airframes/hitl_usb.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/hitl_usb.xml        2010-02-02 02:38:28 UTC 
(rev 4526)
+++ paparazzi3/trunk/conf/airframes/hitl_usb.xml        2010-02-02 21:49:23 UTC 
(rev 4527)
@@ -122,7 +122,14 @@
 # Through USB
 ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
 ap.CFLAGS += -DDOWNLINK_FBW_DEVICE=UsbS -DDOWNLINK_AP_DEVICE=UsbS 
-DPPRZ_UART=UsbS -DDATALINK=PPRZ
-ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/usb_ser_hw.c 
datalink.c pprz_transport.c
+ap.srcs += pprz_transport.c
+
+#XBEE ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=XBeeTransport 
-DUSE_USB_SERIAL
+#XBEE ap.CFLAGS += -DDOWNLINK_FBW_DEVICE=UsbS -DDOWNLINK_AP_DEVICE=UsbS 
-DXBEE_UART=UsbS -DDATALINK=XBEE
+#XBEE ap.srcs += xbee.c
+
+
+ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/usb_ser_hw.c datalink.c
 ap.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
 ap.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
 

Modified: paparazzi3/trunk/sw/airborne/print.h
===================================================================
--- paparazzi3/trunk/sw/airborne/print.h        2010-02-02 02:38:28 UTC (rev 
4526)
+++ paparazzi3/trunk/sw/airborne/print.h        2010-02-02 21:49:23 UTC (rev 
4527)
@@ -26,6 +26,7 @@
 #define PRINT_H
 
 #include "uart.h"
+#include "usb_serial.h"
 
 #define _PrintString(out_fun, s) { \
   uint8_t i = 0;                  \
@@ -67,6 +68,10 @@
 #define Uart1PrintHex16(c) _PrintHex16(uart1_transmit, c)
 #define Uart1PrintString(s) _PrintString(uart1_transmit, s)
 
+#define UsbSPrintHex(c) _PrintHex(VCOM_putchar, c)
+#define UsbSPrintHex16(c) _PrintHex16(VCOM_putchar, c)
+#define UsbSPrintString(s) _PrintString(VCOM_putchar, s)
 
+
 #endif /* PRINT_H */