From cb8b3e83728540855635653b8f1090189be8fc4a Mon Sep 17 00:00:00 2001
From: craigerl <craig@craiger.org>
Date: Wed, 18 May 2022 09:06:04 -0700
Subject: [PATCH] sanitized conf and sh files

---
 home/pi/direwolf.digipeater.conf | 10 +++++-----
 home/pi/direwolf.node.conf       |  4 ++--
 home/pi/direwolf.node.sh         |  4 ++--
 home/pi/direwolf.tnc.conf        |  6 +++---
 home/pi/direwolf.tnc.sh          |  2 +-
 home/pi/direwolf.tnc300b.conf    | 14 +++++++-------
 home/pi/direwolf.tnc300b.sh      |  3 +--
 home/pi/direwolf.winlink.conf    |  6 +++---
 home/pi/localize.sh              | 12 ++++++------
 home/pi/saveconfigs.sh           |  8 ++++----
 10 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/home/pi/direwolf.digipeater.conf b/home/pi/direwolf.digipeater.conf
index 36a882c..e26a8a6 100644
--- a/home/pi/direwolf.digipeater.conf
+++ b/home/pi/direwolf.digipeater.conf
@@ -9,11 +9,11 @@ IGSERVER noam.aprs2.net
 #IGSERVER sjc.aprs2.net
 
 # Our info
-MYCALL KM6LYW-2
-IGLOGIN KM6LYW-2  22452
+MYCALL KX6XXX-2
+IGLOGIN KX6XXX-2  12345
 
 # Beacon to RF
-PBEACON  compress=1 delay=00:05 every=20:00 symbol="digi" overlay=1 lat=38.9119N long=120.9356W via=WIDE2-1  comment=" KM6LYW WIDE1 DigiPi http://craiger.org/digipi/ "
+PBEACON  compress=1 delay=00:05 every=20:00 symbol="digi" overlay=1 lat=40.9999N long=140.9999W via=WIDE2-1  comment=" KX6XXX WIDE1 DigiPi http://craiger.org/digipi/ "
 
 # Digipeat anything heard on RF with WIDE1-1 in the routing table
 DIGIPEAT 0 0 ^WIDE1-1$  ^WIDE1-1$
@@ -23,7 +23,7 @@ IGTXVIA 0 WIDE1-1,WIDE2-1
 
 # RF->RF local filter
 # Don't digipeat ourself (two radio scenario) or abusive stations on RF
-FILTER 0 0 ! d/KM6LYW-2 & ! b/KM6LYW-2
+FILTER 0 0 ! d/KX6XXX-2 & ! b/KX6XXX-2
 
 # Internet->RF local filter
 # Just gate message-type packets that aren't group bulletins or weather-type packet from my wx station
@@ -32,7 +32,7 @@ FILTER IG 0 ( t/m & ! g/BLN* )
 # Internet->RF server-side filter
 # give us messages from stations 100miles away, or anything from VIP list
 # aprsis doesn't give us message packets unless destination was heard here recently
-IGFILTER  t/m/KM6LYW-2/160  b/KM6LYW
+IGFILTER  t/m/KX6XXX-2/160  b/KX6XXX
 
 # One and five minute maximum from internet to RF
 IGTXLIMIT 20 60
diff --git a/home/pi/direwolf.node.conf b/home/pi/direwolf.node.conf
index adb1d59..a3fc100 100644
--- a/home/pi/direwolf.node.conf
+++ b/home/pi/direwolf.node.conf
@@ -1,8 +1,8 @@
 # node 1200baud packet direwolf config
 
-MYCALL KM6LYW
+MYCALL KX6XXX
 
-CBEACON  dest=BEACON delay=00:30 every=30:00 symbol="winlink" info="KM6LYW-4 Linux Node http://craiger.org/digipi/"
+CBEACON  dest=BEACON delay=00:30 every=30:00 symbol="winlink" info="KX6XXX-4 Linux Node http://craiger.org/digipi/"
 
 DCD GPIO 16
 
diff --git a/home/pi/direwolf.node.sh b/home/pi/direwolf.node.sh
index 146aa90..fd161a9 100755
--- a/home/pi/direwolf.node.sh
+++ b/home/pi/direwolf.node.sh
@@ -59,10 +59,10 @@ while true;
 do
 #{
 #sleep 10
