Merge branch 'pacsat-loop-old' into pacsat

2 weeks ago · ea2e3784b8
parent 0fead94a0a 3f2c43fb3e
commit ea2e3784b8
58 changed files with 1586 additions and 241 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ There are several hardware versions and software branches to go with them - see

 See the Wiki Software Install page for more details: https://github.com/alanbjohnston/CubeSatSim/wiki/2.-Software-Install. The software runs on any Raspberry Pi including the Raspberry Pi 4B, 3B, 3B+, Pi Zero, Pi Zero W, or Pi Zero 2 W.

-There are two ways to get the CubeSatSim software for your Pi.
+There are two ways to get the CubeSatSim(TM) software for your Pi.

 One option is to download the disk image file and write it to a 16GB micro SD card or larger.  The image is based on Raspberry Pi OS (Rasbian) Lite, dated December 2020. All software is installed, you just need to login to change your password and set your amateur radio callsign if you have one.  You can run the ./update.sh script to update all packages and update and compile the latest CubeSatSim software.

--- a/7
+++ b/7
@ -552,7 +552,12 @@ elif [ "$1" = "-c" ]; then
 		echo $callsign $2 $3 $4 $5 $6 $7 $8 $9 ${10} ${11}
 		echo $callsign $2 $3 $4 $5 $6 $7 $8 $9 ${10} ${11} > /home/pi/CubeSatSim/sim.cfg

-		sudo sed -i 's/$oldcallsign/$callsign/g' /home/pi/pi_pacsat/Debug/pacsat.config > /dev/null 2>&1
+		sudo systemctl stop pacsatsim
+		sudo killall -9 java &>/dev/null
+
+		sudo sed -i "s/$oldcallsign/$callsign/g" /home/pi/pi_pacsat/Debug/pacsat.config 
+		sudo sed -i "s/callsign=$oldcallsign/callsign=$callsign/g" /home/pi/PacSatGround/PacSatGround.properties
+		sudo sed -i "s/$oldcallsign/$callsign/g" /home/pi/PacSatGround/spacecraft/PacSatSim.properties
 	fi
 	
 	if [ "$norestart" = "1" ]; then
--- a/direwolf/direwolf-pacsatsim-jp14-half.conf
+++ b/direwolf/direwolf-pacsatsim-jp14-half.conf
@ -0,0 +1,9 @@
+ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
+#PTT GPIO 20  
+MYCALL AMSAT-12
+CHANNEL 0
+MODEM 1200
+#FULLDUP ON
+FULLDUP OFF
+TXDELAY 15
+#FIX_BITS 1 AX25
--- a/direwolf/direwolf-pacsatsim-jp14-loop.conf
+++ b/direwolf/direwolf-pacsatsim-jp14-loop.conf
@ -0,0 +1,8 @@
+ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Loopback,DEV=0
+PTT GPIO -20  
+MYCALL AMSAT-12
+CHANNEL 0
+MODEM 1200
+FULLDUP ON
+TXDELAY 15
+#FIX_BITS 1 AX25
--- a/direwolf/direwolf-pacsatsim-jp14.conf
+++ b/direwolf/direwolf-pacsatsim-jp14.conf
@ -1,8 +1,8 @@
 ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
-PTT GPIO 20  
-MYCALL AMSAT
+PTT GPIO -20  
+MYCALL AMSAT-12
 CHANNEL 0
 MODEM 1200
-FULLDUP OFF
-#TXDELAY 30
+FULLDUP ON
+TXDELAY 15
 #FIX_BITS 1 AX25
--- a/direwolf/direwolf-pacsatsim-loopback.conf
+++ b/direwolf/direwolf-pacsatsim-loopback.conf
@ -0,0 +1,8 @@
+ADEVICE plughw:CARD=Loopback,DEV=1 plughw:CARD=Loopback,DEV=1
+PTT GPIO -20  
+MYCALL AMSAT-12
+CHANNEL 0
+MODEM 1200
+FULLDUP ON
+TXDELAY 15
+#FIX_BITS 1 AX25
--- a/groundstation/SDRpp.desktop
+++ b/groundstation/SDRpp.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Exec=/home/pi/CubeSatSim/groundstation/sdrpp.sh
+Name=SDRpp
+Comment=SDRpp
+Icon=/home/pi/Icons/sdrpp.png
+Path=/home/pi
+Terminal=true
+Categories=HamRadio
+Keywords=Ham Radio;SDR
--- a/groundstation/aprs.desktop
+++ b/groundstation/aprs.desktop
@ -2,7 +2,7 @@
 Name=APRS Decode using Direwolf
 GenericName=Decodes APRS using rtl_fm and Direwolf
 Comment=APRS signals
-Exec=/home/pi/CubeSatSim/groundstation/aprs.sh
+Exec=/usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/groundstation/packet.sh"
 Icon=/home/pi/Icons/aprs.png
 Terminal=true
 Type=Application
--- a/groundstation/aprs.sh
+++ b/groundstation/aprs.sh
@ -3,12 +3,14 @@

 sudo modprobe snd-aloop

-sudo systemctl stop openwebrx
+sudo systemctl stop openwebrx &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp &>/dev/null

 pkill -o chromium &>/dev/null

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 rtl_fm &>/dev/null

 sudo killall -9 direwolf &>/dev/null
@ -78,7 +80,7 @@ echo -e "Auto decoding APRS packets on $frequency Hz"

 #sudo rtl_fm -f 144.39M -s 22050 -g 48 - | multimon-ng -a AFSK1200 -A -t raw -

-direwolf -r 48000 -t 0 &
+direwolf -c /home/pi/CubeSatSim/groundstation/direwolf.conf -r 48000 -t 0 &

 sleep 5

@ -87,6 +89,7 @@ echo "$value" > /dev/null
 set -- $value

 #rtl_fm -M fm -f 144.39M -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1
-rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+#rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+rtl_fm -M fm -f $frequency -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1

 sleep 5
--- a/groundstation/autostart/chromium.desktop
+++ b/groundstation/autostart/chromium.desktop
@ -2,4 +2,4 @@
 [Desktop Entry]
 Type=Application
 Name=Chromium with WebSDR
-Exec=chromium-browser --check-for-update-interval=1 --simulate-critical-update --noerrdialogs --disable-infobars http://127.0.0.1:8073
+Exec=chromium-browser --check-for-update-interval=1 --simulate-critical-update  --noerrdialogs --disable-infobars --app=http://localhost:8073
--- a/groundstation/bookmarks.json
+++ b/groundstation/bookmarks.json
@ -1,54 +1,4 @@
 [
-  {
-    "name": "ISS APRS",
-    "frequency": 145825000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "ISS SSTV/Voice",
-    "frequency": 145800000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "ARISS Repeater Downlink",
-    "frequency": 437800000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "AO-27",
-    "frequency": 436795000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "AO-73",
-    "frequency": 145815000,
-    "modulation": "usb"
-  },
-  {
-    "name": "Fox-1B AO-91",
-    "frequency": 145960000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "Fox-1D AO-92",
-    "frequency": 145880000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "HuskySat-1 HO-107",
-    "frequency": 435800000,
-    "modulation": "usb"
-  },
-  {
-    "name": "Fox-1E",
-    "frequency": 435750000,
-    "modulation": "usb"
-  },
-  {
-    "name": "MAX VALIER",
-    "frequency": 145860000,
-    "modulation": "usb"
-  },
    {
        "name": "NOAA WX Radio 1",
        "frequency": 162400000,
@ -85,53 +35,23 @@
        "modulation": "nfm"
    },
    {
-    "name": "CAS-4A",
-    "frequency": 145855000,
-    "modulation": "usb"
-  },
-  {
-    "name": "CAS-4B",
-    "frequency": 145910000,
-    "modulation": "usb"
-  },
-  {
-    "name": "XW-2A",
-    "frequency": 145660000,
-    "modulation": "usb"
-  },
-  {
-    "name": "XW-2B",
-    "frequency": 145725000,
-    "modulation": "usb"
-  },
-  {
-    "name": "XW-2C",
-    "frequency": 145790000,
-    "modulation": "usb"
-  },
-  {
-    "name": "XW-2F",
-    "frequency": 145975000,
-    "modulation": "usb"
+        "name": "CubeSatSim",
+        "frequency": 434900000,
+        "modulation": "packet"
    },
    {
-    "name": "NOAA-19",
-    "frequency": 137100000,
+        "name": "ISS SSTV/Voice",
+        "frequency": 145800000,
        "modulation": "nfm"
    },
    {
-    "name": "NOAA-18",
-    "frequency": 137912500,
-    "modulation": "nfm"
+        "name": "ISS APRS",
+        "frequency": 145825000,
+        "modulation": "packet"
    },
    {
-    "name": "NOAA-15",
-    "frequency": 137620000,
+        "name": "ISS Voice Repeater",
+        "frequency": 437800000,
        "modulation": "nfm"
-  },
-  {
-    "name": "CubeSatSim",
-    "frequency": 434900000,
-    "modulation": "packet"
    }
 ]
--- a/groundstation/cubicsdr.desktop
+++ b/groundstation/cubicsdr.desktop
@ -3,7 +3,7 @@ Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/cubicsdr.sh
 Name=SDR FM Broadcast
 Comment=CubicSDR FM Broadcast 
-Icon=/home/pi/Downloads/cubicsdr.png
+Icon=/home/pi/Icons/cubicsdr.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/groundstation/cubicsdr.sh
+++ b/groundstation/cubicsdr.sh
@ -9,19 +9,21 @@ echo "Note: Select Generic RTL2832 device then click Start to begin"

 echo

