Version 1.1

	modified:   .gitattributes
	modified:   APRStt-Implementation-Notes.pdf
	modified:   CHANGES.txt
	modified:   Makefile.linux
	modified:   Makefile.win
	new file:   Raspberry-Pi-APRS-Tracker.pdf
	modified:   Raspberry-Pi-APRS.pdf
	modified:   User-Guide.pdf
	modified:   aclients.c
	modified:   aprs_tt.c
	modified:   aprs_tt.h
	modified:   atest.c
	modified:   audio.c
	modified:   audio.h
	modified:   audio_win.c
	modified:   ax25_pad.c
	modified:   ax25_pad.h
	modified:   beacon.c
	modified:   beacon.h
	modified:   config.c
	modified:   config.h
	modified:   decode_aprs.c
	modified:   decode_aprs.h
	modified:   demod_afsk.c
	modified:   digipeater.c
	modified:   digipeater.h
	modified:   direwolf.c
	modified:   direwolf.conf
	modified:   direwolf.h
	modified:   dsp.c
	modified:   dwgps.c
	modified:   encode_aprs.c
	modified:   encode_aprs.h
	modified:   fsk_demod_state.h
	new file:   grm_sym.h
	modified:   hdlc_rec.c
	modified:   hdlc_rec2.c
	modified:   hdlc_rec2.h
	modified:   kiss.c
	modified:   kiss_frame.c
	modified:   kiss_frame.h
	modified:   kissnet.c
	modified:   latlong.c
	modified:   latlong.h
	new file:   log.c
	new file:   log.h
	new file:   log2gpx.c
	new file:   mgn_icon.h
	modified:   misc/README-dire-wolf.txt
	modified:   multi_modem.c
	new file:   nmea.c
	new file:   nmea.h
	modified:   ptt.c
	modified:   rdq.c
	modified:   regex/README-dire-wolf.txt
	new file:   rpack.h
	modified:   rrbb.c
	modified:   rrbb.h
	modified:   server.c
	modified:   symbols-new.txt
	modified:   symbols.c
	modified:   symbolsX.txt
	new file:   telemetry.c
	new file:   telemetry.h
	modified:   textcolor.c
	modified:   tocalls.txt
	modified:   utm/README.txt
	modified:   version.h
	modified:   xmit.c
	modified:   xmit.h

Author: wb2osz

.gitattributes

@@ -15,3 +15,18 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# My rules to remove any doubt
+
+*.c 		text
+*.cpp		text
+*.h		text
+*.pl		text
+Makefile*	text
+*.txt		text
+*.desktop	text
+*.conf		text
+*.rc		text
+
+*.ico		binary
+*.png		binary

APRStt-Implementation-Notes.pdf

@@ -3,6 +3,78 @@ Revision history
 ----------------
 
 
+-----------
+Version 1.1  -- December 2014
+-----------
+
+* Changes since beta test version.
+
+It is still highly recommended, but no longer mandatory, that
+beaconing be enabled for digipeating to work.
+
+
+* Known problems.
+
+Sometimes kissattach fails to connect with "direwolf -p".
+The User Guide and Raspberry Pi APRS document have a couple work-arounds.
+
+
+
+-----------
+Version 1.1 -- Beta Test 1 -- November 2014
+-----------
+
+* New Features:
+
+Logging of received packets and utility to convert log file
+into GPX format.
+
+AGW network port formerly allowed only one connection at a 
+time.  It can now accept 3 client applications at the same time.  
+(Same has not yet been done for network KISS port.)
+
+Frequency / offset / tone standard formats are now recognized.
+Non-standard attempts, in the comment, are often detected and
+a message suggests the correct format.
+
+Telemetry is now recognized.  Messages are printed for
+usage that does not adhere to the published standard.
+
+Tracker function transmits location from GPS position.
+New configuration file options: TBEACON and SMARTBEACONING.
+(For Linux only.   Warning - has not been well tested.)
+
+Experimental packet regeneration feature for HF use.
+Will be documented later if proves to be useful...
+
+Several enhancements for trying to fix incorrect CRC.
+- Additional types of attempts to fix a bad CRC.
+- Optimized code to reduce execution time.
+- Improved detection of duplicate packets from different fixup attempts.
+- Set limit on number of packets in fix up later queue.
+
+Beacon positions can be specified in either latitude / longitude
+or UTM coordinates.
+
+
+* Bugs fixed:
+
+For Windows version, maximum serial port was COM9.
+It is now possible to use COM10 and higher.
+
+Fixed issue with KISS protocol decoder state that showed up
+only with "binary" data in packets (e.g.  RMS Express).
+
+An extra 00 byte was being appended to packets from AGW
+network protocol 'K' messages.
+
+Invalid data from an AGW client application could cause an
+application crash.
+
+OSS (audio interface for non-Linux versions of Unix) should 
+be better now.
+
+
 -----------
 Version 1.0a	May 2014
 -----------