-#echo "user KM6LYW-4 pass 22452 vers digipi 1.6"
+#echo "user KX6XXX-4 pass 12345 vers digipi 1.6"
 #sleep 2
 ## Please change longitude/latitude below if you uncomment this:
-#printf  "KM6LYW-4>WIDE1-1,TCPIP,WIDE1-1:!3853.80N/12056.15WB145.730Mhz: http://craiger.org/bbs Play Zork!\r\n"
+#printf  "KX6XXX-4>WIDE1-1,TCPIP,WIDE1-1:!3853.80N/12056.15WB145.730Mhz: http://craiger.org/bbs Play Zork!\r\n"
 #sleep 12
 #echo "^]"
 #echo "quit"
diff --git a/home/pi/direwolf.tnc.conf b/home/pi/direwolf.tnc.conf
index 6d796fa..4600a59 100644
--- a/home/pi/direwolf.tnc.conf
+++ b/home/pi/direwolf.tnc.conf
@@ -1,16 +1,16 @@
 # digipi TNC direwolf configuration file
 # this file is used as a template by direwolf.tnc.sh
 
-MYCALL KM6LYW-2
+MYCALL KX6XXX-2
 
 # disable internet if crosstalk is an issue 
 # this is an issue with ISS/satellite stuff, we don't get credit for repeat
 IGSERVER noam.aprs2.net
-IGLOGIN KM6LYW-2  22452
+IGLOGIN KX6XXX-2  12345
 
 # put us on aprs.fi map via internet
 # change sendto=IG to sendto=RF to send beacons over RF
-PBEACON sendto=IG compress=1 delay=00:10 every=30:00 symbol="igate" overlay=R lat=38.9119N long=120.9356W comment=" DigiPi http://craiger.org/digipi/"
+PBEACON sendto=IG compress=1 delay=00:10 every=30:00 symbol="igate" overlay=R lat=40.9999N long=140.9999W comment=" DigiPi http://craiger.org/digipi/"
 
 # APRS Tracker
 # Comment out above PBEACON line, uncomment both lines below
diff --git a/home/pi/direwolf.tnc.sh b/home/pi/direwolf.tnc.sh
index 9c7cc31..9f2cf57 100755
--- a/home/pi/direwolf.tnc.sh
+++ b/home/pi/direwolf.tnc.sh
@@ -30,7 +30,7 @@ echo "ALSA_CARD $ALSA_CARD"
 
 direwolf -d t -p -q d -t 0 -c /run/direwolf.tnc.conf | tee /home/pi/direwolf.log &
 
-/home/pi/direwatch.py -o --log "/run/direwolf.log" --title_text "DigiPi TNC"  &
+/home/pi/direwatch.py  --log "/run/direwolf.log" --title_text "DigiPi TNC"  &
 
 # wait for direwolf to open port 8001
 sleep 5
diff --git a/home/pi/direwolf.tnc300b.conf b/home/pi/direwolf.tnc300b.conf
index 6f7c60c..02440f7 100644
--- a/home/pi/direwolf.tnc300b.conf
+++ b/home/pi/direwolf.tnc300b.conf
@@ -1,22 +1,22 @@
 # DigiPi Direwolf configuration template file
 # 300baud TNC, with tones on 1600 and 1800, for use on HF frequencies
 
-MYCALL KM6LYW-2
+MYCALL KX6XXX-2
 IGSERVER noam.aprs2.net
-IGLOGIN KM6LYW-2  22452
+IGLOGIN KX6XXX-2  12345
 
 ## Radio->Radio  Only traffic from me or any 3rd party header.  
 ## Can't filter on third party packet content :(
-#FILTER 0  0 b/KM6LYW* | t/h
+#FILTER 0  0 b/KX6XXX* | t/h
 
 ## IG->Radio     Only traffic to me or wx packet from my weather station
-#FILTER IG 0 g/KM6LYW*  |  ( t/w & b/KM6LYW-3 )
+#FILTER IG 0 g/KX6XXX*  |  ( t/w & b/KX6XXX-3 )
 
 ## Radio->IG     Only traffic from me
-#FILTER 0 IG b/KM6LYW*
+#FILTER 0 IG b/KX6XXX*
 
 ## Tell server to only send me packets either to me or from me
-#IGFILTER  g/KM6LYW* b/KM6LYW*
+#IGFILTER  g/KX6XXX* b/KX6XXX*
 
 DCD GPIO 16
 
