From 45d0927a0c6ee0aaca9b5fb361fac61d490fae99 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Mon, 12 Oct 2020 21:22:54 +0100
Subject: [PATCH 01/56] Added APRS formatting to tlm displayed as Comment

---
 afsk/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index b5e1339f..40a1913d 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -650,10 +650,10 @@ for (int j = 0; j < frameCnt; j++)
   char tlm_str[1000];
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
-  char header_str2[] = ">CQ:hi hi ";
+  char header_str2[] = ">CQ:>041440zhi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
-  char footer_str[] = ">CQ:hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";
+  char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";
 	
   if (ax5043)
   {

From 9e23df3252c665ad273de64f465a239d68e853d4 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Mon, 12 Oct 2020 17:30:59 -0400
Subject: [PATCH 02/56] Added Packet mode for CubeSatSim

---
 groundstation/bookmarks.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/groundstation/bookmarks.json b/groundstation/bookmarks.json
index 2a8a92d8..d0c73cfe 100644
--- a/groundstation/bookmarks.json
+++ b/groundstation/bookmarks.json
@@ -13,7 +13,6 @@
     "name": "ARISS Repeater Downlink",
     "frequency": 437800000,
     "modulation": "nfm"
-
   },
   {
     "name": "AO-27",
@@ -133,7 +132,7 @@
   {
     "name": "CubeSatSim",
     "frequency": 434900000,
-    "modulation": "nfm"
+    "modulation": "packet"
   },
   {
     "name": "APRS EU",

From c73851ce7abaa8f7214d94a812b3d9889c21f6b8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Mon, 12 Oct 2020 17:48:04 -0400
Subject: [PATCH 03/56] updated to align with config_webrx.py

---
 groundstation/config_webrx_ubuntu.py | 31 +++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/groundstation/config_webrx_ubuntu.py b/groundstation/config_webrx_ubuntu.py
index 2d948035..117fb4b1 100644
--- a/groundstation/config_webrx_ubuntu.py
+++ b/groundstation/config_webrx_ubuntu.py
@@ -132,7 +132,7 @@ sdrs = {
                 "start_mod": "nfm",
             },
             "2m": {
-                "name": "2m Band",
+                "name": "2m Ham Band",
                 "center_freq": 145000000,
                 "rf_gain": 20,
                 "samp_rate": 2400000,
@@ -140,12 +140,21 @@ sdrs = {
                 "start_mod": "nfm",
             },
             "70cm": {
-                "name": "70cm Band",
+                "name": "70cm Ham Band 435 MHz",
                 "center_freq": 435500000,
                 "rf_gain": 20,
                 "samp_rate": 2400000,
                 "start_freq": 4355000000,
                 "start_mod": "nfm",
+             },
+            "70cm-2": {	 		
+                "name": "70cm Ham Band 438 MHz",	 		
+                "center_freq": 438000000,	 		
+                "rf_gain": 30,	 		
+                "samp_rate": 2400000,	 		
+                "start_freq": 437800000,	 		
+                "start_mod": "nfm",	 		
+
             },
             "fm": {
                 "name": "FM Band",
@@ -171,6 +180,14 @@ sdrs = {
                 "start_freq": 51000000,
                 "start_mod": "usb",
             },
+            "108MHz": {
+                "name": "108 MHz",	 		
+                "center_freq": 108000000,	 		
+                "rf_gain": 30,	 		
+                "samp_rate": 2400000,	 		
+                "start_freq": 108000000,	 		
+                "start_mod": "nfm",	 		
+            },
             "110MHz": {
                 "name": "110 MHz",
                 "center_freq": 110000000,
@@ -509,12 +526,20 @@ sdrs = {
             },
             "438mhz": {
                 "name": "438 MHz 70cm Ham Band",
-                "center_freq": 138000000,
+                "center_freq": 438000000,
                 "rf_gain": 30,
                 "samp_rate": 2400000,
                 "start_freq": 438000000,
                 "start_mod": "nfm",
             },
+           "440mhz": {	 		
+                "name": "440 MHz 70cm Ham Band",	 		
+                "center_freq": 440000000,	 		
+                "rf_gain": 30,	 		
+                "samp_rate": 2400000,	 		
+                "start_freq": 440000000,	 		
+                "start_mod": "nfm",	 		
+            },	 		
             "446mhz": {
                 "name": "446 MHz",
                 "center_freq": 446000000,

From 232a3ec3274af3ee3773783d6d5ed8a4c56599db Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Wed, 14 Oct 2020 12:30:32 -0400
Subject: [PATCH 04/56] added make

---
 groundstation/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groundstation/update.sh b/groundstation/update.sh
index ad47786a..28751feb 100755
--- a/groundstation/update.sh
+++ b/groundstation/update.sh
@@ -5,7 +5,7 @@ echo -e "\nUpdating configurations. \n"
 
 cd ~/CubeSatSim && git pull
 
-sudo modprobe snd-aloop
+make debug
 
 sudo cp ~/CubeSatSim/groundstation/config_webrx.py /etc/openwebrx/config_webrx.py
 

From 807b63b1428832aaa43593cac3d400cfc26e9a0c Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:44:33 -0500
Subject: [PATCH 05/56] added mode cycling

---
 demo.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index bf29c4ce..497cf461 100755
--- a/demo.sh
+++ b/demo.sh
@@ -2,7 +2,11 @@
 
 echo -e "\nDemo of CubeSatSim at 434.9 MHz\n"
 
-sleep 10
+y=$(last reboot | grep ^reboot | wc -l)
+echo $y
+
+if [ "$1" = "c" ]; then
+    echo "Mode cycling"
 
 sudo systemctl restart rpitx
 

From 4accef479ba22aefaae5a5bd972c27ea53edb665 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:47:03 -0500
Subject: [PATCH 06/56] default no parameter is mode cycling

---
 demo.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/demo.sh b/demo.sh
index 497cf461..aad4c955 100755
--- a/demo.sh
+++ b/demo.sh
@@ -2,12 +2,6 @@
 
 echo -e "\nDemo of CubeSatSim at 434.9 MHz\n"
 
-y=$(last reboot | grep ^reboot | wc -l)
-echo $y
-
-if [ "$1" = "c" ]; then
-    echo "Mode cycling"
-
 sudo systemctl restart rpitx
 
 if [ "$1" = "a" ]; then
@@ -19,7 +13,11 @@ elif [ "$1" = "b" ]; then
 elif [ "$1" = "s" ]; then
    	echo "Mode is continuous SSTV"  
     	while true; do sleep 5; done
-else 
-    	echo "Mode is continuous FSK"
-    	/home/pi/CubeSatSim/radioafsk fsk
+else [ "$1" = "f" ]; then
+    echo "Mode is continuous FSK"
+    /home/pi/CubeSatSim/radioafsk fsk
+else
+    echo "Mode cycling"
+    y=$(last reboot | grep ^reboot | wc -l)
+    echo $y
 fi

From b9220ad3b1e8ab000f2b9ba8ae1d6fc459f1c5eb Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:49:33 -0500
Subject: [PATCH 07/56] added mode cycling if parameter is c

---
 rpitx.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rpitx.sh b/rpitx.sh
index e95613a1..a00ee535 100755
--- a/rpitx.sh
+++ b/rpitx.sh
@@ -2,4 +2,11 @@
 
 echo -e "\nrpitx for CubeSatSim at 434.9 MHz using python\n"
 
-python -u /home/pi/CubeSatSim/rpitx.py $1
+if [ "$1" = "c" ]; then
+    echo "Mode cycling"
+    y=$(last reboot | grep ^reboot | wc -l)
+    echo $y
+else
+    python -u /home/pi/CubeSatSim/rpitx.py $1
+fi
+

From b8891350dcbd7ce3de5f06f1abb7a55a02c33a41 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:53:06 -0500
Subject: [PATCH 08/56] Update demo.sh

---
 demo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index aad4c955..5a3d0c91 100755
--- a/demo.sh
+++ b/demo.sh
@@ -13,7 +13,7 @@ elif [ "$1" = "b" ]; then
 elif [ "$1" = "s" ]; then
    	echo "Mode is continuous SSTV"  
     	while true; do sleep 5; done
-else [ "$1" = "f" ]; then
+elif [ "$1" = "f" ]; then
     echo "Mode is continuous FSK"
     /home/pi/CubeSatSim/radioafsk fsk
 else

From 24d9d0da586259339cd545d09789a6ece330d64c Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:55:30 -0500
Subject: [PATCH 09/56] Update demo.sh

---
 demo.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index 5a3d0c91..f92a163e 100755
--- a/demo.sh
+++ b/demo.sh
@@ -20,4 +20,17 @@ else
     echo "Mode cycling"
     y=$(last reboot | grep ^reboot | wc -l)
     echo $y
-fi
+    
+      if [ "$y" % 4 = "0" ]; then
+   	   echo "Mode is continuous AFSK"
+    	   /home/pi/CubeSatSim/radioafsk afsk
+      elif [ "$1" = "b" ]; then
+   	   echo "Mode is continuous BPSK"  
+    	   /home/pi/CubeSatSim/radioafsk bpsk
+      elif [ "$1" = "s" ]; then
+   	   echo "Mode is continuous SSTV"  
+    	   while true; do sleep 5; done
+      els3 [ "$1" = "f" ]; then
+         echo "Mode is continuous FSK"
+         /home/pi/CubeSatSim/radioafsk fsk  
+      fi

From cc5350ee10c650bc92d4a4f6ca92ddc85360b289 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 10:58:08 -0500
Subject: [PATCH 10/56] Update demo.sh

---
 demo.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index f92a163e..f5f10742 100755
--- a/demo.sh
+++ b/demo.sh
@@ -20,8 +20,9 @@ else
     echo "Mode cycling"
     y=$(last reboot | grep ^reboot | wc -l)
     echo $y
+    echo $(($y % 4))
     
-      if [ "$y" % 4 = "0" ]; then
+      if [ $(($y % 4)) = "0" ]; then
    	   echo "Mode is continuous AFSK"
     	   /home/pi/CubeSatSim/radioafsk afsk
       elif [ "$1" = "b" ]; then

From 1e524b7c0f6faa7afe906ad68680c3c4374bfa89 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:10:17 -0500
Subject: [PATCH 11/56] Update demo.sh

---
 demo.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index f5f10742..d5f18982 100755
--- a/demo.sh
+++ b/demo.sh
@@ -31,7 +31,8 @@ else
       elif [ "$1" = "s" ]; then
    	   echo "Mode is continuous SSTV"  
     	   while true; do sleep 5; done
-      els3 [ "$1" = "f" ]; then
+      else
+         [ "$1" = "f" ]; then
          echo "Mode is continuous FSK"
          /home/pi/CubeSatSim/radioafsk fsk  
       fi

From 21e7f0c37bd582d7b3d98888303a5ed5e6756fc6 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:11:13 -0500
Subject: [PATCH 12/56] Update demo.sh

---
 demo.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index d5f18982..684f5ef9 100755
--- a/demo.sh
+++ b/demo.sh
@@ -32,7 +32,6 @@ else
    	   echo "Mode is continuous SSTV"  
     	   while true; do sleep 5; done
       else
-         [ "$1" = "f" ]; then
          echo "Mode is continuous FSK"
          /home/pi/CubeSatSim/radioafsk fsk  
       fi

From 7177b2b781f482ec6867919546da1e34a5a10f37 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:11:57 -0500
Subject: [PATCH 13/56] Update demo.sh

---
 demo.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo.sh b/demo.sh
index 684f5ef9..32434f23 100755
--- a/demo.sh
+++ b/demo.sh
@@ -35,3 +35,4 @@ else
          echo "Mode is continuous FSK"
          /home/pi/CubeSatSim/radioafsk fsk  
       fi
+fi

From 996470d5620e7778c9982fb9a39aaeb628976ef8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:14:05 -0500
Subject: [PATCH 14/56] added modulo test for c mode

---
 demo.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo.sh b/demo.sh
index 32434f23..950eaac5 100755
--- a/demo.sh
+++ b/demo.sh
@@ -22,13 +22,13 @@ else
     echo $y
     echo $(($y % 4))
     
-      if [ $(($y % 4)) = "0" ]; then
+      if [ $(($y % 4)) = 0 ]; then
    	   echo "Mode is continuous AFSK"
     	   /home/pi/CubeSatSim/radioafsk afsk
-      elif [ "$1" = "b" ]; then
+      elif [ $(($y % 4)) = 1 ]; then
    	   echo "Mode is continuous BPSK"  
     	   /home/pi/CubeSatSim/radioafsk bpsk
-      elif [ "$1" = "s" ]; then
+      elif [ $(($y % 4)) = 2 ]; then
    	   echo "Mode is continuous SSTV"  
     	   while true; do sleep 5; done
       else

From 4458c6df522bb410e350546d1ce37c8f1cba75ec Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:22:22 -0500
Subject: [PATCH 15/56] change variable $1

---
 demo.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/demo.sh b/demo.sh
index 950eaac5..6da44402 100755
--- a/demo.sh
+++ b/demo.sh
@@ -4,6 +4,23 @@ echo -e "\nDemo of CubeSatSim at 434.9 MHz\n"
 
 sudo systemctl restart rpitx
 
+if [ "$1" = "c" ]; then
+    echo "Mode cycling"
+    y=$(last reboot | grep ^reboot | wc -l)
+    echo $y
+    echo $(($y % 4))
+    
+      if [ $(($y % 4)) = 0 ]; then
+   	   $1 = "a"
+      elif [ $(($y % 4)) = 1 ]; then
+   	   $1 = "b"
+      elif [ $(($y % 4)) = 2 ]; then
+   	   $1 = "s"
+      else
+         $1 = "f"
+      fi
+fi
+
 if [ "$1" = "a" ]; then
    	echo "Mode is continuous AFSK"
     	/home/pi/CubeSatSim/radioafsk afsk
@@ -13,26 +30,8 @@ elif [ "$1" = "b" ]; then
 elif [ "$1" = "s" ]; then
    	echo "Mode is continuous SSTV"  
     	while true; do sleep 5; done
-elif [ "$1" = "f" ]; then
+else [ "$1" = "f" ]; then
     echo "Mode is continuous FSK"
     /home/pi/CubeSatSim/radioafsk fsk
-else
-    echo "Mode cycling"
-    y=$(last reboot | grep ^reboot | wc -l)
-    echo $y
-    echo $(($y % 4))
-    
-      if [ $(($y % 4)) = 0 ]; then
-   	   echo "Mode is continuous AFSK"
-    	   /home/pi/CubeSatSim/radioafsk afsk
-      elif [ $(($y % 4)) = 1 ]; then
-   	   echo "Mode is continuous BPSK"  
-    	   /home/pi/CubeSatSim/radioafsk bpsk
-      elif [ $(($y % 4)) = 2 ]; then
-   	   echo "Mode is continuous SSTV"  
-    	   while true; do sleep 5; done
-      else
-         echo "Mode is continuous FSK"
-         /home/pi/CubeSatSim/radioafsk fsk  
-      fi
 fi
+

From 828f7b08779add8c048ca65ad30c3f4634c2bd35 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 11:24:16 -0500
Subject: [PATCH 16/56] Update demo.sh

---
 demo.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/demo.sh b/demo.sh
index 6da44402..dce8c805 100755
--- a/demo.sh
+++ b/demo.sh
@@ -11,13 +11,13 @@ if [ "$1" = "c" ]; then
     echo $(($y % 4))
     
       if [ $(($y % 4)) = 0 ]; then
-   	   $1 = "a"
+   	   1= "a"
       elif [ $(($y % 4)) = 1 ]; then
-   	   $1 = "b"
+   	   1="b"
       elif [ $(($y % 4)) = 2 ]; then
-   	   $1 = "s"
+   	   1="s"
       else
-         $1 = "f"
+         1="f"
       fi
 fi
 

From 4d1fa7f7a44ff49f0e35025ebc7cdc88c0d5b83e Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 17:54:04 -0500
Subject: [PATCH 17/56] Update demo.sh

---
 demo.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/demo.sh b/demo.sh
index dce8c805..65935e0b 100755
--- a/demo.sh
+++ b/demo.sh
@@ -8,20 +8,10 @@ if [ "$1" = "c" ]; then
     echo "Mode cycling"
     y=$(last reboot | grep ^reboot | wc -l)
     echo $y
-    echo $(($y % 4))
-    
-      if [ $(($y % 4)) = 0 ]; then
-   	   1= "a"
-      elif [ $(($y % 4)) = 1 ]; then
-   	   1="b"
-      elif [ $(($y % 4)) = 2 ]; then
-   	   1="s"
-      else
-         1="f"
-      fi
+    echo $(($y % 4))    
 fi
 
-if [ "$1" = "a" ]; then
+if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4)))) ]]; then
    	echo "Mode is continuous AFSK"
     	/home/pi/CubeSatSim/radioafsk afsk
 elif [ "$1" = "b" ]; then

