diff --git a/Makefile.linux b/Makefile.linux index 97664a7..2b4e42e 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -510,16 +510,17 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf # -# Sample config files also go into the doc directory. +# Various sample config and other files go into examples under the doc directory. # When building from source, these can be put in home directory with "make install-conf". # When installed from .DEB or .RPM package, the user will need to copy these to # the home directory or other desired location. -# Someone suggested that these could go into an "examples" subdirectory under doc. # - $(INSTALL) -D --mode=644 direwolf.conf $(INSTALLDIR)/share/doc/direwolf/direwolf.conf - $(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf/telem-m0xer-3.txt - $(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf/telem-balloon.conf - $(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf/telem-volts.conf + $(INSTALL) -D --mode=644 direwolf.conf $(INSTALLDIR)/share/doc/direwolf/examples/direwolf.conf + $(INSTALL) -D --mode=644 dw-start.sh $(INSTALLDIR)/share/doc/direwolf/examples/dw-start.sh + $(INSTALL) -D --mode=644 sdr.conf $(INSTALLDIR)/share/doc/direwolf/examples/sdr.conf + $(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt + $(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-balloon.conf + $(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-volts.conf # # "man" pages # @@ -552,6 +553,7 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon .PHONY: install-conf install-conf : direwolf.conf cp direwolf.conf ~ + cp sdr.conf ~ cp telemetry-toolkit/telem-m0xer-3.txt ~ cp telemetry-toolkit/telem-*.conf ~ ifneq ($(wildcard $(HOME)/Desktop),) diff --git a/doc/Raspberry-Pi-APRS.pdf b/doc/Raspberry-Pi-APRS.pdf index 942085f..4338a9f 100644 Binary files a/doc/Raspberry-Pi-APRS.pdf and b/doc/Raspberry-Pi-APRS.pdf differ diff --git a/doc/Raspberry-Pi-SDR-IGate.pdf b/doc/Raspberry-Pi-SDR-IGate.pdf index 6420a52..75a6239 100644 Binary files a/doc/Raspberry-Pi-SDR-IGate.pdf and b/doc/Raspberry-Pi-SDR-IGate.pdf differ diff --git a/doc/User-Guide.pdf b/doc/User-Guide.pdf index d3ebdff..bde7dca 100644 Binary files a/doc/User-Guide.pdf and b/doc/User-Guide.pdf differ diff --git a/dw-start.sh b/dw-start.sh index cec1723..ac86396 100644 --- a/dw-start.sh +++ b/dw-start.sh @@ -14,11 +14,20 @@ # This script has some specifics the Raspberry Pi. # Some adjustments might be needed for other Linux variations. # + +# +# When running from cron, we have a very minimal environment +# including PATH=/usr/bin:/bin. +# + +export PATH=/usr/local/bin:$PATH + # First wait a little while in case we just rebooted # and the desktop hasn't started up yet. # sleep 30 +LOGFILE=/tmp/dw-start.log # # Nothing to do if it is already running. @@ -28,7 +37,7 @@ a=`pgrep direwolf` if [ "$a" != "" ] then #date >> /tmp/dw-start.log - #echo "Already running." >> /tmp/dw-start.log + #echo "Already running." >> $LOGFILE exit fi @@ -52,26 +61,40 @@ then export DISPLAY="$d" fi -echo "DISPLAY=$DISPLAY" >> /tmp/dw-start.log +echo "DISPLAY=$DISPLAY" >> $LOGFILE -echo "Start up application." >> /tmp/dw-start.log +echo "Start up application." >> $LOGFILE + +# +# For normal operation as TNC, digipeater, IGate, etc. +# Print audio statistics each 100 seconds for troubleshooting. +# + +DWCMD="direwolf -a 100" + +# Alternative for running with SDR receiver. +# Piping one application into another makes it a little more complicated. +# We need to use bash for the | to be recognized. + +#DWCMD="bash -c 'rtl_fm -f 144.39M - | direwolf -c sdr.conf -r 24000 -D 1 -'" # # Adjust for your particular situation: gnome-terminal, xterm, etc. # + if [ -x /usr/bin/lxterminal ] then - /usr/bin/lxterminal -t "Dire Wolf" -e "/usr/local/bin/direwolf -a 100" & + /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" & elif [ -x /usr/bin/xterm ] then - /usr/bin/xterm -bg white -fg black -e "/usr/local/bin/direwolf -a 100" & + /usr/bin/xterm -bg white -fg black -e "$DWCMD" & elif [ -x /usr/bin/x-terminal-emulator ] then - /usr/bin/x-terminal-emulator -e "/usr/local/bin/direwolf -a 100" & + /usr/bin/x-terminal-emulator -e "$DWCMD" & else echo "Did not find an X terminal emulator." fi -echo "-----------------------" >> /tmp/dw-start.log +echo "-----------------------" >> $LOGFILE diff --git a/sdr.conf b/sdr.conf new file mode 100644 index 0000000..e506e52 --- /dev/null +++ b/sdr.conf @@ -0,0 +1,30 @@ +# +# Sample configuration for SDR read-only IGate. +# + +# We might not have an audio output device so set to null. +# We will override the input half on the command line. +ADEVICE null null +CHANNEL 0 +MYCALL xxx + +# First you need to specify the name of a Tier 2 server. +# The current preferred way is to use one of these regional rotate addresses: + +# noam.aprs2.net - for North America +# soam.aprs2.net - for South America +# euro.aprs2.net - for Europe and Africa +# asia.aprs2.net - for Asia +# aunz.aprs2.net - for Oceania + +IGSERVER noam.aprs2.net + +# You also need to specify your login name and passcode. +# Contact the author if you can't figure out how to generate the passcode. + +IGLOGIN xxx 123456 + +# That's all you need for a receive only IGate which relays +# messages from the local radio channel to the global servers. + +