-sudo systemctl stop openwebrx
+sudo systemctl stop openwebrx &>/dev/null

 sudo killall -9 java &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp &>/dev/null

 pkill -o chromium &>/dev/null

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 rtl_fm &>/dev/null

 sudo killall -9 direwolf &>/dev/null

-sudo killall -9 aplay &>/dev/null
+#sudo killall -9 aplay &>/dev/null

 sudo killall -9 qsstv &>/dev/null

@ -37,9 +39,10 @@ sudo killall -9 CubicSDR &>/dev/null

 sudo killall -9 zenity &>/dev/null

-zenity --info --width=650 --height=140 --title="Instructions" --text="When CubicSDR opens, select <i>Generic RTL2832U</i> device then click <b>Start</b> to begin.\n\nThen click on a signal in the watefall to listen." &
-
+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start

+zenity --info --width=650 --height=140 --title="Instructions" --text="When CubicSDR opens, select <i>Generic RTL2832U</i> device then click <b>Start</b> to begin.\n\nThen click on a signal in the watefall to listen." &

 sleep 5

--- a/groundstation/direwolf.conf
+++ b/groundstation/direwolf.conf
@ -1 +1 @@
-ADEVICE plughw:CARD=Loopback,DEV=1 plughw:CARD=b1,DEV=0
+ADEVICE plughw:CARD=Loopback,DEV=1 default
--- a/groundstation/direwolf/direwolf-fm-pacsat-jp14-device.conf
+++ b/groundstation/direwolf/direwolf-fm-pacsat-jp14-device.conf
@ -0,0 +1,10 @@
+MYCALL AMSAT
+ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
+#PTT GPIO 20
+CHANNEL 0
+MODEM 1200
+KISSPORT 8100
+AGWPORT 8002
+FULLDUP OFF
+TXDELAY 30
+#FIX_BITS 1 AX25
--- a/groundstation/direwolf/direwolf-fm-pacsat-jp14-loop.conf
+++ b/groundstation/direwolf/direwolf-fm-pacsat-jp14-loop.conf
@ -0,0 +1,10 @@
+MYCALL AMSAT
+ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Loopback,DEV=0
+#PTT GPIO 20
+CHANNEL 0
+MODEM 1200
+KISSPORT 8100
+AGWPORT 8002
+FULLDUP OFF
+TXDELAY 30
+#FIX_BITS 1 AX25
--- a/groundstation/direwolf/direwolf-fm-pacsat-jp14-ptt.conf
+++ b/groundstation/direwolf/direwolf-fm-pacsat-jp14-ptt.conf
@ -0,0 +1,10 @@
+MYCALL AMSAT
+ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
+PTT GPIO 20
+CHANNEL 0
+MODEM 1200
+KISSPORT 8100
+AGWPORT 8002
+FULLDUP OFF
+TXDELAY 30
+#FIX_BITS 1 AX25
--- a/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf
+++ b/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf
@ -1,9 +1,10 @@
 MYCALL AMSAT
 ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
-PTT GPIO 20
+#PTT GPIO 20
 CHANNEL 0
 MODEM 1200
 KISSPORT 8100
+AGWPORT 8002
 FULLDUP OFF
-#TXDELAY 30
+TXDELAY 30
 #FIX_BITS 1 AX25
--- a/groundstation/direwolf/direwolf-pacsat-loopback.conf
+++ b/groundstation/direwolf/direwolf-pacsat-loopback.conf
@ -0,0 +1,10 @@
+MYCALL AMSAT
+ADEVICE plughw:CARD=Loopback,DEV=0 plughw:CARD=Loopback,DEV=0
+#PTT GPIO 20
+CHANNEL 0
+MODEM 1200
+KISSPORT 8100
+AGWPORT 8002
+FULLDUP OFF
+TXDELAY 30
+#FIX_BITS 1 AX25
--- a/groundstation/direwolf/direwolf.conf
+++ b/groundstation/direwolf/direwolf.conf
@ -1 +1 @@
-ADEVICE plughw:CARD=Loopback,DEV=1 plughw:CARD=b1,DEV=0
+ADEVICE plughw:CARD=Loopback,DEV=1 
--- a/groundstation/fox-download.desktop
+++ b/groundstation/fox-download.desktop
@ -2,7 +2,7 @@
 Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/fox-download.sh
 Name=FoxTelem Download
-Comment=FIAB-v3
+Comment=FIAB-v4
 Icon=/home/pi/Icons/FoxTelemDownload.png
 Path=/home/pi
 Terminal=true
--- a/groundstation/fox-profile.desktop
+++ b/groundstation/fox-profile.desktop
@ -2,8 +2,8 @@
 Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/fox-profile.sh
 Name=Change FoxTelem Profile
-Comment=FIAB-v3
-Icon=/home/pi/Downloads/foxtelem.png
+Comment=FIAB-v4
+Icon=/home/pi/Icons/foxtelem.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/groundstation/fox-profile.sh
+++ b/groundstation/fox-profile.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 # script to change FoxTelem default profile 

-echo "Script to change your default FoxTelem profile for FIAB v3"
+echo "Script to change your default FoxTelem profile for FIAB v4"

 echo 

--- a/groundstation/fox-run.sh
+++ b/groundstation/fox-run.sh
@ -1,10 +1,12 @@
 #!/bin/bash
 # script to run FoxTelem 

-echo "Startup script to run FoxTelem for FIAB v3"
+echo "Startup script to run FoxTelem for FIAB v4"

 echo 

+source /home/pi/venv/bin/activate
+
 sudo killall -9 FoxTelem &>/dev/null

 sudo killall -9 zenity &>/dev/null
@ -12,7 +14,7 @@ sudo killall -9 zenity &>/dev/null
 FILE=/home/pi/FoxTelemetryData/.foxprofile  
 if [ ! -f "$FILE" ]; then

-   profile=$(zenity --text="Choose your default FoxTelem profile:" --list 2>/dev/null --width=410 --height=120 --title="Set FoxTelem Profile" --column="Profile" --column="Receive and decode telemetry from" Fox-in-a-Box "AMSAT Fox satellites" "CubeSatSim" "AMSAT CubeSat Simulator")
+   profile=$(zenity --text="Choose your default FoxTelem profile:" --list 2>/dev/null --width=410 --height=120 --title="Set FoxTelem Profile" --column="Profile" --column="Receive and decode telemetry from" Fox-in-a-Box "AMSAT Satellites" "CubeSatSim" "AMSAT CubeSat Simulator")

   echo $profile

--- a/groundstation/fox-startup.sh
+++ b/groundstation/fox-startup.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 # script to run FoxTelem 

-echo "Startup script to run FoxTelem for FIAB v3"
+echo "Startup script to run FoxTelem for FIAB v4"

 echo 

--- a/groundstation/fox.sh
+++ b/groundstation/fox.sh
@ -5,12 +5,14 @@ echo "Script to run FoxTelem for ARISS Radio Pi"

 echo 

-sudo systemctl stop openwebrx
+sudo systemctl stop openwebrx &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp &>/dev/null

 pkill -o chromium &>/dev/null

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 rtl_tcp &>/dev/null

 sudo killall -9 rtl_fm &>/dev/null
@ -21,12 +23,15 @@ sudo killall -9 CubicSDR &>/dev/null

 sudo killall -9 direwolf &>/dev/null

-sudo killall -9 aplay &>/dev/null
+#sudo killall -9 aplay &>/dev/null

 sudo killall -9 qsstv &>/dev/null

 sudo killall -9 zenity &>/dev/null

+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start
+
 sleep 5

 #/home/pi/FoxTelem/FoxTelem /home/pi/FoxTelemetryData-CubeSatSim
--- a/groundstation/foxtelem.desktop
+++ b/groundstation/foxtelem.desktop
@ -2,8 +2,8 @@
 Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/fox-run.sh
 Name=FoxTelem
-Comment=FIAB-v3
-Icon=/home/pi/Downloads/foxtelem.png
+Comment=FIAB-v4
+Icon=/home/pi/Icons/foxtelem.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/groundstation/gpredict.desktop
+++ b/groundstation/gpredict.desktop
@ -3,7 +3,7 @@ Type=Application
 Exec=/usr/bin/gpredict
 Name=Gpredict
 Comment=ISS and Satellite Tracking for ARISS Radio Pi
-Icon=/home/pi/Downloads/gpredict.png
+Icon=/home/pi/Icons/gpredict.png
 Path=/home/pi
 Terminal=false
 Categories=HamRadio
--- a/groundstation/loc-add-foxtelem.py
+++ b/groundstation/loc-add-foxtelem.py
@ -119,6 +119,16 @@ if (latitude != 0) and (longitude != 0):

  print("\nKLAtracker configuration updated with your latitude and longitude")  

+  latSedStr = 'sed -i "s/latitude=.*/latitude=' + str(latitude) + '/g" /home/pi/PacSatGround/PacSatGround.properties'
+  #print (latSedStr)
+  system(latSedStr)
+
+  longSedStr = 'sed -i "s/longitude=.*/longitude=' + str(longitude) + '/g" /home/pi/PacSatGround/PacSatGround.properties'
+  #print (longSedStr)
+  system(longSedStr)
+
+  print("\nPacsat configuration updated with your latitude and longitude")  
+      
  receiver_gpsSedStr = 'sudo sed -i "s/        ' + dquote + 'lat' + dquote  + ': .*/        ' + dquote + 'lat' + dquote +  ': ' + str(latitude) + ',/g" /var/lib/openwebrx/settings.json'
  #print (receiver_gpsSedStr)
  system(receiver_gpsSedStr)