From 5516327430393729d4d3b4c3ffdfca349e7ac1d5 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 17:56:56 -0500
Subject: [PATCH 18/56] Update demo.sh

---
 demo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index 65935e0b..49ff5987 100755
--- a/demo.sh
+++ b/demo.sh
@@ -11,7 +11,7 @@ if [ "$1" = "c" ]; then
     echo $(($y % 4))    
 fi
 
-if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4)))) ]]; then
+if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4))" = 0)) ]]; then
    	echo "Mode is continuous AFSK"
     	/home/pi/CubeSatSim/radioafsk afsk
 elif [ "$1" = "b" ]; then

From df27374cd296c91c45ebedf10223d0d3a4e2ab58 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 17:59:27 -0500
Subject: [PATCH 19/56] Update demo.sh

---
 demo.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo.sh b/demo.sh
index 49ff5987..15c0dcae 100755
--- a/demo.sh
+++ b/demo.sh
@@ -14,13 +14,13 @@ fi
 if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4))" = 0)) ]]; then
    	echo "Mode is continuous AFSK"
     	/home/pi/CubeSatSim/radioafsk afsk
-elif [ "$1" = "b" ]; then
+elif [[ ("$1" = "b" ) || (("$1" = "c") && ("$(($y %4))" = 1)) ]]; then
    	echo "Mode is continuous BPSK"  
     	/home/pi/CubeSatSim/radioafsk bpsk
