add pprz/xbee message format configuration option for logger

paparazzi · Mar 2, 2012 · bfd067a · bfd067a
1 parent 0540d1e
commit bfd067a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/conf/airframes/logger_sd.xml b/conf/airframes/logger_sd.xml
@@ -37,6 +37,7 @@
 
   <firmware name="logger">
     <target name="ap" board="tiny_2.11" >
+      <configure name="LOG_MSG_FMT" value="LOG_PPRZ"/>
       <configure name="SPI_CHANNEL" value="1" />
       <configure name="UART0_BAUD" value="B9600" />
       <configure name="UART1_BAUD" value="B9600" />

diff --git a/conf/autopilot/logger.makefile b/conf/autopilot/logger.makefile
@@ -34,10 +34,10 @@ ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DUSE_LED
 ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c $(SRC_FIRMWARE)/main_logger.c
 
-#choose one
-ap.CFLAGS += -DLOG_XBEE
-#ap.CFLAGS += -DLOG_PPRZ
-
+# PPRZ message format is default
+ifndef LOG_MSG_FMT
+LOG_MSG_FMT = LOG_PPRZ
+endif
 
 #set the speed
 ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=$(UART0_BAUD) -DUSE_UART0_RX_ONLY
@@ -50,6 +50,9 @@ ap.srcs += mcu.c
 #set SPI interface for SD card (0 or 1)
 ap.CFLAGS += -DHW_ENDPOINT_LPC2000_SPINUM=$(SPI_CHANNEL)
 
+#message format pprz/xbee
+ap.CFLAGS += -D$(LOG_MSG_FMT)
+
 #LPC2148 USB hw module needs at least 18MHz PCLK
 ap.CFLAGS += -DUSE_USB_HIGH_PCLK