[paparazzi-commits] [4910] logger fixes

[Martin Mueller]

Revision: 4910
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4910
Author:   mmm
Date:     2010-05-17 19:35:55 +0000 (Mon, 17 May 2010)
Log Message:
-----------
logger fixes

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/logger_sd.xml
    paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml
    paparazzi3/trunk/sw/airborne/main_logger.c

Added Paths:
-----------
    paparazzi3/trunk/conf/airframes/mm/extra/logger_sd_adc.xml

Removed Paths:
-------------
    paparazzi3/trunk/conf/airframes/logger_sd_adc.xml

Modified: paparazzi3/trunk/conf/airframes/logger_sd.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/logger_sd.xml       2010-05-15 13:27:48 UTC 
(rev 4909)
+++ paparazzi3/trunk/conf/airframes/logger_sd.xml       2010-05-17 19:35:55 UTC 
(rev 4910)
@@ -55,6 +55,9 @@
 ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B9600 -DUSE_UART1_RX_ONLY
 ap.srcs += $(SRC_ARCH)/uart_hw.c
 
+#set SPI interface for SD card (0 or 1)
+ap.CFLAGS += -DHW_ENDPOINT_LPC2000_SPINUM=1
+
 #efsl
 ap.CFLAGS += -I $(SRC_ARCH)/efsl/inc -I $(SRC_ARCH)/efsl/conf
 

Deleted: paparazzi3/trunk/conf/airframes/logger_sd_adc.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/logger_sd_adc.xml   2010-05-15 13:27:48 UTC 
(rev 4909)
+++ paparazzi3/trunk/conf/airframes/logger_sd_adc.xml   2010-05-17 19:35:55 UTC 
(rev 4910)
@@ -1,105 +0,0 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
-
-<!--
-
-    Connects a microSD card to the SPI port of the Paparazzi Tiny. Keep cables
-    short, microSD card can be directly soldered to Molex cable. For now only
-    non SDHC SD cards (<= 2GB) are supported. address@hidden
-
-    microSD         TinyV2 SPI J3 
-    8 nc
-    7 DO            5 MISO
-    6 GND           1 GND
-    5 CLK           7 SCK
-    4 Vcc           2 +3V3
-    3 DI            4 MOSI
-    2 CS            3 SSEL
-    1 nc
-
-    Looking onto the gold plated connector side of the microSD card:
-
-    ###############
-    I 8 
-    I 7
-    I 6
-    I 5
-    I 4
-    I 3
-    I 2
-    I 1
-    ######    ##
-          \  I  \
-           ##    ##
-
--->
-
-<airframe name="Logger">
-
-  <section name="MAX11040">
-
-    <define name="MAXM_SS_PIN" value="20"/>
-    <define name="MAXM_SS_IODIR" value="IO0DIR"/>
-    <define name="MAXM_SS_IOSET" value="IO0SET"/>
-    <define name="MAXM_SS_IOCLR" value="IO0CLR"/>
-
-    <define name="MAXM_DRDY_PINSEL" value="PINSEL1"/>
-    <define name="MAXM_DRDY_PINSEL_BIT" value="0"/>
-    <define name="MAXM_DRDY_PINSEL_VAL" value="1"/>
-    <define name="MAXM_DRDY_EINT" value="0"/>
-    <define name="MAXM_DRDY_VIC_IT" value="VIC_EINT0"/>
-
-  </section>
-
- <makefile>
-
-CONFIG = \"tiny_2_1_1_usb.h\"
-
-include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
-
-FLASH_MODE=IAP
-
-ap.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DLOGGER
-ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c 
main_logger.c
-
-#choose one
-ap.CFLAGS += -DLOG_XBEE
-#ap.CFLAGS += -DLOG_PPRZ
-
-#set the speed
-ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 -DUSE_UART0_RX_ONLY
-ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUSE_UART1_RX_ONLY
-ap.srcs += $(SRC_ARCH)/uart_hw.c
-
-#set SPI interface for SD card (0 or 1)
-ap.CFLAGS += -DHW_ENDPOINT_LPC2000_SPINUM=0
-
-#efsl
-ap.CFLAGS += -I $(SRC_ARCH)/efsl/inc -I $(SRC_ARCH)/efsl/conf
-
-ap.srcs += $(SRC_ARCH)/efsl/src/efs.c $(SRC_ARCH)/efsl/src/plibc.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/disc.c $(SRC_ARCH)/efsl/src/partition.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/time.c $(SRC_ARCH)/efsl/src/fs.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/fat.c $(SRC_ARCH)/efsl/src/file.c
-ap.srcs += $(SRC_ARCH)/efsl/src/dir.c $(SRC_ARCH)/efsl/src/ls.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/mkfs.c $(SRC_ARCH)/efsl/src/debug.c
-ap.srcs += $(SRC_ARCH)/efsl/src/ioman.c $(SRC_ARCH)/efsl/src/ui.c
-ap.srcs += $(SRC_ARCH)/efsl/src/extract.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/lpc2000_spi.c 
-ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/sd.c
-#ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/lpc2000_dbg_printf.c
-
-#usb mass storage
-ap.CFLAGS += -DUSE_USB_MSC
-ap.CFLAGS += -I $(SRC_ARCH)/lpcusb -I $(SRC_ARCH)/lpcusb/examples
-
-ap.srcs += $(SRC_ARCH)/usb_msc_hw.c
-ap.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
-ap.srcs += $(SRC_ARCH)/lpcusb/examples/msc_bot.c 
$(SRC_ARCH)/lpcusb/examples/msc_scsi.c 
$(SRC_ARCH)/lpcusb/examples/blockdev_sd.c 
$(SRC_ARCH)/lpcusb/examples/lpc2000_spi0.c
-
-ap.CFLAGS += -DMAX11040_DRDY_VIC_SLOT=12 -DSSP_VIC_SLOT=11 -DUSE_MAX11040
-ap.srcs += max11040.c $(SRC_ARCH)/max11040_hw.c
-
-  </makefile>
-
-</airframe>
-

