From 42aa30f83d7a4363749fd0e5fa1721a3644d2b9e Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Thu, 5 Mar 2026 13:49:54 -0500
Subject: [PATCH] Update cubicsdr.sh resolve merge conflict

---
 groundstation/cubicsdr.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/groundstation/cubicsdr.sh b/groundstation/cubicsdr.sh
index 2bfb65dc..3b125dc6 100755
--- a/groundstation/cubicsdr.sh
+++ b/groundstation/cubicsdr.sh
@@ -31,6 +31,8 @@ sudo killall -9 rtl_tcp &>/dev/null
 
 sudo killall -9 CubicSDR &>/dev/null
 
+sudo killall -9 sdrpp &>/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
@@ -42,6 +44,24 @@ 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
+
+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
+
+setsid CubicSDR
+
+sleep 10
+
+#$SHELL
+#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
+
 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