--- a/groundstation/loc.sh
+++ b/groundstation/loc.sh
@ -5,6 +5,9 @@ sudo killall -9 java &>/dev/null

 sudo killall -9 gpredict &>/dev/null

+source /home/pi/venv/bin/activate
+
+
 python3 /home/pi/CubeSatSim/groundstation/loc-foxtelem.py

 #/usr/bin/gpredict
--- a/groundstation/packet.sh
+++ b/groundstation/packet.sh
@ -12,6 +12,8 @@ pkill -o chromium &>/dev/null

 sudo killall -9 rtl_fm &>/dev/null

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 direwolf &>/dev/null

 sudo killall -9 aplay &>/dev/null
@ -26,6 +28,9 @@ sudo killall -9 CubicSDR &>/dev/null

 sudo killall -9 zenity &>/dev/null

+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start
+
 echo

 frequency=$(zenity --list 2>/dev/null --width=410 --height=360 --title="Packet Decoding with Direwolf" --text="Choose the frequency for packet decoding" --column="kHz" --column="Application" 144390 "APRS US 2m" 434900 "CubeSatSim" 144800 "APRS European 2m" 145175 "APRS Australian 2m" Other "Choose another frequency" 145825 "APRS on ISS" 437100 "Serenity CubeSat 4800 bps" Serenity "Test Serenity CubeSat decoding with WAV file" APRS "Test APRS decoding with CubeSatSim WAV file")
@ -175,7 +180,7 @@ else

  echo -e "Auto decoding APRS packets on $frequency Hz"

-  direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf.conf -t 0 &
+  direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf.conf & # -t 0 &

 fi

@ -186,6 +191,7 @@ echo "$value" > /dev/null
 set -- $value

 #rtl_fm -M fm -f 144.39M -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1
-rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+#rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,1 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+rtl_fm -M fm -f $frequency -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1

 sleep 5
--- a/groundstation/pacsat-d.sh
+++ b/groundstation/pacsat-d.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-jp14-loop.conf -t 0 
+
--- a/groundstation/pacsat-dj.sh
+++ b/groundstation/pacsat-dj.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf -t 0"
+
+
+
--- a/groundstation/pacsat.desktop
+++ b/groundstation/pacsat.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Pacsat
+GenericName=Pacsat Loopback
+Comment=Pacsat
+Exec=/usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/groundstation/pacsat.sh"
+Icon=/home/pi/Icons/pacsat.png
+Terminal=true
+Type=Application
+Categories=HamRadio;
+Keywords=APRS;
--- a/groundstation/pacsat.sh
+++ b/groundstation/pacsat.sh
@ -4,21 +4,29 @@

 sudo modprobe snd-aloop

-/home/pi/CubeSatSim/config -I
+sudo systemctl stop cubesatsim >/dev/null 2>&1

-sudo systemctl stop command &>/dev/null
+sudo systemctl stop transmit >/dev/null 2>&1

-sudo systemctl stop openwebrx &>/dev/null
+sudo systemctl stop command >/dev/null 2>&1

-sudo systemctl stop rtl_tcp &>/dev/null
+#/home/pi/CubeSatSim/config -I
+
+sudo systemctl stop command >/dev/null 2>&1
+
+sudo systemctl stop openwebrx >/dev/null 2>&1
+
+sudo systemctl stop rtl_tcp >/dev/null 2>&1

 pkill -o chromium &>/dev/null

 sudo killall -9 rtl_fm &>/dev/null

-sudo killall -9 direwolf &>/dev/null
+#sudo killall -9 direwolf &>/dev/null

-sudo killall -9 aplay &>/dev/null
+sudo killall -9 sdrpp &>/dev/null
+
+#sudo killall -9 aplay &>/dev/null

 sudo killall -9 qsstv &>/dev/null

@ -32,48 +40,67 @@ sudo killall -9 zenity &>/dev/null

 echo

-value=`cat /home/pi/CubeSatSim/sim.cfg`
-echo "$value" > /dev/null
-set -- $value
+#sudo systemctl restart pacsatsim

-echo "Receive frequency is $8 MHz"	
-echo "Transmit frequency is $7 MHz"	
-echo 
-echo "To change, quit and type CubeSatSim/config -F"
-echo
+#sudo /etc/init.d/alsa-utils stop
+#sudo /etc/init.d/alsa-utils start

-frequency="$8e6"

-#echo "Note that the 'Tuned to' frequency will be different from the chosen frequency due to the way SDRs work."
+#echo "Waiting 10 seconds for Pacsatsim to start"
+
+#sleep 10
+
+#value=`cat /home/pi/CubeSatSim/sim.cfg`
+#echo "$value" > /dev/null
+#set -- $value

+#echo "Receive frequency is $8 MHz"	
+#echo "Transmit frequency is $7 MHz"	
+#echo 
+#echo "To change, quit and type CubeSatSim/config -F"
 #echo

-if [[ $(arecord -l | grep "USB Audio Device") ]] ; then
+#frequency="$8e6"

-	echo -e "Direwolf using USB Sound Card (FM Transceiver) on $frequency Hz"
+#echo "Note that the 'Tuned to' frequency will be different from the chosen frequency due to the way SDRs work."

-	direwolf -P+ -D1 -qd -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf -t 0 &
+#echo

-else
+echo 
+echo "The Pacsat Ground Station are running on this Pi using FM receiver and rpitx transmitter"
+echo

-	echo -e "Direwolf using RTL-SDR on $frequency Hz"
+#cd /home/pi/Desktop/PacSatGround_0.46m_linux/

-	direwolf -P+ -D3 -r 48000 -qd -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat.conf -t 0 &
+#setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSatGround" # removed &

-	sleep 5
+#direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0  # &
+#/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0"

-	value=`aplay -l | grep "Loopback"`
-	echo "$value" > /dev/null
-	set -- $value
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/groundstation/pacsat-d.sh"

-	#rtl_fm -M fm -f 144.39M -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1
-	rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1 &
+arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 435045 &

-fi
+echo "Don't close the direwolf window or the Pacsatsim will stop running."

 cd /home/pi/Desktop/PacSatGround_0.46m_linux/

-sudo setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSatGround" 
+setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSatGround" # removed &
+
+
+#cd /home/pi/Desktop/PacSatGround_0.46m_linux/
+
+#sudo setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSatGround" 
+
+cd
+
+#sudo systemctl stop pacsatsim 
+
+sleep 10
+
+#echo "Stopping Pacsatsim"
+
+#$SHELL



--- a/groundstation/pacsatlog.desktop
+++ b/groundstation/pacsatlog.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Pacsat Log
+GenericName=Pacsat Loopback
+Comment=Pacsat
+Exec=/usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/log -p"
+Icon=/home/pi/Icons/pacsat.png
+Terminal=true
+Type=Application
+Categories=HamRadio;
+Keywords=APRS;
--- a/groundstation/reset_pacsat.sh
+++ b/groundstation/reset_pacsat.sh
@ -0,0 +1,55 @@
+#!/bin/bash
+
+# script to clear Pacsat Ground Station and Pacsatsim state
+
+echo "Clearing all Pacsat Ground Station and Pacsatsim state"
+
+echo
+
+sudo systemctl stop pacsatsim 
+
+#sudo killall -9 direwolf &>/dev/null
+
+sudo killall -9 java &>/dev/null
+
+cd
+
+cd pi_pacsat
+
+cd Debug
+
+sudo rm -r /home/pi/PacSat
+
+mkdir /home/pi/PacSat
+mkdir /home/pi/PacSat/pacsat
+mkdir /home/pi/PacSat/pacsat/dir
+
+#value=`cat /home/pi/CubeSatSim/sim.cfg`
+#echo "$value" > /dev/null
+#set -- $value
+
+echo "bit_rate=9600" > pacsat.config
+echo "bbs_callsign=AMSAT-12" >> pacsat.config
+echo "broadcast_callsign=AMSAT-11" >> pacsat.config
+echo "digi_callsign=AMSAT-1" >> pacsat.config
+echo "max_frames_in_tx_buffer=5" >> pacsat.config
+
+sudo rm pacsat_last_command_time.dat
+sudo rm pacsat_upload_table.dat
+sudo rm pacsat.state
+
+echo "pb_open=1" > pacsat.state
+echo "uplink_open=1" >> pacsat.state
+echo "pb_max_period_for_client_in_seconds=60" >> pacsat.state
+echo "uplink_max_period_for_client_in_seconds=60" >> pacsat.state
+
+touch /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat
+
+sudo rm -r /home/pi/PacSatGround
+
+mkdir /home/pi/PacSatGround
+
+echo
+
+echo "You will need to install the Pacsatsim spacecraft file and set the Delay to 750ms and Port to 8100 and restart the Pacsat Ground Station"
+
--- a/groundstation/rtl-tcp.desktop
+++ b/groundstation/rtl-tcp.desktop
@ -3,7 +3,7 @@ Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/rtl-tcp.sh
 Name=RTL-TCP
 Comment=RTL-TCP for SDR#
-Icon=/home/pi/Downloads/SDRSharp.png
+Icon=/home/pi/Icons/SDRSharp.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/groundstation/rtl-tcp.sh
+++ b/groundstation/rtl-tcp.sh
@ -23,13 +23,15 @@ echo "Note: you need to be on the Wifi network: $ssid"

 echo

-sudo systemctl stop openwebrx
+sudo systemctl stop openwebrx &>/dev/null

 sleep 2

 pkill -o chromium &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp &>/dev/null
+
+sudo killall -9 sdrpp &>/dev/null

 sudo killall -9 java &>/dev/null