Copied: paparazzi3/trunk/conf/airframes/mm/extra/logger_sd_adc.xml (from rev 
4909, paparazzi3/trunk/conf/airframes/logger_sd_adc.xml)
===================================================================
--- paparazzi3/trunk/conf/airframes/mm/extra/logger_sd_adc.xml                  
        (rev 0)
+++ paparazzi3/trunk/conf/airframes/mm/extra/logger_sd_adc.xml  2010-05-17 
19:35:55 UTC (rev 4910)
@@ -0,0 +1,110 @@
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
+
+<!--
+
+    Connects a microSD card to the SPI port of the Paparazzi Tiny. Keep cables
+    short, microSD card can be directly soldered to Molex cable. For now only
+    non SDHC SD cards (<= 2GB) are supported. address@hidden
+
+    microSD         TinyV2 SPI J3 
+    8 nc
+    7 DO            5 MISO
+    6 GND           1 GND
+    5 CLK           7 SCK
+    4 Vcc           2 +3V3
+    3 DI            4 MOSI
+    2 CS            3 SSEL
+    1 nc
+
+    Looking onto the gold plated connector side of the microSD card:
+
+    ###############
+    I 8 
+    I 7
+    I 6
+    I 5
+    I 4
+    I 3
+    I 2
+    I 1
+    ######    ##
+          \  I  \
+           ##    ##
+
+    Also logs data from MAX11040 connected to SPI.
+
+-->
+
+<airframe name="Logger">
+
+  <section name="MAX11040">
+
+    <define name="MAXM_SS_PIN" value="20"/>
+    <define name="MAXM_SS_IODIR" value="IO0DIR"/>
+    <define name="MAXM_SS_IOSET" value="IO0SET"/>
+    <define name="MAXM_SS_IOCLR" value="IO0CLR"/>
+
+    <define name="MAXM_DRDY_PINSEL" value="PINSEL1"/>
+    <define name="MAXM_DRDY_PINSEL_BIT" value="0"/>
+    <define name="MAXM_DRDY_PINSEL_VAL" value="1"/>
+    <define name="MAXM_DRDY_EINT" value="0"/>
+    <define name="MAXM_DRDY_VIC_IT" value="VIC_EINT0"/>
+
+  </section>
+
+ <makefile>
+
+CONFIG = \"tiny_2_1_1_usb.h\"
+
+include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
+
+FLASH_MODE=IAP
+
+ap.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DLOGGER
+ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c 
main_logger.c
+
+#choose one
+ap.CFLAGS += -DLOG_XBEE
+#ap.CFLAGS += -DLOG_PPRZ
+
+#set the speed
+ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 -DUSE_UART0_RX_ONLY
+ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUSE_UART1_RX_ONLY
+ap.srcs += $(SRC_ARCH)/uart_hw.c
+
+#set SPI interface for SD card (0 or 1)
+ap.CFLAGS += -DHW_ENDPOINT_LPC2000_SPINUM=0
+
+#set the logger stop key to P0.13
+ap.CFLAGS += -DLOG_STOP_KEY=13
+
+#efsl
+ap.CFLAGS += -I $(SRC_ARCH)/efsl/inc -I $(SRC_ARCH)/efsl/conf
+
+ap.srcs += $(SRC_ARCH)/efsl/src/efs.c $(SRC_ARCH)/efsl/src/plibc.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/disc.c $(SRC_ARCH)/efsl/src/partition.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/time.c $(SRC_ARCH)/efsl/src/fs.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/fat.c $(SRC_ARCH)/efsl/src/file.c
+ap.srcs += $(SRC_ARCH)/efsl/src/dir.c $(SRC_ARCH)/efsl/src/ls.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/mkfs.c $(SRC_ARCH)/efsl/src/debug.c
+ap.srcs += $(SRC_ARCH)/efsl/src/ioman.c $(SRC_ARCH)/efsl/src/ui.c
+ap.srcs += $(SRC_ARCH)/efsl/src/extract.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/lpc2000_spi.c 
+ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/sd.c
+#ap.srcs += $(SRC_ARCH)/efsl/src/interfaces/lpc2000_dbg_printf.c
+
+#usb mass storage
+ap.CFLAGS += -DUSE_USB_MSC
+ap.CFLAGS += -I $(SRC_ARCH)/lpcusb -I $(SRC_ARCH)/lpcusb/examples
+
+ap.srcs += $(SRC_ARCH)/usb_msc_hw.c
+ap.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
+ap.srcs += $(SRC_ARCH)/lpcusb/examples/msc_bot.c 
$(SRC_ARCH)/lpcusb/examples/msc_scsi.c 
$(SRC_ARCH)/lpcusb/examples/blockdev_sd.c 
$(SRC_ARCH)/lpcusb/examples/lpc2000_spi0.c
+
+ap.CFLAGS += -DMAX11040_DRDY_VIC_SLOT=12 -DSSP_VIC_SLOT=11 -DUSE_MAX11040
+ap.srcs += max11040.c $(SRC_ARCH)/max11040_hw.c
+
+  </makefile>
+
+</airframe>
+