@@ -36,6 +108,13 @@ Improved support for UTF-8 character set.
 
 Improved troubleshooting display for APRStt macros.
 
+In earlier versions, the DTMF decoder was always active because it 
+took a negligible amount of CPU time.  Unfortunately this sometimes 
+resulted in too many false positives from some other types of digital 
+transmissions heard on HF. Starting in version 1.0, the DTMF decoder 
+is enabled only when the APRStt gateway is configured.
+
+
 
 
 -----------
@@ -107,7 +186,7 @@ APRStt-Implementation-Notes.pdf
 
 
 -----------
-Version 0.6
+Version 0.6	February 2013
 -----------
 
 
@@ -152,15 +231,15 @@ run this in another window:
 
 
 -----------
-Version 0.5
+Version 0.5	March 2012
 -----------
 
 
 More error checking and messages for invalid APRS data.
 
 
 -----------
-Version 0.4
+Version 0.4	September 2011
 -----------
 
 First general availability.

CHANGES.txt

@@ -2,7 +2,7 @@
 # Makefile for Linux version of Dire Wolf.
 #
 
-all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients
+all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx
 
 CC = gcc
 
@@ -81,18 +81,30 @@ CC = gcc
 arch := $(shell echo | gcc -E -dM - | grep __i386__)
 
 ifneq ($(arch),)
-CFLAGS := -DUSE_ALSA -O3 -march=pentium3 -pthread
+# You might see improvement with -march fine tuned to your hardware.
+# Probably should keep pentium3 if you will be redistributing binaries
+# to other people.
+CFLAGS := -O3 -march=pentium3 -pthread -Iutm
 else
-CFLAGS := -DUSE_ALSA -O3 -pthread
+CFLAGS := -O3 -pthread -Iutm
 endif
 
 
-# Uncomment following lines to enable GPS interface.
-# DO NOT USE THIS.  Still needs more work.
+
+# If you want to use OSS (for FreeBSD, OpenBSD) instead of
+# ALSA (for Linux), comment out the two lines below.
+
+CFLAGS += -DUSE_ALSA
+LDLIBS += -lasound
+
+
+# Uncomment following lines to enable GPS interface & tracker function.
+
 #CFLAGS += -DENABLE_GPS
 #LDLIBS += -lgps
 
 
+
 # Name of current directory.
 # Used to generate zip file name for distribution.
 
@@ -107,9 +119,9 @@ direwolf : direwolf.o config.o  demod.o dsp.o demod_afsk.o demod_9600.o hdlc_rec
 		decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
 		gen_tone.o audio.o digipeater.o dedupe.o tq.o xmit.o \
 		ptt.o beacon.o dwgps.o encode_aprs.o latlong.o encode_aprs.o latlong.o textcolor.o \
-		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o \
+		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o nmea.o log.o telemetry.o \
 		utm.a
-	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lrt -lasound $(LDLIBS) -lm
+	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lrt $(LDLIBS) -lm
 
 
 # Optimization for slow processors.
@@ -132,40 +144,51 @@ LatLong-UTMconversion.o : utm/LatLong-UTMconversion.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 
 
-# Optional install step. 
+# Optional installation into /usr/local/...
+# Needs to be run as root or with sudo.
+
 # TODO: Review file locations.
