diff options
| -rw-r--r-- | altosui/AltosKML.java | 6 | ||||
| -rw-r--r-- | ao-tools/ao-stmload/Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/megametrum-v0.1/stlink-pins | 41 |
4 files changed, 54 insertions, 5 deletions
diff --git a/altosui/AltosKML.java b/altosui/AltosKML.java index 2993607b..ff0734b8 100644 --- 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 77979daf..375896ea 100644 --- 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 10bf9abf..bcd2dcac 100644 --- 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 index 00000000..71042acc --- /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) |