@ -43,12 +45,22 @@ sudo killall -9 qsstv &>/dev/null

 sudo killall -9 direwolf &>/dev/null

-sudo killall -9 aplay &>/dev/null
+#sudo killall -9 aplay &>/dev/null

 sudo killall -9 zenity &>/dev/null

+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start
+
+#sudo /bin/sh -c '/usr/local/bin/rtl_tcp -a $(hostname -I|cut -f1 -d " ")'
+sudo systemctl start rtl_tcp &>/dev/null
+
+sudo journalctl -af -u rtl_tcp &

-sudo /bin/sh -c '/usr/local/bin/rtl_tcp -a $(hostname -I|cut -f1 -d " ")'
+while [[ $(sudo systemctl status rtl_tcp | grep "Active: active (running)") ]]
+do
+  sleep 5
+done  

 sleep 5

--- a/groundstation/rtl_tcp.service
+++ b/groundstation/rtl_tcp.service
@ -3,7 +3,7 @@ Description=RTL-TCP

 [Service]
 TimeoutStopSec = 5
-ExecStart=/bin/sh -c '/usr/local/bin/rtl_tcp -a $(hostname -I)'
+ExecStart=/bin/sh -c 'rtl_tcp -a $(hostname -I|cut -f1 -d " ")'
 WorkingDirectory=/home/pi
 StandardOutput=inherit
 StandardError=inherit
--- a/groundstation/rtltcp.socket
+++ b/groundstation/rtltcp.socket
@ -0,0 +1,9 @@
+[Unit]
+Description=RTL TCP Socket
+PartOf=rtltcp.service
+
+[Socket]
+ListenStream=[::]:1234
+
+[Install]
+WantedBy=sockets.target
--- a/groundstation/sdr.sh
+++ b/groundstation/sdr.sh
@ -24,6 +24,8 @@ echo "Note: you need to be on the Wifi network: $ssid"

 echo

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 java &>/dev/null

 sudo killall -9 rtl_fm &>/dev/null
@ -36,19 +38,22 @@ sudo killall -9 CubicSDR &>/dev/null

 sudo killall -9 qsstv &>/dev/null

-sudo killall -9 aplay &>/dev/null
+#sudo killall -9 aplay &>/dev/null

 sudo killall -9 direwolf &>/dev/null

 sudo killall -9 zenity &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp &>/dev/null
+
+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start

-sudo systemctl restart openwebrx
+sudo systemctl restart openwebrx &>/dev/null

 sleep 10

-setsid chromium-browser --check-for-update-interval=1 --simulate-critical-update  --noerrdialogs --disable-infobars http://127.0.0.1:8073 &>/dev/null & 
+setsid chromium-browser --check-for-update-interval=1 --simulate-critical-update  --noerrdialogs --disable-infobars --app=http://localhost:8073 &>/dev/null & 

 sleep 10

--- a/groundstation/sdrpp.sh
+++ b/groundstation/sdrpp.sh
@ -0,0 +1,47 @@
+#!/bin/bash
+# script to run sdrpp
+
+echo "Script to run SDRpp for ARISS Radio Pi"
+
+echo
+
+sudo systemctl stop openwebrx
+
+sudo killall -9 java &>/dev/null
+
+sudo killall -9 sdrpp &>/dev/null
+
+sudo systemctl stop rtl_tcp
+
+pkill -o chromium &>/dev/null
+
+sudo killall -9 rtl_fm &>/dev/null
+
+sudo killall -9 direwolf &>/dev/null
+
+#sudo killall -9 aplay &>/dev/null
+
+sudo killall -9 qsstv &>/dev/null
+
+sudo killall -9 rtl_tcp &>/dev/null
+
+sudo killall -9 CubicSDR &>/dev/null
+
+#sudo kill `ps -aux | grep cubicsdr-packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null
+
+#sudo kill `ps -aux | grep packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null
+
+#sudo kill `ps -aux | grep sstv_decode_prompt| grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null
+
+sudo killall -9 zenity &>/dev/null
+
+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start
+
+sleep 5
+
+setsid sdrpp &
+
+sleep 10
+
+#$SHELL
--- a/groundstation/set
+++ b/groundstation/set
@ -3,7 +3,7 @@ Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/loc.sh
 Name=Set My Location
 Comment=Set Location for Gpredict 