-# TODO: Handle Linux variations correctly.
-# The Raspberry Pi has ~/Desktop but Ubuntu does not.
-# For now, just put reference to it at the end so only last step fails.
 
 install : direwolf decode_aprs tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop
-	sudo install direwolf /usr/local/bin
-	sudo install decode_aprs /usr/local/bin
-	sudo install text2tt /usr/local/bin
-	sudo install tt2text /usr/local/bin
-	sudo install ll2utm /usr/local/bin
-	sudo install utm2ll /usr/local/bin
-	sudo install aclients /usr/local/bin
-	sudo install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
-	sudo install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
-	sudo install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
-	sudo install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
-	sudo install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
-	cp direwolf.conf ~
+	install direwolf /usr/local/bin
+	install decode_aprs /usr/local/bin
+	install text2tt /usr/local/bin
+	install tt2text /usr/local/bin
+	install ll2utm /usr/local/bin
+	install utm2ll /usr/local/bin
+	install aclients /usr/local/bin
+	install log2gpx /usr/local/bin
+	install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
+	install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
+	install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
+	install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
+	install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
+	install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
+	install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
+	install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
+	install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
+	install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
+	install -D --mode=644 Raspberry-Pi-APRS-Tracker.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
+	install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
+	install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
+
+
+# The Raspberry Pi has ~/Desktop but Ubuntu does not.
+
+# TODO: Handle Linux variations correctly.
+
+
+install-rpi : dw-start.sh
 	cp dw-start.sh ~
-	sudo install -D --mode=644 CHANGES.txt /usr/local/share/doc/direwolf/CHANGES.txt
-	sudo install -D --mode=644 LICENSE-dire-wolf.txt /usr/local/share/doc/direwolf/LICENSE-dire-wolf.txt
-	sudo install -D --mode=644 LICENSE-other.txt /usr/local/share/doc/direwolf/LICENSE-other.txt
-	sudo install -D --mode=644 User-Guide.pdf /usr/local/share/doc/direwolf/User-Guide.pdf
-	sudo install -D --mode=644 Raspberry-Pi-APRS.pdf /usr/local/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-	sudo install -D --mode=644 APRStt-Implementation-Notes.pdf /usr/local/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-	sudo install -D --mode=644 Quick-Start-Guide-Windows.pdf /usr/local/share/doc/direwolf/Quick-Start-Guide-Windows.pdf
 	ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
 
+install-conf : direwolf.conf
+	cp direwolf.conf ~
+
 
 # Separate application to decode raw data.
 
-decode_aprs : decode_aprs.c symbols.c ax25_pad.c textcolor.c fcs_calc.c
+decode_aprs : decode_aprs.c symbols.c ax25_pad.c textcolor.c fcs_calc.c latlong.c log.c telemetry.o
 	$(CC) $(CFLAGS) -o decode_aprs -DTEST $^ -lm
 
 
@@ -182,32 +205,39 @@ tt2text : tt_text.c
 # Convert between Latitude/Longitude and UTM coordinates.
 
 ll2utm : ll2utm.c utm.a
-	$(CC) $(CFLAGS) -I utm -o $@ $^ -lm
+	$(CC) $(CFLAGS) -o $@ $^ -lm
 
 utm2ll : utm2ll.c utm.a
-	$(CC) $(CFLAGS) -I utm -o $@ $^ -lm
+	$(CC) $(CFLAGS) -o $@ $^ -lm
 
 
+# Convert from log file to GPX.
+
+log2gpx : log2gpx.c 
+	$(CC) $(CFLAGS) -o $@ $^ -lm
+
 
 # Test application to generate sound.
 
 gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c textcolor.c 
-	$(CC) $(CFLAGS) -o $@ $^ -lasound -lm
+	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) -lm
 
 demod.o : tune.h
 demod_afsk.o : tune.h
 demod_9600.o : tune.h
 
-testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o fcs_calc.c ax25_pad.c decode_aprs.c symbols.c tune.h textcolor.c
+testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
+		fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c tune.h textcolor.c
 	$(CC) $(CFLAGS) -o atest $^ -lm
 	./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
 
 
 # Unit test for AFSK demodulator
 
 