-elif [ "$1" = "s" ]; then
+elif [[ ("$1" = "s" ) || (("$1" = "c") && ("$(($y %4))" = 2)) ]]; then
    	echo "Mode is continuous SSTV"  
     	while true; do sleep 5; done
-else [ "$1" = "f" ]; then
+else
     echo "Mode is continuous FSK"
     /home/pi/CubeSatSim/radioafsk fsk
 fi

From ddcd6c7d3c1e9504b6f30eb3becfc66660c42609 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 18:03:06 -0500
Subject: [PATCH 20/56] added cycling mode conditionals

---
 rpitx.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/rpitx.sh b/rpitx.sh
index a00ee535..5ec9f3c8 100755
--- a/rpitx.sh
+++ b/rpitx.sh
@@ -6,6 +6,19 @@ if [ "$1" = "c" ]; then
     echo "Mode cycling"
     y=$(last reboot | grep ^reboot | wc -l)
     echo $y
+          if [ $(($y % 4)) = 0 ]; then
+   	   echo "Mode is continuous AFSK"
+    	   python -u /home/pi/CubeSatSim/rpitx.py a
+      elif [ $(($y % 4)) = 1 ]; then
+   	   echo "Mode is continuous BPSK"  
+    	   python -u /home/pi/CubeSatSim/rpitx.py b
+      elif [ $(($y % 4)) = 2 ]; then
+   	   echo "Mode is continuous SSTV"  
+    	   python -u /home/pi/CubeSatSim/rpitx.py s
+      else
+         echo "Mode is continuous FSK"
+         python -u /home/pi/CubeSatSim/rpitx.py f
+      fi
 else
     python -u /home/pi/CubeSatSim/rpitx.py $1
 fi

