From d1ef96296b047f4ca3d24fb17bc2a0659b10cf68 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 14 Oct 2019 09:21:52 -0400 Subject: [PATCH] auto demo off, fox-demo.sh to be used --- demo.sh | 2 ++ fox-demo.sh | 29 ++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/demo.sh b/demo.sh index 2810ee4f..d3fd2a2b 100755 --- a/demo.sh +++ b/demo.sh @@ -2,6 +2,8 @@ echo -e "\nDemo of CubeSatSim sends FSK, BPSK, and AFSK telemetry alternately at 434.9 MHz continuously\n\n" +exit + sudo killall -9 rpitx sudo killall -9 sendiq sudo fuser -k 8080/tcp diff --git a/fox-demo.sh b/fox-demo.sh index e9c504b7..2810ee4f 100755 --- a/fox-demo.sh +++ b/fox-demo.sh @@ -1,18 +1,17 @@ -(while true; do +#!/bin/bash -# ps -ef | grep rpitx | grep -v grep | awk '{print $2}' | sudo xargs kill -# ps -ef | grep sendiq | grep -v grep | awk '{print $2}' | sudo xargs kill -# sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/CubeSatSim/rpitx/rpitx -i- -m RF -f 434.9e3& -# /home/pi/CubeSatSim/radioafsk f 3 +echo -e "\nDemo of CubeSatSim sends FSK, BPSK, and AFSK telemetry alternately at 434.9 MHz continuously\n\n" - /home/pi/CubeSatSim/fox-fsk.sh $1 - -# ps -ef | grep rpitx | grep -v grep | awk '{print $2}' | sudo xargs kill -# ps -ef | grep sendiq | grep -v grep | awk '{print $2}' | sudo xargs kill -# sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/CubeSatSim/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float 2>&1& -# /home/pi/CubeSatSim/radioafsk b 3 - - /home/pi/CubeSatSim/fox-bpsk.sh $1 - -done) +sudo killall -9 rpitx +sudo killall -9 sendiq +sudo fuser -k 8080/tcp +while true; do + sleep 1; + echo -e "\n Changing mode ********************************************************************************\n\n" + + timeout 25 /home/pi/CubeSatSim/radioafsk c 3 + sudo killall -9 rpitx + sudo killall -9 sendiq + sudo fuser -k 8080/tcp +done