-atest : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o fcs_calc.c ax25_pad.c decode_aprs.c symbols.c textcolor.c
-	$(CC) $(CFLAGS) -o $@ $^ -lm
+atest : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
+		fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c textcolor.c
+	$(CC) $(CFLAGS) -o $@ $^ -lm -lrt
 	time ./atest ../direwolf-0.2/02_Track_2.wav 
 
 # Unit test for inner digipeater algorithm
@@ -233,6 +263,14 @@ udptest : udp_test.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec
 	./udptest
 
 
+# Unit test for telemetry decoding.
+
+
+etest : telemetry.c ax25_pad.c fcs_calc.c textcolor.c misc.a regex.a
+	$(CC) $(CFLAGS) -o $@ $^ -lm -lrt
+	./etest
+	
+
 # Multiple AGWPE network or serial port clients to test TNCs side by side.
 
 aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.c
@@ -241,7 +279,7 @@ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.c
 
 SRCS = direwolf.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c multi_modem.c fcs_calc.c ax25_pad.c decode_aprs.c symbols.c \
 		server.c kiss.c kissnet.c kiss_frame.c hdlc_send.c fcs_calc.c gen_tone.c audio.c \
-		digipeater.c dedupe.c tq.c xmit.c beacon.c encode_aprs.c latlong.c encode_aprs.c latlong.c
+		digipeater.c dedupe.c tq.c xmit.c beacon.c encode_aprs.c latlong.c encode_aprs.c latlong.c telemetry.c log.c
 
 
 depend : $(SRCS)
@@ -256,12 +294,12 @@ clean :
 # Package it up for distribution.
 
 dist-src : CHANGES.txt  User-Guide.pdf Quick-Start-Guide-Windows.pdf Raspberry-Pi-APRS.pdf \
-		direwolf.desktop dw-start.sh 
+		Raspberry-Pi-APRS-Tracker.pdf direwolf.desktop dw-start.sh 
 	rm -f fsk_fast_filter.h
 	echo " " > tune.h
 	rm -f ../$z-src.zip
 	(cd .. ; zip $z-src.zip $z/CHANGES.txt $z/LICENSE* \
-		$z/User-Guide.pdf $z/Quick-Start-Guide-Windows.pdf $z/Raspberry-Pi-APRS.pdf \
+		$z/User-Guide.pdf $z/Quick-Start-Guide-Windows.pdf $z/Raspberry-Pi-APRS.pdf Raspberry-Pi-APRS-Tracker.pdf \
 		$z/Makefile* $z/*.c $z/*.h $z/regex/* $z/misc/* $z/utm/* \
 		$z/*.conf $z/tocalls.txt $z/symbols-new.txt $z/symbolsX.txt \
 		$z/dw-icon.png $z/dw-icon.rc $z/dw-icon.ico \
@@ -277,11 +315,25 @@ dist-src : CHANGES.txt  User-Guide.pdf Quick-Start-Guide-Windows.pdf Raspberry-P
 #Raspberry-Pi-APRS.pdf : Raspberry-Pi-APRS.docx
 #	echo "***** Raspberry-Pi-APRS.pdf is out of date *****" 
 
+#Raspberry-Pi-APRS-Tracker.pdf : Raspberry-Pi-APRS-Tracker.docx
+#	echo "***** Raspberry-Pi-APRS-Tracker.pdf is out of date *****" 
+
 
 backup :
 	mkdir /cygdrive/e/backup-cygwin-home/`date +"%Y-%m-%d"`
 	cp -r . /cygdrive/e/backup-cygwin-home/`date +"%Y-%m-%d"`
 
+#
+# The locations below appear to be the most recent.
+# The copy at http://www.aprs.org/tocalls.txt is out of date.
+#
+
+tocalls-symbols :
+	wget http://www.aprs.org/aprs11/tocalls.txt -O tocalls.txt
+	wget http://www.aprs.org/symbols/symbols-new.txt -O symbols-new.txt
+	wget http://www.aprs.org/symbols/symbolsX.txt -O symbolsX.txt
+
+
 #
 # The following is updated by "make depend"
 #