From af9ec8d2c2c9785da02e36d5df5bbc21fae5d000 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 8 Nov 2020 18:34:29 -0500
Subject: [PATCH 21/56] don't check for payload if vB3 with TFB present

---
 afsk/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 40a1913d..518a357f 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -117,7 +117,7 @@ int bitRate, mode, bufLen, rsFrames, payloads, rsFrameLen, dataLen, headerLen, s
 float sleepTime;
 int sampleTime = 0, frames_sent = 0;
 int cw_id = ON;
-int vB4 = FALSE, vB5 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF;
+int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF;
 float batteryThreshold = 3.0, batteryVoltage;
 int test_i2c_bus(int bus);
 
@@ -239,6 +239,7 @@ int main(int argc, char *argv[]) {
     if (digitalRead(2) != HIGH)
     {
 	  printf("vB3 with TFB Present\n");
+	  vB3 = TRUE;
   	  txLed = 3;
 	  txLedOn = LOW;
  	  txLedOff = HIGH;
@@ -338,7 +339,7 @@ else
 	
 // try connecting to Arduino payload using UART
 
- if (!ax5043)  // don't test if AX5043 is present
+ if (!ax5043 && !vB3)  // don't test if AX5043 is present
  {
   payload = OFF;
 

From ced9ddf9739676a9f5cb3d7777f159a72eea2c5e Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 13 Nov 2020 14:13:36 -0500
Subject: [PATCH 22/56] changed order of FSK and AFSK to match button

---
 demo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.sh b/demo.sh
index 15c0dcae..de318527 100755
--- a/demo.sh
+++ b/demo.sh
@@ -11,7 +11,7 @@ if [ "$1" = "c" ]; then
     echo $(($y % 4))    
 fi
 
-if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4))" = 0)) ]]; then
+if [[ ("$1" = "a" ) || (("$1" = "c") && ("$(($y %4))" = 3)) ]]; then
    	echo "Mode is continuous AFSK"
     	/home/pi/CubeSatSim/radioafsk afsk
 elif [[ ("$1" = "b" ) || (("$1" = "c") && ("$(($y %4))" = 1)) ]]; then

From 585992642e2ddfd3788371dbe137952e134fba14 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 13 Nov 2020 14:14:25 -0500
Subject: [PATCH 23/56] switched the order of AFSK and FSK to match button

---
 rpitx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.sh b/rpitx.sh
index 5ec9f3c8..409f9caf 100755
--- a/rpitx.sh
+++ b/rpitx.sh
@@ -6,7 +6,7 @@ if [ "$1" = "c" ]; then
     echo "Mode cycling"
     y=$(last reboot | grep ^reboot | wc -l)
     echo $y
-          if [ $(($y % 4)) = 0 ]; then
+          if [ $(($y % 4)) = 3 ]; then
    	   echo "Mode is continuous AFSK"
     	   python -u /home/pi/CubeSatSim/rpitx.py a
       elif [ $(($y % 4)) = 1 ]; then

From d96114de579eb425724b1a70563ad9d216695bf1 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:46:56 -0500
Subject: [PATCH 24/56] added coords to AFSK

---
 afsk/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 518a357f..9b26e4e3 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -651,7 +651,8 @@ for (int j = 0; j < frameCnt; j++)
   char tlm_str[1000];
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
-  char header_str2[] = ">CQ:>041440zhi hi ";
+  //char header_str2[] = ">CQ:>041440zhi hi ";
+  char header_str2[] = ">CQ:>=4003.79N/07534.33W-hi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 203befc34f51a7c90563bd40921626c84bdd8ca2 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:48:57 -0500
Subject: [PATCH 25/56] APRS typo

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 9b26e4e3..0ed8db20 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:>=4003.79N/07534.33W-hi hi ";
+  char header_str2[] = ">CQ:=4003.79N/07534.33W-hi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 95a925a84ac752537a53ddcc10407636c6e7d0cc Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:52:08 -0500
Subject: [PATCH 26/56] change APRS symbol

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 0ed8db20..590be1f2 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N/07534.33W-hi hi ";
+  char header_str2[] = ">CQ:=4003.79N/07534.33W)hi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 26471725e3cfac0bc6a2d2a85a0cd5d93fa380cd Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:53:35 -0500
Subject: [PATCH 27/56] another symbol

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 590be1f2..fbc09794 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N/07534.33W)hi hi ";
+  char header_str2[] = ">CQ:=4003.79N\07534.33W)hi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 48c6fe3631ca5398f46ae85b272250ec777891eb Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:56:33 -0500
Subject: [PATCH 28/56] satellite APRS icon

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index fbc09794..315b9770 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\07534.33W)hi hi ";
+  char header_str2[] = ">CQ:=4003.79N\07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From c76a1321c74c404cae9abe3b4ddbf03f9292e33b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 22:59:22 -0500
Subject: [PATCH 29/56] escaped \ in APRS string

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 315b9770..e54f2765 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\07534.33WShi hi ";
+  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From a52d02b4f870ce281f51e45b59a1bf1b9afb816a Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 23:03:18 -0500
Subject: [PATCH 30/56] different icon

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index e54f2765..7d56fada 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
+  char header_str2[] = ">CQ:=4003.79N/07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From ffe7d6409e805497cb36c0813b6163a5daa1b66b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 23:05:38 -0500
Subject: [PATCH 31/56] escaped backslash

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 7d56fada..e54f2765 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N/07534.33WShi hi ";
+  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 8b5f4b5d6a87364129bc12f55c61d62ce4efad31 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 23:13:55 -0500
Subject: [PATCH 32/56] escaping with ASCII

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index e54f2765..437add01 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
+  char header_str2[] = ">CQ:=4003.79N\x5C07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 478d246e97fd32f8763fc80fc16e8c08685095e8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 21 Nov 2020 23:20:12 -0500
Subject: [PATCH 33/56] \\ to escape \

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 437add01..e54f2765 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,7 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\x5C07534.33WShi hi ";
+  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";

