From 0a8055ebc3e4b70cf3182f0bfadc250dfe6f719e Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 12 Oct 2019 13:06:20 -0400
Subject: [PATCH] major rewrite with timeouts

---
 demo.sh | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/demo.sh b/demo.sh
index 9189a008..7838e448 100755
--- a/demo.sh
+++ b/demo.sh
@@ -1,20 +1,18 @@
 #!/bin/bash
 
-echo -e "\nDemo of CubeSatSim sends AFSK telemetry at 440 MHz continuously\n\n"
-
-sleep 30
-
-#echo 'sleep over' >> /home/pi/CubeSatSim/log.txt
-
-echo $(date '+%Y %b %d %H:%M') Starting Hostname $HOSTNAME  >> /home/pi/CubeSatSim/log.txt
-
-#/home/pi/CubeSatSim/radioafsk >> /home/pi/CubeSatSim/log.txt 
-#/home/pi/DigitalTxRxRPi/testafsktx  >> /home/pi/CubeSatSim/log.txt
-
-echo $(date '+%Y %b %d %H:%M') Stopping Hostname $HOSTNAME  >> /home/pi/CubeSatSim/log.txt
-
-#/home/pi/mopower/mpcmd LED_STAT=0
-#sleep 30
-
-#/home/pi/CubeSatSim/configax
-/home/pi/CubeSatSim/fox-demo.sh 2
+echo -e "\nDemo of CubeSatSim sends FSK and BPSK telemetry alternately at 434.9 MHz continuously\n\n"
+
+sudo killall rpitx
+sudo killall sendiq
+sudo fuser -k 8080/tcp
+
+while true; do
+      timeout 33 /home/pi/CubeSatSim/radioafsk.sh fsk 3
+      sudo killall rpitx
+      sudo killall sendiq
+      sudo fuser -k 8080/tcp
+      timeout 33 /home/pi/CubeSatSim/radioafsk.sh bpsk 3
+      sudo killall rpitx
+      sudo killall sendiq
+      sudo fuser -k 8080/tcp     
+done