@@ -25,7 +25,7 @@ MODEM 300  1600:1800
 
 #startup script will uncomment one of these, and copy to /run/direwolf*conf, add PTT line below these to override
 #PTT GPIO 12
-#PTT RIG 3085 /dev/ttyUSB0
+#PTT RIG 3085 /dev/ttyACM0
 
 DWAIT 0
 TXDELAY 30
diff --git a/home/pi/direwolf.tnc300b.sh b/home/pi/direwolf.tnc300b.sh
index 2230fa3..2b7d845 100755
--- a/home/pi/direwolf.tnc300b.sh
+++ b/home/pi/direwolf.tnc300b.sh
@@ -29,8 +29,7 @@ sudo mv /tmp/direwolf.tnc300b.conf /run/direwolf.tnc300b.conf
 # set default alsa audio device
 echo "ALSA_CARD $ALSA_CARD"
 
-# enable FX.25 FEC (-X 1) on hf tnc
-direwolf -X 1 -d t -p -q d -t 0 -c /run/direwolf.tnc300b.conf | tee /home/pi/direwolf.log &
+direwolf -d t -p -q d -t 0 -c /run/direwolf.tnc300b.conf | tee /home/pi/direwolf.log &
 
 /home/pi/direwatch.py --log "/run/direwolf.log" --title_text "TNC 300b"  &
 
diff --git a/home/pi/direwolf.winlink.conf b/home/pi/direwolf.winlink.conf
index 192039c..e16ddce 100644
--- a/home/pi/direwolf.winlink.conf
+++ b/home/pi/direwolf.winlink.conf
@@ -1,11 +1,11 @@
 # DigiPi Winlink direwolf configuration file template
 
 
-MYCALL KM6LYW-10
-CBEACON             dest=BEACON delay=00:30 every=30:00 symbol="winlink" info="KM6LYW-10 Winlink LinuxRMS Gateway, http://craiger.org/digipi"
+MYCALL KX6XXX-10
+CBEACON             dest=BEACON delay=00:30 every=30:00 symbol="winlink" info="KX6XXX-10 Winlink LinuxRMS Gateway, http://craiger.org/digipi"
 
 # Tell server to only send me packets either to me or from me
-IGFILTER  g/KM6LYW* b/KM6LYW*
+IGFILTER  g/KX6XXX* b/KX6XXX*
 
 DCD GPIO 16
 
diff --git a/home/pi/localize.sh b/home/pi/localize.sh
index 1c55ad9..bcbceda 100755
--- a/home/pi/localize.sh
+++ b/home/pi/localize.sh
@@ -2,13 +2,13 @@
 
 # Fill out these accordingly, using the examples below
 
-NEWCALL=KM6LYW
+NEWCALL=KX6XXX
 NEWWLPASS=XXXXXX
-NEWAPRSPASS=22452
-NEWGRID=CM98mv
-NEWLAT=38.9119N
-NEWLON=120.9356W
-NEWNODEPASS=test11
+NEWAPRSPASS=12345
+NEWGRID=CN99mv
+NEWLAT=40.9999N
+NEWLON=140.9999W
+NEWNODEPASS=abc123
 NEWRIGNUMBER=3085
 NEWDEVICEFILE=ttyACM0
 NEWBAUDRATE=115200
diff --git a/home/pi/saveconfigs.sh b/home/pi/saveconfigs.sh
index 60297a9..2aa0c2c 100755
--- a/home/pi/saveconfigs.sh
+++ b/home/pi/saveconfigs.sh
@@ -3,10 +3,10 @@
 echo "Writing runtime app configs to SD card."
 sudo remount
 cd ~
-rsync -avH --delete /home/pi/.local/   /home/pi/local
-rsync -avH --delete /home/pi/.config/  /home/pi/config
-rsync -avH --delete /home/pi/.fldigi/  /home/pi/fldigi
-rsync -avH --delete /home/pi/.flrig/   /home/pi/flrig
+cp -a /home/pi/.local/*   /home/pi/local
+cp -a /home/pi/.config/*  /home/pi/config
+cp -a /home/pi/.fldigi/*  /home/pi/fldigi
+cp -a /home/pi/.flrig/*  /home/pi/flrig
 
 
 echo "Reboot to make filesystem read-only again."