From 7f521e7f4f96fc9fc0c9790e0ea3d5b3049e8e48 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:26:33 -0500
Subject: [PATCH 34/56] start adding APRS latt and long with "\"

---
 afsk/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index e54f2765..94ccc314 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -652,7 +652,9 @@ for (int j = 0; j < frameCnt; j++)
   char header_str[] = "\x03\xf0hi hi ";	
   char header_str3[] = "echo '";
   //char header_str2[] = ">CQ:>041440zhi hi ";
-  char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
+  //char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
+  char header_str2[] = ">CQ:";
+  char header_str2b[30]; // for APRS coordinates	
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";
@@ -668,6 +670,8 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
+	sprintf(header_str2b, "%7.2f%c%c%7.2f%cShi hi","\",4003.79,"N",07534.33,"W");  // add APRS latt and long
+	printf"\n\nString is %s \m\", header_str2b);
     } else
     {
 	strcat(str, header_str4);

From c1074e66f98e4e3f7f4b443ab7ff78516ed8d91b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:34:45 -0500
Subject: [PATCH 35/56] Update main.c

---
 afsk/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 94ccc314..14c1c8e0 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -670,8 +670,8 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "%7.2f%c%c%7.2f%cShi hi","\",4003.79,"N",07534.33,"W");  // add APRS latt and long
-	printf"\n\nString is %s \m\", header_str2b);
+	sprintf(header_str2b, "%7.2f%c%c%7.2f%cShi hi",4003.79,'N',0x5C,07534.33,'W');  // add APRS latt and long
+	printf("\n\nString is %s \m\", header_str2b);
     } else
     {
 	strcat(str, header_str4);

From f2942054bccdfd02d6941200c1ed1f63c2eb28b8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:36:10 -0500
Subject: [PATCH 36/56] typos

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 14c1c8e0..c733d996 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -671,7 +671,7 @@ for (int j = 0; j < frameCnt; j++)
     	strcat(str, call);
     	strcat(str, header_str2);
 	sprintf(header_str2b, "%7.2f%c%c%7.2f%cShi hi",4003.79,'N',0x5C,07534.33,'W');  // add APRS latt and long
-	printf("\n\nString is %s \m\", header_str2b);
+	printf("\n\nString is %s \n\n", header_str2b);
     } else
     {
 	strcat(str, header_str4);

From e11daa157c1809a9df3f71e204c9e5296db6c2e5 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:39:49 -0500
Subject: [PATCH 37/56] adding APRS string to tlm

---
 afsk/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index c733d996..9f92420b 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -670,8 +670,9 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "%7.2f%c%c%7.2f%cShi hi",4003.79,'N',0x5C,07534.33,'W');  // add APRS latt and long
+	sprintf(header_str2b, "=%7.2f%c%c%08.2f%cShi hi",4003.79,'N','\',07534.33,'W');  // add APRS latt and long
 	printf("\n\nString is %s \n\n", header_str2b);
+	strcat(str, header_str2b);
     } else
     {
 	strcat(str, header_str4);

From 1c844c2599702d4f47b6339ba0c0764ff3c118ad Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:41:02 -0500
Subject: [PATCH 38/56] hex for \

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 9f92420b..88aec3cd 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -670,7 +670,7 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "=%7.2f%c%c%08.2f%cShi hi",4003.79,'N','\',07534.33,'W');  // add APRS latt and long
+	sprintf(header_str2b, "=%7.2f%c%c%08.2f%cShi hi",4003.79,'N',0x5c,07534.33,'W');  // add APRS latt and long
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);
     } else

From b007b16194f6efea7487d72f297a2e48a5725a38 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:47:36 -0500
Subject: [PATCH 39/56] try double escaping \

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 88aec3cd..0d8a415c 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -670,7 +670,7 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "=%7.2f%c%c%08.2f%cShi hi",4003.79,'N',0x5c,07534.33,'W');  // add APRS latt and long
+	sprintf(header_str2b, "=%7.2f%c%c%c%c%c%08.2f%cShi hi",4003.79,'N',0x5c,0x5c,0x5c,0x5c,07534.33,'W');  // add APRS latt and long
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);
     } else

