Update sstv_decode_prompt.sh resolve merge conflicts

groundstation/sstv_decode_prompt.sh

@@ -28,24 +28,26 @@ sudo killall -9 java &>/dev/null
 
 sudo killall -9 CubicSDR &>/dev/null
 
+sudo killall -9 sdrpp &>/dev/null
+
 sudo killall -9 zenity &>/dev/null
 
 sudo /etc/init.d/alsa-utils stop
 sudo /etc/init.d/alsa-utils start
 
+sudo killall -9 rtl_fm &>/dev/null
+
 #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")
+frequency=$(zenity --timeout=10 --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")
 
 echo $frequency
 
 if [ -z "$frequency" ]; then 
 
-echo "No choice made.  Exiting."
-
-sleep 3
+echo "No choice made."
 
-exit
+frequency=434900
 
 #echo "Choose the number for the frequency for SSTV decoding:"
 #echo "1. ISS (145800Hz)"
@@ -120,7 +122,7 @@ echo -e "Auto decoding SSTV on $frequency Hz"
 
 sleep 2
 
-qsstv &
+setsid qsstv &
 
 sleep 5
 
@@ -133,10 +135,9 @@ 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 -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 | 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