-Icon=/home/pi/Downloads/gpredict.png
+Icon=/home/pi/Icons/gpredict.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/groundstation/settings.json
+++ b/groundstation/settings.json
@ -0,0 +1,808 @@
+{
+    "version": 8,
+    "sdrs": {
+        "rtlsdr": {
+            "name": "RTL-SDR",
+            "type": "rtl_sdr",
+            "profiles": {
+                "70cm": {
+                    "name": "70cm Ham Band 435 MHz (CubeSatSim)",
+                    "center_freq": 435000000,
+                    "rf_gain": 10.0,
+                    "samp_rate": 2400000,
+                    "start_freq": 434900000,
+                    "start_mod": "nfm",
+                    "tuning_step": 1000,
+                    "direct_sampling": 0
+                },
+                "2m": {
+                    "name": "WX Band 161 MHz",
+                    "center_freq": 162400000,
+                    "rf_gain": 29,
+                    "samp_rate": 2048000,
+                    "start_freq": 157000000,
+                    "start_mod": "nfm"
+                },
+                "e59a4765-4139-4ab8-89c5-d8ac3343ba70": {
+                    "name": "2m Ham Band 146 MHz (ISS)",
+                    "center_freq": 145000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 145000000,
+                    "start_mod": "nfm",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 0
+                },
+                "faf80b0b-1a96-4a9b-96fa-ce40b109c7e0": {
+                    "name": "70cm Ham Band 438 MHz (ISS)",
+                    "rf_gain": 29.0,
+                    "center_freq": 438000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 437800000,
+                    "start_mod": "nfm"
+                },
+                "a4fd4a5d-d2d0-4949-87e2-bda83cd83a37": {
+                    "name": "FM Band 95 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 95000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 94000000,
+                    "start_mod": "wfm"
+                },
+                "ce2bca29-78cb-45d8-ab46-8dea3135981c": {
+                    "name": "10m Ham Band 28 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 28000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 28000000,
+                    "start_mod": "usb",
+                    "direct_sampling": 0
+                },
+                "d6cdbf2d-74e4-4cac-aaa8-e793103a8e89": {
+                    "name": "6m Ham Band 51 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 51000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 51000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "e2aba387-1d3b-4ca8-b280-e119282b8812": {
+                    "name": "90 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 90000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 90000000,
+                    "start_mod": "wfm"
+                },
+                "f700b99d-3c51-4524-b151-a0809b868ecc": {
+                    "name": "92 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 92000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 92000000,
+                    "start_mod": "wfm"
+                },
+                "dc6af94f-d607-4fee-a522-7f375f66a62c": {
+                    "name": "94 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 94000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 94000000,
+                    "start_mod": "wfm"
+                },
+                "6887e85a-a4dc-4245-810f-99801fc5e824": {
+                    "name": "96 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 96000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 96000000,
+                    "start_mod": "wfm"
+                },
+                "a2182ed6-70a8-4377-b233-ac6f8ccc91d7": {
+                    "name": "98 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 96000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 96000000,
+                    "start_mod": "wfm"
+                },
+                "57e38353-fb86-4935-899b-e365228b8ae5": {
+                    "name": "100 MHz FM Band",
+                    "center_freq": 100000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 100000000,
+                    "start_mod": "wfm"
+                },
+                "5e9ec6dd-905d-4781-bd13-9cb702f58e84": {
+                    "name": "102 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 102000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 102000000,
+                    "start_mod": "wfm"
+                },
+                "ef2c703c-2e22-4e87-82b5-581420d704bd": {
+                    "name": "104 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 104000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 104000000,
+                    "start_mod": "wfm"
+                },
+                "34cc3ddf-8018-4288-acb9-29e6940bc37e": {
+                    "name": "106 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 106000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 106000000,
+                    "start_mod": "wfm"
+                },
+                "b4693683-ccf5-474d-a2d9-9a47b0a18ee2": {
+                    "name": "108 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 108000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 108000000,
+                    "start_mod": "wfm"
+                },
+                "34224d77-7b61-467c-b78f-18c7f3af1a0c": {
+                    "name": "110 MHz FM Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 110000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 110000000,
+                    "start_mod": "wfm"
+                },
+                "8dd82d97-73db-4fa7-ac41-263c3026ea1d": {
+                    "name": "112 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 112000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 112000000,
+                    "start_mod": "nfm"
+                },
+                "79304b30-f10d-469e-9617-50a19bfdb435": {
+                    "name": "114 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 114000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 114000000,
+                    "start_mod": "nfm"
+                },
+                "c00bf096-27b8-4262-832c-df1a308d7eb9": {
+                    "name": "116 MHz",
+                    "rf_gain": 29.0,
+                    "center_freq": 116000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 116000000,
+                    "start_mod": "nfm"
+                },
+                "669d25a6-6c15-4131-a330-3c33dd2147f0": {
+                    "name": "118 Mhz Air Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 118000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 118000000,
+                    "start_mod": "am"
+                },
+                "948248fa-43d9-4e7d-bf86-afaadd391779": {
+                    "name": "120 MHz Air Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 120000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 120000000,
+                    "start_mod": "am"
+                },
+                "b634273b-8fc8-4e87-b5c4-e6226d4be0ac": {
+                    "name": "122 MHz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 122000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 121000000,
+                    "start_mod": "nfm"
+                },
+                "c55289a2-8286-4a3d-a505-37ba2867571a": {
+                    "name": "124 Mhz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 124000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 124000000,
+                    "start_mod": "am"
+                },
+                "4fe488b7-f369-43ba-bb49-91e1a185be7a": {
+                    "name": "126 MHz Air Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 126000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 126000000,
+                    "start_mod": "am"
+                },
+                "e79639a2-1384-4e92-8e46-f6e5670ec9fd": {
+                    "name": "128 MHz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 128000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 128000000,
+                    "start_mod": "am"
+                },
+                "319f3fb2-b98a-4620-85a7-a99d5a722bd5": {
+                    "name": "130 MHz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 130000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 130000000,
+                    "start_mod": "am"
+                },
+                "63c5c2ce-07de-496c-81f6-b188a7adbf39": {
+                    "name": "132 MHz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 132000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 132000000,
+                    "start_mod": "am"
+                },
+                "386bdc7b-eb10-4e05-972a-69d730a23cd8": {
+                    "name": "134 MHz Air Band",
+                    "rf_gain": 29.0,
+                    "center_freq": 134000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 134000000,
+                    "start_mod": "am"
+                },
+                "ae8ea8b1-23de-45ef-b8c4-3b83a188e65d": {
+                    "name": "136 MHz Air Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 136000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 136000000,
+                    "start_mod": "am"
+                },
+                "c0b1a28c-5e07-400a-a5f3-07c62db27587": {
+                    "name": "138 MHz NOAA Weather Satellite Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 138000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 138000000,
+                    "start_mod": "nfm"
+                },
+                "20f7ce56-fd85-4b3e-8fac-94cbe9ba0e1d": {
+                    "name": "140 MHz ",
+                    "rf_gain": 42.0,
+                    "center_freq": 140000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 140000000,
+                    "start_mod": "nfm"
+                },
+                "882079f8-5697-428a-ae9d-bcc091269c7f": {
+                    "name": "142 MHz ",
+                    "rf_gain": 42.0,
+                    "center_freq": 142000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 142000000,
+                    "start_mod": "nfm"
+                },
+                "da1b3f12-2eba-40e9-8c62-33493adf74b3": {
+                    "name": "144 MHz 2m Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 144000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 144000000,
+                    "start_mod": "nfm"
+                },
+                "8d9cf1e1-44c5-41c4-bcea-7b1c69446e62": {
+                    "name": "146 MHz 2m Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 146000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 146000000,
+                    "start_mod": "nfm"
+                },
+                "eec8aa0d-3485-43d2-baa4-82f7d9e14df6": {
+                    "name": "148 MHz 2m Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 148000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 148000000,
+                    "start_mod": "nfm"
+                },
+                "bf66a908-1988-4aec-b998-06e2bc7d0a84": {
+                    "name": "150 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 150000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 150000000,
+                    "start_mod": "nfm"
+                },
+                "0389f270-b919-4aae-a313-f73697059f70": {
+                    "name": "152 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 152000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 152000000,
+                    "start_mod": "nfm"
+                },
+                "6ef9d955-76aa-46c0-8463-2c23def5e37b": {
+                    "name": "154 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 154000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 154000000,
+                    "start_mod": "nfm"
+                },
+                "5d0a64c7-3bce-408e-94d9-c8315bef7540": {
+                    "name": "156 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 156000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 156000000,
+                    "start_mod": "nfm"
+                },
+                "5b869cae-ffa7-4554-96af-7acd497bbaf3": {
+                    "name": "158 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 158000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 158000000,
+                    "start_mod": "nfm"
+                },
+                "0de7c5d4-14fc-4655-9a81-2bcebb2f4147": {
+                    "name": "160 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 160000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 160000000,
+                    "start_mod": "nfm"
+                },
+                "8ca54821-8b80-4938-a35c-9fe25e2320d1": {
+                    "name": "162 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 162000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 162000000,
+                    "start_mod": "nfm"
+                },
+                "f74d262d-9e98-4030-86b2-45676121ff1e": {
+                    "name": "164 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 164000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 164000000,
+                    "start_mod": "nfm"
+                },
+                "bfc9c686-6c06-4de2-b1d5-c8f012131042": {
+                    "name": "168 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 168000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 167000000,
+                    "start_mod": "nfm"
+                },
+                "5468e597-d529-42fe-9fcf-0ff4fa9e2d06": {
+                    "name": "170 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 170000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 170000000,
+                    "start_mod": "nfm"
+                },
+                "e124cc6e-7177-4d5f-ae5b-2ec6a6fa2956": {
+                    "name": "172 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 172000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 172000000,
+                    "start_mod": "nfm"
+                },
+                "1ce0f3ed-4763-4f00-916a-4f72d29ba410": {
+                    "name": "174 MHz ",
+                    "rf_gain": 42.0,
+                    "center_freq": 174000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 174000000,
+                    "start_mod": "nfm"
+                },
+                "639b1496-a2b9-4a42-ad28-3cda89fbe2fb": {
+                    "name": "420 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 420000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 420000000,
+                    "start_mod": "nfm"
+                },
+                "bbc9b57e-ea86-43ef-be65-cb2337615ae5": {
+                    "name": "422 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 422000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 422000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "3aed286d-7d13-4338-8621-d1c0dfdf3ac6": {
+                    "name": "424 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 424000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 424000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "9ae664b4-48f3-410a-8995-edc60127d746": {
+                    "name": "426 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 426000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 426000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "24d2467b-6740-42b5-8d3f-8f389fc0860b": {
+                    "name": "428 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 428000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 428000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "debbc3ab-081d-41e7-80fe-7d564838154e": {
+                    "name": "430 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 430000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 430000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "649233e0-fc85-415d-b88e-94750f49ca4b": {
+                    "name": "432 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 432000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 432000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "bed3b482-fd3b-45ee-b924-200aa4223ace": {
+                    "name": "434 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 434000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 434000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "58dfac9e-6030-4bb3-ba28-465285baa25e": {
+                    "name": "436 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 436000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 436000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "4c293b84-cd43-495f-95a5-1fcabfe4e4c7": {
+                    "name": "438 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 438000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 438000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "0e763161-a0e8-411a-abe6-c1af13045f27": {
+                    "name": "440 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 440000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 440000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "6dda77d3-e859-41b7-9b0b-22c2dee47472": {
+                    "name": "442 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 442000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 442000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "285813ef-aa6d-433f-a316-074f47e02073": {
+                    "name": "444 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 444000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 444000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "e0842b63-6857-4554-874b-fad99e4db03a": {
+                    "name": "446 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 446000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 446000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "c7b21c80-cfef-42e8-a6fe-c5eea4556c7e": {
+                    "name": "448 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 448000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 448000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "d98b4d4a-8247-4a99-9fc7-89780e5e1fef": {
+                    "name": "450 MHz 70cm Ham Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 450000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 450000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "a09a546f-c56f-41b5-ae34-c5511afbcef5": {
+                    "name": "460 MHz",
+                    "rf_gain": 42.0,
+                    "center_freq": 460000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 460000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "232b2ae6-88dd-4e58-b489-37f310e5e204": {
+                    "name": "462 MHz FRS/GMRS",
+                    "rf_gain": 42.0,
+                    "center_freq": 462000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 462000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "41db9b38-87d7-40a0-9f90-1f0c77c054d9": {
+                    "name": "464 MHz FRS/GMRS",
+                    "rf_gain": 42.0,
+                    "center_freq": 464000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 464000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "e9bb7781-eb9b-4314-b399-2d96c52716f0": {
+                    "name": "466 MHz FRS/GMRS",
+                    "rf_gain": 42.0,
+                    "center_freq": 466000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 466000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "5d9e07e8-eb42-4832-82c9-016f05d89027": {
+                    "name": "468 MHz FRS/GMRS",
+                    "rf_gain": 42.0,
+                    "center_freq": 468000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 468000000,
+                    "start_mod": "nfm",
+                    "direct_sampling": 0
+                },
+                "20m": {
+                    "name": "20m",
+                    "center_freq": 14150000,
+                    "samp_rate": 384000,
+                    "start_freq": 14070000,
+                    "start_mod": "usb",
+                    "tuning_step": "500",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 1
+                },
+                "30m": {
+                    "name": "30m",
+                    "center_freq": 10125000,
+                    "samp_rate": 192000,
+                    "start_freq": 10142000,
+                    "start_mod": "usb",
+                    "tuning_step": "500",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 1
+                },
+                "40m": {
+                    "name": "40m",
+                    "center_freq": 7100000,
+                    "samp_rate": 256000,
+                    "start_freq": 7070000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 1
+                },
+                "80m": {
+                    "name": "80m",
+                    "center_freq": 3650000,
+                    "samp_rate": 384000,
+                    "start_freq": 3570000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 1
+                },
+                "49m": {
+                    "name": "49m Broadcast",
+                    "center_freq": 6050000,
+                    "samp_rate": 384000,
+                    "start_freq": 6070000,
+                    "start_mod": "am",
+                    "tuning_step": "1000",
+                    "rf_gain": 42.0,
+                    "direct_sampling": 1
+                },
+                "c1982ce1-7504-455e-908c-dc097fa031a8": {
+                    "name": "1090 MHz ADS-B Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 1090000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 1090000000,
+                    "start_mod": "adsb",
+                    "tuning_step": 1,
+                    "direct_sampling": 0
+                },
+                "cb7f2f8e-e317-4a5e-9504-826dd3781791": {
+                    "name": "978 MHz ADS-B Band",
+                    "rf_gain": 42.0,
+                    "center_freq": 978000000,
+                    "samp_rate": 2400000,
+                    "start_freq": 978000000,
+                    "start_mod": "adsb",
+                    "tuning_step": 1
+                }
+            }
+        },
+        "airspy": {
+            "name": "Airspy HF+",
+            "type": "airspyhf",
+            "rf_gain": "auto",
+            "profiles": {
+                "20m": {
+                    "name": "20m",
+                    "center_freq": 14150000,
+                    "samp_rate": 384000,
+                    "start_freq": 14070000,
+                    "start_mod": "usb",
+                    "tuning_step": "500"
+                },
+                "30m": {
+                    "name": "30m",
+                    "center_freq": 10125000,
+                    "samp_rate": 192000,
+                    "start_freq": 10142000,
+                    "start_mod": "usb",
+                    "tuning_step": "500"
+                },
+                "40m": {
+                    "name": "40m",
+                    "center_freq": 7100000,
+                    "samp_rate": 256000,
+                    "start_freq": 7070000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500"
+                },
+                "80m": {
+                    "name": "80m",
+                    "center_freq": 3650000,
+                    "samp_rate": 384000,
+                    "start_freq": 3570000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500"
+                },
+                "49m": {
+                    "name": "49m Broadcast",
+                    "center_freq": 6050000,
+                    "samp_rate": 384000,
+                    "start_freq": 6070000,
+                    "start_mod": "am",
+                    "tuning_step": "1000"
+                }
+            }
+        },
+        "sdrplay": {
+            "name": "SDRPlay device",
+            "type": "sdrplay",
+            "antenna": "Antenna A",
+            "rf_gain": "auto",
+            "profiles": {
+                "20m": {
+                    "name": "20m",
+                    "center_freq": 14150000,
+                    "samp_rate": 500000,
+                    "start_freq": 14070000,
+                    "start_mod": "usb",
+                    "tuning_step": "500"
+                },
+                "30m": {
+                    "name": "30m",
+                    "center_freq": 10125000,
+                    "samp_rate": 250000,
+                    "start_freq": 10142000,
+                    "start_mod": "usb",
+                    "tuning_step": "500"
+                },
+                "40m": {
+                    "name": "40m",
+                    "center_freq": 7100000,
+                    "samp_rate": 500000,
+                    "start_freq": 7070000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500"
+                },
+                "80m": {
+                    "name": "80m",
+                    "center_freq": 3650000,
+                    "samp_rate": 500000,
+                    "start_freq": 3570000,
+                    "start_mod": "lsb",
+                    "tuning_step": "500"
+                },
+                "49m": {
+                    "name": "49m Broadcast",
+                    "center_freq": 6000000,
+                    "samp_rate": 500000,
+                    "start_freq": 6070000,
+                    "start_mod": "am",
+                    "tuning_step": "1000"
+                }
+            }
+        }
+    },
+    "receiver_name": "ARISS Radio Pi",
+    "receiver_location": "Budapest, Hungary",
+    "receiver_asl": 200,
+    "receiver_admin": "example@example.com",
+    "receiver_gps": {
+        "lat": 39.95233,
+        "lon": -75.16379
+    },
+    "photo_title": "Panorama of Budapest from Sch\u00f6nherz Zolt\u00e1n Dormitory",
+    "photo_desc": "",
+    "max_clients": 20,
+    "keep_files": 20,
+    "session_timeout": 0,
+    "usage_policy_url": "policy",
+    "allow_chat": true,
+    "allow_audio_recording": true,
+    "allow_center_freq_changes": false,
+    "magic_key": "memagic",
+    "receiver_keys": [],
+    "waterfall_scheme": "GoogleTurboWaterfall",
+    "fft_fps": 9,
+    "fft_size": 4096,
+    "fft_voverlap_factor": 0.3,
+    "waterfall_levels": {
+        "min": -88.0,
+        "max": -20.0
+    },
+    "waterfall_auto_levels": {
+        "min": 3.0,
+        "max": 10.0
+    },
+    "waterfall_auto_level_default_mode": false,
+    "waterfall_auto_min_range": 50,
+    "audio_compression": "adpcm",
+    "fft_compression": "adpcm",
+    "tuning_precision": 2,
+    "eibi_bookmarks_range": 0,
+    "repeater_range": 0,
+    "map_type": "google",
+    "google_maps_api_key": "",
+    "openweathermap_api_key": "",
+    "map_position_retention_time": 7200,
+    "map_ignore_indirect_reports": false,
+    "map_prefer_recent_reports": true,
+    "callsign_url": "https://www.qrzcq.com/call/{}",
+    "vessel_url": "https://www.vesselfinder.com/vessels/details/{}",
+    "flight_url": "https://flightaware.com/live/flight/{}",
+    "modes_url": "https://flightaware.com/live/modes/{}/redirect"
+}
+
--- a/groundstation/sstv_decode_prompt.sh
+++ b/groundstation/sstv_decode_prompt.sh
@ -4,10 +4,12 @@ echo "Script to decode SSTV using QSSTV with rtl_fm"

 echo

-sudo systemctl stop openwebrx
+sudo systemctl stop openwebrx  &>/dev/null

 sudo modprobe snd-aloop

+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 qsstv &>/dev/null

 sudo killall -9 rtl_fm &>/dev/null
@ -16,7 +18,7 @@ sudo killall -9 aplay &>/dev/null

 sudo killall -9 direwolf &>/dev/null

-sudo systemctl stop rtl_tcp
+sudo systemctl stop rtl_tcp  &>/dev/null

 pkill -o chromium &>/dev/null

@ -28,6 +30,9 @@ sudo killall -9 CubicSDR &>/dev/null

 sudo killall -9 zenity &>/dev/null

+sudo /etc/init.d/alsa-utils stop
+sudo /etc/init.d/alsa-utils start
+
 #echo "s" >> .mode

 frequency=$(zenity --list 2>/dev/null --width=410 --height=220 --title="SSTV Decoding using QSSTV" --text="Choose the frequency for SSTV decoding:" --column="kHz" --column="Use" 145800 "ISS" 434900 "CubeSatSim" Other "Choose another frequency" SSTV "Test SSTV decoding with WAV file")
@ -65,7 +70,7 @@ elif [ "$choice" = "2" ] || [ "$frequency" = "434900" ]; then
 frequency=434900000
 echo "Frequency is" $frequency
 echo
-echo "If your CubeSatSim is transmitting in SSTV mode (mode 5) you should get images."
+echo "If your CubeSatSim is transmitting in SSTV mode (mode 4) you should get images."
 echo "Note: if you see and hear an SSTV signal but don't get any images, the CubeSatSim signal might have a frequency offset.  Try rebooting the CubeSatSim to fix."

 elif [ "$choice" = "3" ] || [ "$frequency" = "Other" ]; then
@ -128,7 +133,10 @@ set -- $value

 #rtl_fm -M fm -f 434.9M -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1 
 #rtl_fm -M fm -f 434.9M -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
-rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+
+#rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1
+rtl_fm -M fm -f $frequency -s 48k | aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1
+#rtl_fm -M fm -f $frequency -s 48k | aplay -D plughw:${2:0:1},0,1 -r 48000 -t raw -f S16_LE -c 1

 sleep 5

--- a/groundstation/webSDR.desktop
+++ b/groundstation/webSDR.desktop
@ -3,7 +3,7 @@ Type=Application
 Exec=/home/pi/CubeSatSim/groundstation/sdr.sh
 Name=Web SDR
 Comment=openwebrx for Web SDR 
-Icon=/home/pi/Downloads/openwebrx.png
+Icon=/home/pi/Icons/openwebrx.png
 Path=/home/pi
 Terminal=true
 Categories=HamRadio
--- a/14
+++ b/14
@ -136,9 +136,14 @@ sudo ./install.sh

 cd

+#git clone https://github.com/alanbjohnston/pi_pacsat.git
 git clone https://github.com/ac2cz/pi_pacsat.git

-cd pi_pacsat/Debug
+cd pi_pacsat
+
+#git checkout master-debug
+
+cd Debug

 make all

@ -148,14 +153,15 @@ mkdir /home/pi/PacSat/pacsat/dir

 export LD_LIBRARY_PATH=/mnt/usb-disk/ariss/lib:/usr/local/lib/iors_common:$LD_LIBRARY_PATH

-value=`cat /home/pi/CubeSatSim/sim.cfg`
-echo "$value" > /dev/null
-set -- $value
+#value=`cat /home/pi/CubeSatSim/sim.cfg`
+#echo "$value" > /dev/null
+#set -- $value

 echo "bit_rate=9600" > pacsat.config
 echo "bbs_callsign=$1-12" >> pacsat.config
 echo "broadcast_callsign=$1-11" >> pacsat.config
 echo "digi_callsign=$1-1" >> pacsat.config
+
 echo "max_frames_in_tx_buffer=5" >> pacsat.config

 echo "pb_open=1" > pacsat.state
--- a/pacsat-test.sh
+++ b/pacsat-test.sh
@ -0,0 +1,17 @@
+#!/bin/bash
+
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/pacsatsim-d.sh"
+
+sleep 1
+
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/pacsatsim.sh"
+
+sleep 1
+
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-loopback.conf -t 0"
+
+sleep 1
+
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/groundstation/pacsat.sh"
+
+
--- a/pacsatsim-d.sh
+++ b/pacsatsim-d.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-jp14-loop.conf -t 0 
--- a/pacsatsim-df.sh
+++ b/pacsatsim-df.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-jp14.conf -t 0 
--- a/pacsatsim-dj.sh
+++ b/pacsatsim-dj.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-jp14-half.conf -t 0 
--- a/pacsatsim-djf.sh
+++ b/pacsatsim-djf.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf -t 0 
--- a/pacsatsim-f.sh
+++ b/pacsatsim-f.sh
@ -0,0 +1,211 @@
+#!/bin/bash
+
+# script to auto decode packet using rtl_fm and Direwolf and run Pacsat
+
+export LD_LIBRARY_PATH=/mnt/usb-disk/ariss/lib:/usr/local/lib/iors_common:$LD_LIBRARY_PATH
+
+#sudo systemctl stop cubesatsim
+
+#sudo systemctl stop transmit
+
+sudo systemctl stop command &>/dev/null
+
+sudo modprobe snd-aloop
+
+#sudo systemctl stop openwebrx
+
+#sudo systemctl stop rtl_tcp &>/dev/null
+
+#pkill -o chromium &>/dev/null
+
+#sudo killall -9 rtl_fm &>/dev/null
+
+#sudo killall -9 direwolf &>/dev/null
+
+#udo killall -9 aplay &>/dev/null
+
+#sudo killall -9 qsstv &>/dev/null
+
+#sudo killall -9 rtl_tcp &>/dev/null
+
+#sudo killall -9 java &>/dev/null
+
+#sudo killall -9 CubicSDR &>/dev/null
+
+#sudo killall -9 zenity &>/dev/null
+
+echo
+
+#frequency=$(zenity --list 2>/dev/null --width=410 --height=360 --title="Packet Decoding with Direwolf" --text="Choose the frequency for packet decoding" --column="kHz" --column="Application" 144390 "APRS US 2m" 434900 "CubeSatSim" 144800 "APRS European 2m" 145175 "APRS Australian 2m" Other "Choose another frequency" 145825 "APRS on ISS" 437100 "Serenity CubeSat 4800 bps" Serenity "Test Serenity CubeSat decoding with WAV file" APRS "Test APRS decoding with CubeSatSim WAV file")
+
+#echo $frequency
+
+#if [ -z "$frequency" ]; then 
+
+#echo "No choice made.  Exiting."
+
+#sleep 3
+
+#exit
+
+#echo "Choose the number for the packet decoding option:"
+#echo
+#echo "1. APRS US 2m (144390 kHz)"
+#echo "2. CubeSatSim (434900 kHz)"
+#echo "3. APRS European 2m (144800 kHz)"
+#echo "4. APRS Australian 2m (145175 kHz)"
+#echo "5. APRS on another frequency"
+#echo "6. APRS on ISS (145825 kHz)"
+#echo "7. Serenity CubeSat 4800 bps (437.1 MHz)"
+#echo "8. Test Serenity CubeSat decoding with WAV file"
+#echo "9. Test APRS decoding with CubeSatSim WAV file"
+#echo
+
+#read -r choice
+
+choice=2
+
+#fi
+
+if [ "$choice" = "1" ] || [ "$frequency" = "144390" ]; then
+
+  frequency=144390000
+
+elif [ "$choice" = "2" ] || [ "$frequency" = "434900" ] ; then
+
+  frequency=434900000
+  echo
+  echo "If your Pacsat Ground Station is transmitting packets, you will see them here"
+  echo
+
+elif [ "$choice" = "3" ] || [ "$frequency" = "144800" ]; then
+
+  frequency=144800000
+
+elif [ "$choice" = "4" ] || [ "$frequency" = "145175" ]; then
+
+  frequency=145175000
+
+elif [ "$choice" = "5" ] || [ "$frequency" = "Other" ] ; then
+
+  echo
+
+  echo "Enter the frequency in kiloHertz"
+
+  echo
+
+  read -r frequency
+
+  frequency=$frequency"000"
+
+  #echo $frequency
+
+elif [ "$choice" = "6" ]  || [ "$frequency" = "145825" ] ; then
+
+  frequency=145825000
+  echo
+  echo "If the ISS is overhead and in APRS mode (see tracking application such as Gpredict), you will see packets."
+  echo
+
+elif [ "$choice" = "7" ] || [ "$frequency" = "437100" ] ; then
+
+  frequency=437100000
+  echo
+  echo "If the Serenity CubeSat is overhead and transmitting (see tracking application such as Gpredict), you will see packets."
+  echo
+
+elif [ "$choice" = "8" ] || [ "$frequency" = "Serenity" ] ; then
+
+  echo "A recorded WAV file will play and you should see some packets decoded"
+
+  echo 
+ 
+  value=`aplay -l | grep "Loopback"`
+  echo "$value" > /dev/null
+  set -- $value
+
+#  aplay -D hw:0,0 /home/pi/CubeSatSim/groundstation/WAV/SDRSharp_20210830_200034Z_437097377Hz_AF.wav &
+#  aplay -D hw:${2:0:1},0,0 /home/pi/CubeSatSim/groundstation/WAV/SDRSharp_20210830_200034Z_437097377Hz_AF.wav &
+  aplay -D hw:0,0 /home/pi/CubeSatSim/groundstation/WAV/beacon_test_2.wav &
+  aplay -D hw:${2:0:1},0,0 /home/pi/CubeSatSim/groundstation/WAV/beacon_test_2.wav &
+
+  timeout 30 direwolf -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -r 48000 -t 0
+  
+  echo
+  
+  echo "Test complete.  This window will close in 10 seconds."
+  
+  sleep 5
+  
+  exit
+
+elif [ "$choice" = "8" ] || [ "$frequency" = "APRS" ] ; then
+
+  echo "A recorded APRS WAV file from the CubeSatSim will play and you should see a packet decoded."
+
+  echo 
+ 
+  value=`aplay -l | grep "Loopback"`
+  echo "$value" > /dev/null
+  set -- $value
+
+  #aplay -D hw:0,0 /home/pi/CubeSatSim/telem.wav &
+  (while true; do (sleep 2 && aplay -D hw:0,0 /home/pi/CubeSatSim/telem.wav &>/dev/null); done) &
+  
+  #aplay -D hw:${2:0:1},0,0 /home/pi/CubeSatSim/telem.wav &
+  (while true; do (sleep 2 && aplay -D hw:${2:0:1},0,0 /home/pi/CubeSatSim/telem.wav &>/dev/null); done) &
+  
+  timeout 30 direwolf -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf.conf -r 48000 -t 0
+  
+  echo
+  
+  echo "Test complete.  This window will close in 10 seconds."
+  
+  sleep 5
+  
+  exit
+
+#fi
+
+fi
+
+#echo
+
+#echo "Note that the 'Tuned to' frequency will be different from the chosen frequency due to the way SDRs work."
+
+echo
+
+if [ "$choice" = "7" ] || [ "$choice" = "8" ]  || [ "$frequency" = "Serenity" ]  || [ "$frequency" = "437100000" ] ; then
+
+  echo -e "Auto decoding 4800 bps AX.25 packets on $frequency Hz"
+
+  direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -t 0 &
+
+else
+
+#  echo -e "Auto decoding APRS Pacsat packets on $frequency Hz"
+
+#  direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-loopback.conf -t 0 &
+
+  /usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/pacsatsim-df.sh"
+
+###  arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434900 &
+
+  echo "Don't close the direwolf window or the Pacsatsim will stop running."
+
+  echo
+fi
+
+sleep 5
+
+value=`aplay -l | grep "Loopback"`
+echo "$value" > /dev/null
+set -- $value
+
+#rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1 &
+
+cd /home/pi/pi_pacsat/Debug
+
+./pi_pacsat -c pacsat.config -d /home/pi/PacSat
+
+sleep 5
--- a/pacsatsim.sh
+++ b/pacsatsim.sh
@ -14,15 +14,15 @@ sudo modprobe snd-aloop

 #sudo systemctl stop openwebrx

-sudo systemctl stop rtl_tcp &>/dev/null
+#sudo systemctl stop rtl_tcp &>/dev/null

 #pkill -o chromium &>/dev/null

-sudo killall -9 rtl_fm &>/dev/null
+#sudo killall -9 rtl_fm &>/dev/null

-sudo killall -9 direwolf &>/dev/null
+#sudo killall -9 direwolf &>/dev/null

-sudo killall -9 aplay &>/dev/null
+#udo killall -9 aplay &>/dev/null

 #sudo killall -9 qsstv &>/dev/null

@ -183,10 +183,17 @@ if [ "$choice" = "7" ] || [ "$choice" = "8" ]  || [ "$frequency" = "Serenity" ]

 else

-  echo -e "Auto decoding APRS Pacsat packets on $frequency Hz"
+#  echo -e "Auto decoding APRS Pacsat packets on $frequency Hz"

-  direwolf -P+ -D1 -qd -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-jp14.conf -t 0 &
+#  direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-loopback.conf -t 0 &

+  /usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/pacsatsim-d.sh"
+
+  arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434900 &
+
+  echo "Don't close the direwolf window or the Pacsatsim will stop running."
+
+  echo
 fi

 sleep 5
--- a/spacecraft/FoxTelem_1.13e/CubeSatSim_rttelemetry.csv
+++ b/spacecraft/FoxTelem_1.13e/CubeSatSim_rttelemetry.csv
@ -0,0 +1,48 @@
+47,TYPE,FIELD,BITS,UNIT,CONVERSION,MODULE,MODULE_NUM,MODULE_LINE,LINE_TYPE,SHORT_NAME,DESCRIPTION
+0,RT,Sensor 2,12,integer,1,Experiments,6,8,3,Sensor 2,STEM Payload Extra Sensor 2
+1,RT,Sensor 3,12,integer,1,Experiments,6,9,3,Sensor 3,STEM Payload Extra Sensor 3
+2,RT,BATT_V,12,V,cubesatsim_voltage|FLOAT2,Battery,4,1,3,Battery Voltage,INA219 Battery Voltage
+3,RT,SatelliteXAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,+X Panel,7,4,3,Acceleration,STEM Payload Board MPU6050 Acceleration around X Axis
+4,RT,SatelliteYAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,+Y Panel,8,4,3,Acceleration,STEM Payload Board MPU6050 Acceleration around Y Axis
+5,RT,SatelliteZAxisAcceleration,12,g,cubesatsim_acceleration|FLOAT2,+Z Panel,9,4,3,Acceleration,STEM Payload Board MPU6050 Acceleration around Z Axis
+6,RT,BATT_I,12,mA,cubesatsim_current,Battery,4,2,3,Battery Current,INA219 Battery Current
+7,RT,Temperature,12,C,cubesatsim_temperature,Experiments,6,2,3,BME280 Temp,STEM Payload Sensor BME280 Temperature
+8,RT,PANEL_PLUS_X_V,12,V,cubesatsim_voltage|FLOAT2,+X Panel,7,1,3,Voltage,INA219 +X Panel Voltage
+9,RT,PANEL_MINUS_X_V,12,V,cubesatsim_voltage|FLOAT2,-X Panel,10,1,3,Voltage,INA219 -X Panel Voltage
+10,RT,PANEL_PLUS_Y_V,12,V,cubesatsim_voltage|FLOAT2,+Y Panel,8,1,3,Voltage,INA219 +Y Panel Voltage
+11,RT,PANEL_MINUS_Y_V,12,V,cubesatsim_voltage|FLOAT2,-Y Panel,11,1,3,Voltage,INA219 -Y Panel Voltage
+12,RT,PANEL_PLUS_Z_V,12,V,cubesatsim_voltage|FLOAT2,+Z Panel,9,1,3,Voltage,INA219 +Z Panel Voltage
+13,RT,PANEL_MINUS_Z_V,12,V,cubesatsim_voltage|FLOAT2,-Z Panel,12,1,3,Voltage,INA219 -Z Panel Voltage
+14,RT,PANEL_PLUS_X_I,12,mA,cubesatsim_current,+X Panel,7,2,3,Current,INA219 +X Panel Current
+15,RT,PANEL_MINUS_X_I,12,mA,cubesatsim_current,-X Panel,10,2,3,Current,INA219 -X Panel Current
+16,RT,PANEL_PLUS_Y_I,12,mA,cubesatsim_current,+Y Panel,8,2,3,Current,INA219 +Y Panel Current
+17,RT,PANEL_MINUS_Y_I,12,mA,cubesatsim_current,-Y Panel,11,2,3,Current,INA219 -Y Panel Current
+18,RT,PANEL_PLUS_Z_I,12,mA,cubesatsim_current,+Z Panel,9,2,3,Current,INA219 +Z Panel Current
+19,RT,PANEL_MINUS_Z_I,12,mA,cubesatsim_current,-Z Panel,12,2,3,Current,INA219 -Z Panel Current
+20,RT,BATT2_V,12,V,cubesatsim_voltage|FLOAT2,Battery2,5,1,3,Battery2 Voltage,INA219 Battery2 Voltage
+21,RT,SPIN,12,rpm,cubesatsim_rpm,Computer Software,3,1,3,Spacecraft Spin,Calculated spin rate using solar cells
+22,RT,Pressure,12,hPa,cubesatsim_pressure,Experiments,6,3,3,BME280 Pressure,STEM Payload Sensor BME280 Pressure
+23,RT,Altitude,12,m,cubesatsim_altitude,Experiments,6,4,3,BME280 Altitude,STEM Payload Sensor BME280 Altitude
+24,RT,Resets,12,-,12,NONE,3,2,3,Reset Count, Software Reset Count
+25,RT,RSSI,12,dBm,cubesatsim_rssi|INT,Radio,1,1,3,RSSI,Received Signal Strength Indication
+26,RT,IHUTemperature,12,C,cubesatsim_temperature,Computer Hardware,2,1,3,IHU Temp (Pi),Internal Temperature of Pi IHU
+27,RT,SatelliteXAxisAngularVelocity,12,dps,cubesatsim_rotation|INT,+X Panel,7,3,3,Rotation,STEM Payload Board MPU6050 Angular Veolcity around X Axis
+28,RT,SatelliteYAxisAngularVelocity,12,dps,cubesatsim_rotation|INT,+Y Panel,8,3,3,Rotation,STEM Payload Board MPU6050 Angular Veolcity around Y Axis
+29,RT,SatelliteZAxisAngularVelocity,12,dps,cubesatsim_rotation|INT,+Z Panel,9,3,3,Rotation,STEM Payload Board MPU6050 Angular Veolcity around Z Axis
+30,RT,Humidity,12,%,cubesatsim_temperature,Experiments,6,5,3,BME280 Humidity,STEM Payload Sensor BME280 Humidity
+31,RT,BATT2_I,12,mA,cubesatsim_current,Battery2,5,2,3,Battery2 Current,INA219 Battery2 Current
+32,RT,DiodeTemp,12,C,cubesatsim_rpm,Experiments,6,6,3,Diode Temp,STEM Payload Diode Temperature
+33,RT,Sensor 1,12,integer,1,Experiments,6,7,3,Sensor 1,STEM Payload Extra Sensor 1
+34,RT,STEMPayloadStatus,1,-,17,Experiments,6,1,0,STEM Payload Status,STEM Payload Board Status
+35,RT,SafeMode,1,-,STATUS_ON_OFF,Computer Software,3,2,0,Safe Mode, Safe Mode (Low Battery Voltage)
+36,RT,SimulatedTelemetry,1,-,STATUS_ON_OFF,Computer Software,3,4,0,Simulated Telemetry, Simulated Telemetry Indicator
+37,RT,PayloadStatus1,1,-,17,NONE,0,0,0,Exp 3,STEM Payload status 1 failure indicator
+38,RT,I2CBus0Failure,1,-,17,NONE,2,2,0,I2C Bus 0,I2C bus 0 failure indicator
+39,RT,I2CBus1Failure,1,-,17,Computer Hardware,2,2,0,I2C Bus 1,I2C bus 1 failure indicator
+40,RT,I2CBus3Failure,1,-,17,Computer Hardware,2,3,0,I2C Bus 3,I2C bus 3 failure indicator
+41,RT,CameraFailure,1,-,17,Computer Hardware,2,4,0,Camera,Camera failure indicator
+42,RT,GroundCommands,4,-,1,Computer Software,3,3,0,Ground Commands,Number of ground commands received
+43,RT,RXAntenna,1,-,16,Radio,1,3,0,RX Antenna,Receive antenna status
+44,RT,TXAntenna,1,-,16,Radio,1,2,0,TX Antenna,Transmit antenna status
+45,RT,C2CStatus,2,-,COMMAND_STATUS,Computer Software,3,5,0,Command Control, Command & Control Status
+46,RT,Pad,56,-,0,NONE,0,0,0,NONE,NONE
--- a/spacecraft/PacSatGround_0.46m/PacSatSim.properties
+++ b/spacecraft/PacSatGround_0.46m/PacSatSim.properties
@ -2,11 +2,11 @@
 #Sun Feb 17 18:25:06 EST 2019
 sequence_num=3
 name=PacSatSim
-digiCallsign=W3ZM-1
+digiCallsign=AMSAT-1
 description=PacSatSim
-broadcastCallsign=W3ZM-11
+broadcastCallsign=AMSAT-11
 DIR_AGE=10
-bbsCallsign=W3ZM-12
+bbsCallsign=AMSAT-12
 telemLayoutFile=PacSatSim.dat
 telem_server=tlm.amsatfox.org
 web_site_url=http://CubeSatSim.org
--- a/transmit.py
+++ b/transmit.py
@ -426,10 +426,10 @@ if __name__ == "__main__":
 			elif (mode == 'p'):
 				print("Pacsat")
 #				system('/home/pi/CubeSatSim/pacsatsim.sh')
-				system('sudo systemctl restart pacsatsim')
+#				system('sudo systemctl restart pacsatsim')
 				while True:
 					sleep(30)
-			elif (mode == 'p'):
+			elif (mode == 'P'):
 				print("Pacsat Ground Station")
 				while True:
 					sleep(30)
@ -802,7 +802,7 @@ if __name__ == "__main__":
 ##					system("arecord -D plughw:CARD=Device,DEV=0 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
 					system("sudo nc -l 8011 | csdr convert_i16_f | csdr gain_ff 16000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
 					sleep(1)
-					system("sudo arecord -D plughw:1 -r48000 -fS16_LE -c1 | nc localhost 8011 &")
+					system("sudo arecord -D plughw:CARD=Device,DEV=0 -r48000 -fS16_LE -c1 | nc localhost 8011 &")
 					GPIO.output(powerPin, 1)
 					sleep(0.5)
 					GPIO.output(powerPin, 0)
@ -810,9 +810,9 @@ if __name__ == "__main__":
 						sleep(1)
 					print("No carrier detected, stopping repeater")
 					output(txLed, txLedOff)
-					system("sudo killall -9 arecord")
-					system("sudo killall -9 nc")
-					system("sudo killall -9 rpitx")
+					system("sudo killall -9 arecord > /dev/null 2>&1")
+					system("sudo killall -9 nc > /dev/null 2>&1")
+					system("sudo killall -9 rpitx > /dev/null 2>&1")
 		
 		else:
 			print("FSK")