Update packet.sh rtl_fm twice, remove serenity

groundstation/packet.sh

@@ -28,11 +28,13 @@ sudo killall -9 sdrpp &>/dev/null
 
 sudo killall -9 zenity &>/dev/null
 
+sudo killall -9 rtl_fm &>/dev/null
+
 #sudo killall -9 fctelem &>/dev/null
 
 echo
 
-frequency=$(zenity --timeout=10 --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")
+frequency=$(zenity --timeout=10 --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" APRS "Test APRS decoding with CubeSatSim WAV file")
 
 #echo $frequency
 
@@ -99,38 +101,6 @@ elif [ "$choice" = "6" ]  || [ "$frequency" = "145825" ] ; then
   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."
@@ -191,4 +161,7 @@ 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 -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