From 3be9083010631f3d67ed960db6b68bdef3932e3b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 09:50:20 -0500
Subject: [PATCH 40/56] // to get /

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 0d8a415c..18369aae 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -670,7 +670,7 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "=%7.2f%c%c%c%c%c%08.2f%cShi hi",4003.79,'N',0x5c,0x5c,0x5c,0x5c,07534.33,'W');  // add APRS latt and long
+	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS latt and long
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);
     } else

From f3b3aa7041483b4cc601dbf947a8b59b586f2aa6 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:16:30 -0500
Subject: [PATCH 41/56] added latitude and longitude variables

---
 afsk/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 18369aae..11b66e31 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -119,6 +119,7 @@ int sampleTime = 0, frames_sent = 0;
 int cw_id = ON;
 int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF;
 float batteryThreshold = 3.0, batteryVoltage;
+float latitude = 39.027702, longitude = -77.078064;
 int test_i2c_bus(int bus);
 
 const char pythonCmd[] = "python3 /home/pi/CubeSatSim/python/voltcurrent.py ";
@@ -654,7 +655,9 @@ for (int j = 0; j < frameCnt; j++)
   //char header_str2[] = ">CQ:>041440zhi hi ";
   //char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi ";
   char header_str2[] = ">CQ:";
-  char header_str2b[30]; // for APRS coordinates	
+  char header_str2b[30]; // for APRS coordinates
+  char header_lat[10];
+  char header_long[10];
   char header_str4[] = "hi hi ";	
   char footer_str1[] = "\' > t.txt && echo \'"; 
   char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1";
@@ -670,7 +673,10 @@ for (int j = 0; j < frameCnt; j++)
     {
     	strcat(str, call);
     	strcat(str, header_str2);
-	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS latt and long
+//	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi ",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS lat and long
+	sprintf(header_lat, "%7.2f%c",latitude * 10.0,'N');  // lat
+	sprintf(header_long, "%08.2f%c",latitude * (-10.0),'W');  // long
+	sprintf(header_str2b, "=%s%c%c%shi hi ",header_lat,0x5c,0x5c,header_long);  // add APRS lat and long	    
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);
     } else

From a0f9f5e2671a31d04177866d838cb2bcdd44d8ec Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:20:07 -0500
Subject: [PATCH 42/56] lat and long * 100

---
 afsk/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 11b66e31..1045cba3 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -674,8 +674,8 @@ for (int j = 0; j < frameCnt; j++)
     	strcat(str, call);
     	strcat(str, header_str2);
 //	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi ",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS lat and long
-	sprintf(header_lat, "%7.2f%c",latitude * 10.0,'N');  // lat
-	sprintf(header_long, "%08.2f%c",latitude * (-10.0),'W');  // long
+	sprintf(header_lat, "%7.2f%c",latitude * 100.0,'N');  // lat
+	sprintf(header_long, "%08.2f%c",longitude * (-100.0),'W');  // long
 	sprintf(header_str2b, "=%s%c%c%shi hi ",header_lat,0x5c,0x5c,header_long);  // add APRS lat and long	    
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);

From a6cce7b690ae516acdff842929b866f91192c983 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:21:45 -0500
Subject: [PATCH 43/56] added back missing S

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 1045cba3..474fa804 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -676,7 +676,7 @@ for (int j = 0; j < frameCnt; j++)
 //	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi ",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS lat and long
 	sprintf(header_lat, "%7.2f%c",latitude * 100.0,'N');  // lat
 	sprintf(header_long, "%08.2f%c",longitude * (-100.0),'W');  // long
-	sprintf(header_str2b, "=%s%c%c%shi hi ",header_lat,0x5c,0x5c,header_long);  // add APRS lat and long	    
+	sprintf(header_str2b, "=%s%c%c%sShi hi ",header_lat,0x5c,0x5c,header_long);  // add APRS lat and long	    
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);
     } else

From da367b5d8dce27844baa220198ec114262e57cd0 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:31:02 -0500
Subject: [PATCH 44/56] added condition for N or S latitude, E or W long