Modified: paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml  2010-05-15 13:27:48 UTC 
(rev 4909)
+++ paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml  2010-05-17 19:35:55 UTC 
(rev 4910)
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!DOCTYPE airframe SYSTEM "../../airframe.dtd">
 
 <!--
       just remain quiet

Modified: paparazzi3/trunk/sw/airborne/main_logger.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_logger.c  2010-05-15 13:27:48 UTC (rev 
4909)
+++ paparazzi3/trunk/sw/airborne/main_logger.c  2010-05-17 19:35:55 UTC (rev 
4910)
@@ -101,8 +101,10 @@
 #define TRUE (!FALSE)
 #endif
 
+#ifndef LOG_STOP_KEY
 /* BUTTON that stops logging (BUTTON = P0.7, DTR = P0.13, INT1 = P0.14) */
-#define STOP_KEY 13
+#define LOG_STOP_KEY 7
+#endif
 
 /* USB Vbus (= P0.23) */
 #define VBUS_PIN 23
@@ -263,7 +265,10 @@
   case XBEE_UNINIT:
     if (c == XBEE_START)
     {
+// serial receive broken with MAX
+#ifndef USE_MAX11040
       xbeel_timestamp = getclock();
+#endif
       xbeel_status++;
     }
     break;
@@ -294,8 +299,10 @@
     for (i = 0; i < xbeel_payload_len-XBEE_RFDATA_OFFSET; i++) {
       log_buffer[i+LOG_DATA_OFFSET] = xbeel_payload[i+XBEE_RFDATA_OFFSET];
     }
-// do not log as broken
-//    log_payload(xbeel_payload_len-XBEE_RFDATA_OFFSET, source, 
xbeel_timestamp);
+// serial receive broken with MAX
+#ifndef USE_MAX11040
+    log_payload(xbeel_payload_len-XBEE_RFDATA_OFFSET, source, xbeel_timestamp);
+#endif
     LED_TOGGLE(3);
     goto restart;
   }
@@ -315,7 +322,10 @@
   switch (pprzl_status) {
   case UNINIT:
     if (c == STX)
+// serial receive broken with MAX
+#ifndef USE_MAX11040
       pprzl_timestamp = getclock();
+#endif
       pprzl_status++;
     break;
   case GOT_STX:
@@ -343,7 +353,10 @@
     for (i = 0; i < pprzl_payload_len; i++) {
       log_buffer[i+LOG_DATA_OFFSET] = pprzl_payload[i];
     }
+// serial receive broken with MAX
+#ifndef USE_MAX11040
     log_payload(pprzl_payload_len, source, pprzl_timestamp);
+#endif
     LED_TOGGLE(3);
     goto restart;
   }
@@ -380,7 +393,7 @@
     }
 
     /* write to SD until key is pressed */
-    while ((IO0PIN & _BV(STOP_KEY))>>STOP_KEY)
+    while ((IO0PIN & _BV(LOG_STOP_KEY))>>LOG_STOP_KEY)
     {
 
 #ifdef USE_MAX11040
@@ -478,7 +491,7 @@
         } else {
           LED_OFF(2);
         }
-        if (((IO0PIN & _BV(STOP_KEY))>>STOP_KEY) == 1) { 
+        if (((IO0PIN & _BV(LOG_STOP_KEY))>>LOG_STOP_KEY) == 1) { 
           waitloop=0;
         } else { 
           waitloop++;
@@ -493,7 +506,7 @@
       }
     }
     LED_ON(2);
-    while (((IO0PIN & _BV(STOP_KEY))>>STOP_KEY) == 0); 
+    while (((IO0PIN & _BV(LOG_STOP_KEY))>>LOG_STOP_KEY) == 0); 
   } 
 
   return 0;