Merge branch 'master' into pwmin

diff --git a/altosui/AltosKML.java b/altosui/AltosKML.java
index 2993607be281ca1840dffd7b83f04f6dafef5b23..ff0734b8cbbe25a36c8edb40058b79809d13603e 100644 (file)
--- a/altosui/AltosKML.java
+++ b/altosui/AltosKML.java
@@ -133,6 +133,12 @@ public class AltosKML implements AltosWriter {
 
                if (gps == null)
                        return;
+               if ((record.seen & (AltosRecord.seen_flight)) == 0)
+                       return;
+               if ((record.seen & (AltosRecord.seen_gps_lat)) == 0)
+                       return;
+               if ((record.seen & (AltosRecord.seen_gps_lon)) == 0)
+                       return;
                if (!started) {
                        start(record);
                        started = true;

diff --git a/ao-tools/ao-stmload/Makefile.am b/ao-tools/ao-stmload/Makefile.am
index 77979dafe1691ba6b70d1ea2abc625ef02ff4024..375896ea22af09343837a1474c416d9e0205cf25 100644 (file)
--- a/ao-tools/ao-stmload/Makefile.am
+++ b/ao-tools/ao-stmload/Makefile.am
@@ -2,12 +2,9 @@ bin_PROGRAMS=ao-stmload
 
 LIBSTLINKDIR=/local/src/stlink
 
-AM_CFLAGS=-I$(LIBSTLINKDIR)/src $(LIBUSB_CFLAGS) -I../lib
+AM_CFLAGS=$(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS) -I../lib
 
-AO_STMLOAD_LIBS=$(LIBSTLINKDIR)/libstlink.a
-ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-
-ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
 
 ao_stmload_SOURCES=ao-stmload.c
 

diff --git a/configure.ac b/configure.ac
index 10bf9abfecb6177c472f91fc8505e443e373dc82..bcd2dcac0d0ebb713f3c3c0ccef43bb900fa3b10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,11 @@ AC_CHECK_LIB(readline, readline)
 
 PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
+AC_CHECK_HEADERS(libelf.h libelf/libelf.h, [break])
+AC_CHECK_HEADERS(gelf.h libelf/gelf.h, [break])
+
+PKG_CHECK_MODULES([LIBSTLINK], [stlink])
+
 AC_OUTPUT([
 Makefile
 altoslib/Makefile

diff --git a/src/megametrum-v0.1/stlink-pins b/src/megametrum-v0.1/stlink-pins
new file mode 100644 (file)
index 0000000..71042ac
--- /dev/null
+++ b/src/megametrum-v0.1/stlink-pins
@@ -0,0 +1,41 @@
+       ST discovery card pins
+
+1      AIN-1
+2      JTCK
+3      GND
+4      JTMS
+5      NRST
+6      SWO
+
+MM misc connector
+
+1      GND
+2      reset_n
+3      boot0
+4      tx1
+5      rx1
+6      +3.3V
+7      GND
+8      jtms
+9      jtck
+10     jtdi
+11     jtdo
+12     jntrst
+13     sda2
+14     scl2
+15     pe1
+16     pe0
+
+For debugging:
+
+       ST      MM
+JTCK   2       9
+GND    3       7
+JTMS   4       8
+NRST   5       2
+
+MegaAccel:
+
+Jumpers
+PC0 (pin15) (blue)     PE0 (pin97)     accel_ref       (debug 16)
+PC1 (pin16) (green)    PE1 (pin98)     accel           (debug 15)