---
 afsk/main.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 474fa804..26ff77e2 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -674,8 +674,15 @@ for (int j = 0; j < frameCnt; j++)
     	strcat(str, call);
     	strcat(str, header_str2);
 //	sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi ",4003.79,'N',0x5c,0x5c,07534.33,'W');  // add APRS lat and long
-	sprintf(header_lat, "%7.2f%c",latitude * 100.0,'N');  // lat
-	sprintf(header_long, "%08.2f%c",longitude * (-100.0),'W');  // long
+	if (latitude > 0)
+	    sprintf(header_lat, "%7.2f%c",latitude * 100.0,'N');  // lat
+	else
+	    sprintf(header_lat, "%7.2f%c",latitude * (-100.0),'S');  // lat
+	if (longitude > 0)
+	    sprintf(header_long, "%08.2f%c",longitude * 100.0,'E');  // long
+	else
+	    sprintf(header_long, "%08.2f%c",longitude * (-100.0),'W');  // long
+
 	sprintf(header_str2b, "=%s%c%c%sShi hi ",header_lat,0x5c,0x5c,header_long);  // add APRS lat and long	    
 	printf("\n\nString is %s \n\n", header_str2b);
 	strcat(str, header_str2b);

From 37514dc7161cb4228ec13dc5dccdaa3fae1890bb Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:37:22 -0500
Subject: [PATCH 45/56] added lat and long to sim.cfg

---
 afsk/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 26ff77e2..3a3abea6 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -181,11 +181,12 @@ int main(int argc, char *argv[]) {
 	fclose(config_file);
 	config_file = fopen("/home/pi/CubeSatSim/sim.cfg","r"); 
   } 
-	
+  
+  float lat_file, long_file;
   char* cfg_buf[100]; 
-  fscanf(config_file, "%s %d", call, &reset_count);
+  fscanf(config_file, "%s %d %f %f", call, &reset_count, lat_file, long_file);
   fclose(config_file);
-  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d\n", call, reset_count); 	
+  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %f %f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
 	
   wiringPiSetup ();
