From 992175a02e4b9f615cbb1b4bbd32c1a05e976d34 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sun, 23 Feb 2020 13:35:15 +0000 Subject: [PATCH] demo cleanup --- afsk/main.c | 6 ++++-- demo.sh | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 2aa90b1f..160392d0 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1092,10 +1092,12 @@ if (firstTime != ON) // digitalWrite (txLed, txLedOff); if (mode == FSK) { - transmit = popen("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.896e3&", "r"); + // transmit = popen("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.896e3&", "r"); + transmit = popen("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.897e3&", "r"); // printf("4\n"); } else if (mode == BPSK) { - transmit = popen("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.8925e6 -t float 2>&1&", "r"); +// transmit = popen("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.8925e6 -t float 2>&1&", "r"); + transmit = popen("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.8945e6 -t float 2>&1&", "r"); } // fgets(cmdbuffer, 1000, transmit); pclose(transmit); diff --git a/demo.sh b/demo.sh index dcda3a37..404ab719 100755 --- a/demo.sh +++ b/demo.sh @@ -18,8 +18,10 @@ else while true; do echo -e "\n Changing mode ******\n\n" /home/pi/CubeSatSim/radioafsk fsk 5 n - sleep 8 /home/pi/CubeSatSim/radioafsk bpsk 5 n + sleep 24 + sudo killall -9 sendiq + sleep 6 /home/pi/CubeSatSim/radioafsk afsk 5 n done fi