diff --git a/Makefile.linux b/Makefile.linux index 21b3787..0949eb7 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -484,6 +484,7 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon $(INSTALL) telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin $(INSTALL) telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin $(INSTALL) telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin + $(INSTALL) telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin $(INSTALL) telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin $(INSTALL) telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin # diff --git a/Makefile.win b/Makefile.win index 5fc7281..ee6c75d 100644 --- a/Makefile.win +++ b/Makefile.win @@ -452,8 +452,6 @@ clean : z := $(notdir ${CURDIR}) -# Left out RPi Tracker due to Comcast upload size limit. - .PHONY: dist-win dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2ll.exe \ aclients.exe log2gpx.exe gen_packets.exe atest.exe ttcalc.exe \ @@ -470,8 +468,17 @@ dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2l CHANGES.md \ doc/User-Guide.pdf \ doc/Raspberry-Pi-APRS.pdf \ - doc/APRStt-Implementation-Notes.pdf \ + doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf \ + doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf \ doc/APRS-Telemetry-Toolkit.pdf \ + doc/APRStt-Implementation-Notes.pdf \ + doc/APRStt-interface-for-SARTrack.pdf \ + doc/APRStt-Listening-Example.pdf \ + doc/Raspberry-Pi-APRS.pdf \ + doc/Raspberry-Pi-APRS-Tracker.pdf \ + doc/Raspberry-Pi-SDR-IGate.pdf \ + doc/User-Guide.pdf \ + doc/WA8LMF-TNC-Test-CD-Results.pdf \ LICENSE* \ direwolf.conf \ direwolf.exe \ diff --git a/doc/APRS-Telemetry-Toolkit.pdf b/doc/APRS-Telemetry-Toolkit.pdf index 035bf89..68568bf 100644 Binary files a/doc/APRS-Telemetry-Toolkit.pdf and b/doc/APRS-Telemetry-Toolkit.pdf differ diff --git a/telemetry-toolkit/telem-seq.sh b/telemetry-toolkit/telem-seq.sh new file mode 100644 index 0000000..0d2a36d --- /dev/null +++ b/telemetry-toolkit/telem-seq.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# Generate sequence number as described here: +# https://github.com/wb2osz/direwolf/issues/9 +# +SEQ=`cat /tmp/seq 2>/dev/null` +SEQ=$(expr \( $SEQ + 1 \) % 1000) +echo $SEQ | tee /tmp/seq \ No newline at end of file diff --git a/telemetry-toolkit/telem-volts.conf b/telemetry-toolkit/telem-volts.conf index f0d24fa..dfcc08a 100644 --- a/telemetry-toolkit/telem-volts.conf +++ b/telemetry-toolkit/telem-volts.conf @@ -21,5 +21,8 @@ CBEACON delay=0:11 every=1:00 via=WIDE2-1 infocmd="telem-unit.pl MYCALL-9 Volts" # This is supplied to telem-data.pl as a command line argument. # The result is used as the info part of a custom beacon. -CBEACON delay=0:15 every=0:10 via=WIDE2-1 infocmd="telem-data.pl 0 `PYTHONPATH=~/Adafruit-Raspberry-Pi-Python-Code/Adafruit_ADS1x15 telem-volts.py`" +# Sequence numbers are generated as suggested here: +# https://github.com/wb2osz/direwolf/issues/9 + +CBEACON delay=0:15 every=0:10 via=WIDE2-1 infocmd="telem-data.pl `telem-seq.sh` `PYTHONPATH=~/Adafruit-Raspberry-Pi-Python-Code/Adafruit_ADS1x15 telem-volts.py`"