@@ -297,7 +298,7 @@ int main(int argc, char *argv[]) {
   #endif
 	
     config_file = fopen("sim.cfg","w");
-    fprintf(config_file, "%s %d", call, reset_count);
+    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
     fclose(config_file);
     config_file = fopen("sim.cfg","r"); 
 		

From ca8b68b0fab8e94ab79cf8d65d154e280be6d374 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:44:33 -0500
Subject: [PATCH 46/56] Update main.c

---
 afsk/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 3a3abea6..0ec42301 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -120,6 +120,8 @@ int cw_id = ON;
 int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF;
 float batteryThreshold = 3.0, batteryVoltage;
 float latitude = 39.027702, longitude = -77.078064;
+float lat_file, long_file;
+
 int test_i2c_bus(int bus);
 
 const char pythonCmd[] = "python3 /home/pi/CubeSatSim/python/voltcurrent.py ";
@@ -182,11 +184,10 @@ int main(int argc, char *argv[]) {
 	config_file = fopen("/home/pi/CubeSatSim/sim.cfg","r"); 
   } 
   
-  float lat_file, long_file;
   char* cfg_buf[100]; 
   fscanf(config_file, "%s %d %f %f", call, &reset_count, lat_file, long_file);
   fclose(config_file);
-  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %f %f\n", call, reset_count, lat_file, long_file); 	
+  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %8.2f %8.2f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
 	
   wiringPiSetup ();

From 3d30eec185aab55607cc6334c29f3829a901dfc4 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:47:41 -0500
Subject: [PATCH 47/56] Update main.c

---
 afsk/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index 0ec42301..42c2fffe 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -299,7 +299,8 @@ int main(int argc, char *argv[]) {
   #endif
 	
     config_file = fopen("sim.cfg","w");
-    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
+//    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
+    fprintf(config_file, "%s %d", call, reset_count);
     fclose(config_file);
     config_file = fopen("sim.cfg","r"); 
 		

From d8567fa2596ad6d5c6d42217f24789e710d3a483 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:49:46 -0500
Subject: [PATCH 48/56] typo in file read

---
 afsk/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 42c2fffe..e059864f 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -185,7 +185,7 @@ int main(int argc, char *argv[]) {
   } 
   
   char* cfg_buf[100]; 
-  fscanf(config_file, "%s %d %f %f", call, &reset_count, lat_file, long_file);
+  fscanf(config_file, "%s %d %f %f", call, &reset_count, &lat_file, &long_file);
   fclose(config_file);
   printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %8.2f %8.2f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
@@ -299,8 +299,8 @@ int main(int argc, char *argv[]) {
   #endif
 	
     config_file = fopen("sim.cfg","w");
-//    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
-    fprintf(config_file, "%s %d", call, reset_count);
+    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
+//    fprintf(config_file, "%s %d", call, reset_count);
     fclose(config_file);
     config_file = fopen("sim.cfg","r"); 
 		

From 42a59f991ddf2ac9f099038e13aac46524653068 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 10:54:00 -0500
Subject: [PATCH 49/56] added test of lat and long from sim.cfg

---
 afsk/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/afsk/main.c b/afsk/main.c
index e059864f..adeb70d3 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -190,6 +190,9 @@ int main(int argc, char *argv[]) {
   printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %8.2f %8.2f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
 	
+  if ((abs(lat_file) > 0) && ((abs(lat_file) < 90.0) && (abs(long_file) > 0) && (abs(long_file) < 180.0))
+      printf("Valid latitude and longitude in config file\n");
+	
   wiringPiSetup ();
 
 // Check for SPI and AX-5043 Digital Transceiver Board	

From 6a2fddd57848c43e45c8420ee5790475d01e3b10 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 11:16:21 -0500
Subject: [PATCH 50/56] used fabs

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index adeb70d3..8ef54411 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
   printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %8.2f %8.2f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
 	
-  if ((abs(lat_file) > 0) && ((abs(lat_file) < 90.0) && (abs(long_file) > 0) && (abs(long_file) < 180.0))
+  if ((fabs(lat_file) > 0) && (fabs(lat_file) < 90.0) && (fabs(long_file) > 0) && (fabs(long_file) < 180.0))
       printf("Valid latitude and longitude in config file\n");
 	
   wiringPiSetup ();

From a2587b0a7f3156513c68bfd4e2e66737e8c08613 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 11:21:31 -0500
Subject: [PATCH 51/56] set lat and long if valid coords in sim.cfg

---
 afsk/main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/afsk/main.c b/afsk/main.c
index 8ef54411..a1c5d8b9 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -187,12 +187,15 @@ int main(int argc, char *argv[]) {
   char* cfg_buf[100]; 
   fscanf(config_file, "%s %d %f %f", call, &reset_count, &lat_file, &long_file);
   fclose(config_file);
-  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %8.2f %8.2f\n", call, reset_count, lat_file, long_file); 	
+  printf("Config file /home/pi/CubeSatSim/sim.cfg contains %s %d %f %f\n", call, reset_count, lat_file, long_file); 	
   reset_count = (reset_count + 1) % 0xffff;
 	
   if ((fabs(lat_file) > 0) && (fabs(lat_file) < 90.0) && (fabs(long_file) > 0) && (fabs(long_file) < 180.0))
+  {
       printf("Valid latitude and longitude in config file\n");
-	
+      lattitude = lat_file;
+      longitude = long_file;
+  }	
   wiringPiSetup ();
 
 // Check for SPI and AX-5043 Digital Transceiver Board	
@@ -302,7 +305,7 @@ int main(int argc, char *argv[]) {
   #endif
 	
     config_file = fopen("sim.cfg","w");
-    fprintf(config_file, "%s %d %f %f", call, reset_count, lat_file, long_file);
+    fprintf(config_file, "%s %d %8.4f %8.4f", call, reset_count, lat_file, long_file);
 //    fprintf(config_file, "%s %d", call, reset_count);
     fclose(config_file);
     config_file = fopen("sim.cfg","r"); 

From 3708d103b987cf77da06327529042d638c09b145 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sun, 22 Nov 2020 11:22:20 -0500
Subject: [PATCH 52/56] latitude typo

---
 afsk/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/afsk/main.c b/afsk/main.c
index a1c5d8b9..9765560b 100644
--- a/afsk/main.c
+++ b/afsk/main.c
@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) {
   if ((fabs(lat_file) > 0) && (fabs(lat_file) < 90.0) && (fabs(long_file) > 0) && (fabs(long_file) < 180.0))
   {
       printf("Valid latitude and longitude in config file\n");
-      lattitude = lat_file;
+      latitude = lat_file;
       longitude = long_file;
   }	
   wiringPiSetup ();

From f7b980a3242c6eaad63a90239c4e24d6f694ac7c Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Tue, 24 Nov 2020 09:52:22 -0500
Subject: [PATCH 53/56] added parameter to do make

---
 groundstation/update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/groundstation/update.sh b/groundstation/update.sh
index 28751feb..c231fbbe 100755
--- a/groundstation/update.sh
+++ b/groundstation/update.sh
@@ -5,7 +5,9 @@ echo -e "\nUpdating configurations. \n"
 
 cd ~/CubeSatSim && git pull
 
-make debug
+if [ "$1" = "make" ]; then
+  make debug
+fi
 
 sudo cp ~/CubeSatSim/groundstation/config_webrx.py /etc/openwebrx/config_webrx.py
 

From 17718c6df86e12d1e11317bf4f0bca9cb7e3e976 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Tue, 24 Nov 2020 09:56:54 -0500
Subject: [PATCH 54/56] fixed ARISS SSTV frequency

---
 groundstation/bookmarks.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/groundstation/bookmarks.json b/groundstation/bookmarks.json
index d0c73cfe..c77f3897 100644
--- a/groundstation/bookmarks.json
+++ b/groundstation/bookmarks.json
@@ -5,8 +5,8 @@
     "modulation": "nfm"
   },
   {
-    "name": "ISS SSTV",
-    "frequency": 145819000,
+    "name": "ISS SSTV/Voice",
+    "frequency": 145800000,
     "modulation": "nfm"
   },
   {

From f0e073bc8eb593feab34e6b9af45464f859c43b0 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Tue, 24 Nov 2020 11:47:01 -0500
Subject: [PATCH 55/56] Rename sstv_cam.desktop to sstv_cam.desktop.bk

---
 groundstation/{sstv_cam.desktop => sstv_cam.desktop.bk} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename groundstation/{sstv_cam.desktop => sstv_cam.desktop.bk} (100%)

diff --git a/groundstation/sstv_cam.desktop b/groundstation/sstv_cam.desktop.bk
similarity index 100%
rename from groundstation/sstv_cam.desktop
rename to groundstation/sstv_cam.desktop.bk

From 07e2c35b6a80b4a5b7d689e8f88d1c81a16c83e4 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Tue, 24 Nov 2020 11:50:10 -0500
Subject: [PATCH 56/56] Rename sstv_decode_sim.desktop to
 sstv_decode_sim.desktop.bk

---
 .../{sstv_decode_sim.desktop => sstv_decode_sim.desktop.bk}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename groundstation/{sstv_decode_sim.desktop => sstv_decode_sim.desktop.bk} (100%)

diff --git a/groundstation/sstv_decode_sim.desktop b/groundstation/sstv_decode_sim.desktop.bk
similarity index 100%
rename from groundstation/sstv_decode_sim.desktop
rename to groundstation/sstv_decode_sim.desktop.bk