# HG changeset patch
# User andrewm
# Date 1463503789 -3600
# Node ID 5f17da990d1bbbaa83ff1478488bbc423ff2eee8
# Parent  c55c6f6c233c9cb0e60f9a687e7776b96d2ac44e# Parent  8329f234d9149c2bcca0c324fbd37f9df19042fc
merge

diff -r c55c6f6c233c -r 5f17da990d1b .hgignore
--- a/.hgignore	Tue May 17 17:49:23 2016 +0100
+++ b/.hgignore	Tue May 17 17:49:49 2016 +0100
@@ -14,3 +14,4 @@
 html/*
 projects/heavy/hvtemp
 .*.DS_Store
+.*swp
diff -r c55c6f6c233c -r 5f17da990d1b scripts/stop_running.sh
--- a/scripts/stop_running.sh	Tue May 17 17:49:23 2016 +0100
+++ b/scripts/stop_running.sh	Tue May 17 17:49:49 2016 +0100
@@ -4,8 +4,8 @@
 
 BBB_ADDRESS="root@192.168.7.2"
 
-echo "Stopping BeagleRT..."
-
 # The first command should be sufficient to stop any BeagleRT run with
 # these scripts; the second will catch any leftovers run other ways
-ssh $BBB_ADDRESS "screen -X -S BeagleRT quit ; pkill BeagleRT"
\ No newline at end of file
+
+BELA_AUDIO_THREAD_NAME=beaglert-audio 
+ssh $BBB_ADDRESS 'PID=`grep '"$BELA_AUDIO_THREAD_NAME"' /proc/xenomai/stat | cut -d " " -f 5 | sed s/\s//g`; if [ -z $PID ]; then printf ""; else echo "Killing old Bela process $PID"; kill -2 $PID; fi'