From 60d3aa112e68f2a5c9a309d2cf26f3250610bf01 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 10:45:37 -0400 Subject: [PATCH 01/12] nohup run Gpredict so window closes --- groundstation/loc.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/groundstation/loc.sh b/groundstation/loc.sh index 5a227a37..5a1b6881 100755 --- a/groundstation/loc.sh +++ b/groundstation/loc.sh @@ -7,4 +7,7 @@ sudo killall -9 gpredict &>/dev/null python3 /home/pi/CubeSatSim/groundstation/loc-foxtelem.py -/usr/bin/gpredict +#/usr/bin/gpredict + +nohup /usr/bin/gpredict /dev/null 2>&1 & + From 4187b34768273253ba6286c1ed3b8ff5fcfb0101 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 10:50:25 -0400 Subject: [PATCH 02/12] Update README.md --- hardware/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hardware/README.md b/hardware/README.md index e0163146..087ad127 100644 --- a/hardware/README.md +++ b/hardware/README.md @@ -2,4 +2,6 @@ The current CubeSatSim hardware is in the v1.0 folder. The folder contains gerb For information on building the boards, see https://cubesatsim.org/wiki. +Gerber files on PCBWay: https://www.pcbway.com/project/shareproject/AMSAT_CubeSat_Simulator.html + Older beta versions of the hardware are in the other folders and should not be used. From a28a785770ac2e98a2ba2c6c165e8f14ab4cf2dd Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 10:51:30 -0400 Subject: [PATCH 03/12] Update README.md --- hardware/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hardware/README.md b/hardware/README.md index 087ad127..cbfe8a55 100644 --- a/hardware/README.md +++ b/hardware/README.md @@ -1,4 +1,6 @@ -The current CubeSatSim hardware is in the v1.0 folder. The folder contains gerbers, schematics, and images of the Main, Battery, and STEM Payload boards. +The current CubeSatSim hardware is in the v1.1 folder. The folder contains gerbers, schematics, and images of the Main, Battery, and STEM Payload boards. + +Note: the only differences between the v1.1 and v1.0 hardware is a Low Pass Filter instead of a Band Pass Filter - this only affects the SMD components. For information on building the boards, see https://cubesatsim.org/wiki. From 1e03dd1fcc6e8a3adfcb395956137429eaeffa8a Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 10:52:24 -0400 Subject: [PATCH 04/12] Update README.md --- hardware/v1.0/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hardware/v1.0/README.md b/hardware/v1.0/README.md index e3f7c6df..9dfe6c13 100644 --- a/hardware/v1.0/README.md +++ b/hardware/v1.0/README.md @@ -1,5 +1,7 @@ Here is information about the CubeSatSim v1.0 hardware +Note: this is not the latest hardware! + There are files for the main board, battery board, and STEM payload board of these types: * cubesatsim-STEM-1.0_gerbers.zip -- All gerber files used to fabricate PCBs From 391a116e39e3d819438ffe9f48d45cbb0f033f6a Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:25:22 -0400 Subject: [PATCH 05/12] added missing killall's --- groundstation/cubicsdr.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/groundstation/cubicsdr.sh b/groundstation/cubicsdr.sh index 47b5e12f..151c0a7e 100755 --- a/groundstation/cubicsdr.sh +++ b/groundstation/cubicsdr.sh @@ -13,14 +13,22 @@ sudo systemctl stop openwebrx sudo killall -9 java &>/dev/null +sudo systemctl stop rtl_tcp + +pkill -o chromium &>/dev/null + sudo killall -9 rtl_fm &>/dev/null -sudo killall -9 qsstv &>/dev/null +sudo killall -9 direwolf &>/dev/null -sudo systemctl stop rtl_tcp +sudo killall -9 aplay &>/dev/null + +sudo killall -9 qsstv &>/dev/null sudo killall -9 rtl_tcp &>/dev/null +sudo killall -9 CubicSDR &>/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 From 9167491ce2c2fd91e6394730c527821685910187 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:28:01 -0400 Subject: [PATCH 06/12] added missing killall's --- groundstation/fox.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/groundstation/fox.sh b/groundstation/fox.sh index 3cf98207..3c1daf1a 100755 --- a/groundstation/fox.sh +++ b/groundstation/fox.sh @@ -19,13 +19,11 @@ sudo killall -9 java &>/dev/null sudo killall -9 CubicSDR &>/dev/null -sudo killall -9 qsstv &>/dev/null - -sudo kill `ps -aux | grep cubicsdr-packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 direwolf &>/dev/null -sudo kill `ps -aux | grep packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 aplay &>/dev/null -sudo kill `ps -aux | grep sstv_decode_prompt| grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 qsstv &>/dev/null sudo killall -9 zenity &>/dev/null From 6763b0c138dc2e5f7dcb166de35a6b4771758001 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:29:15 -0400 Subject: [PATCH 07/12] fixed killall's --- groundstation/packet.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/groundstation/packet.sh b/groundstation/packet.sh index b14f150a..87620bdc 100755 --- a/groundstation/packet.sh +++ b/groundstation/packet.sh @@ -24,12 +24,6 @@ sudo killall -9 java &>/dev/null sudo killall -9 CubicSDR &>/dev/null -sudo killall -9 cubicsdr-packet.sh &>/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 sstv_decode_prompt| grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null - sudo killall -9 zenity &>/dev/null echo From 6f05c3e0b75123a0e2d62d215f312194c5019fc0 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:31:33 -0400 Subject: [PATCH 08/12] fixed killall's --- groundstation/rtl-tcp-d.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/groundstation/rtl-tcp-d.sh b/groundstation/rtl-tcp-d.sh index b3305644..b19539b7 100755 --- a/groundstation/rtl-tcp-d.sh +++ b/groundstation/rtl-tcp-d.sh @@ -19,25 +19,25 @@ echo sudo systemctl stop openwebrx +sudo systemctl stop rtl_tcp + +pkill -o chromium &>/dev/null + sudo killall -9 java &>/dev/null sudo killall -9 rtl_fm &>/dev/null sudo killall -9 CubicSDR &>/dev/null +sudo killall -9 aplay &>/dev/null + sudo killall -9 qsstv &>/dev/null sudo killall -9 direwolf &>/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 - -#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 systemctl stop rtl_tcp +sudo killall -9 rtl_tcp &>/dev/null sleep 5 From 227e3592df8cc7ca5eb83026d99d961e3aa40db6 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:33:26 -0400 Subject: [PATCH 09/12] fixed killall's --- groundstation/rtl-tcp.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/groundstation/rtl-tcp.sh b/groundstation/rtl-tcp.sh index ae19ad5c..c8af8906 100755 --- a/groundstation/rtl-tcp.sh +++ b/groundstation/rtl-tcp.sh @@ -29,6 +29,8 @@ sleep 2 pkill -o chromium &>/dev/null +sudo systemctl stop rtl_tcp + sudo killall -9 java &>/dev/null sudo killall -9 rtl_fm &>/dev/null @@ -41,15 +43,10 @@ sudo killall -9 qsstv &>/dev/null sudo killall -9 direwolf &>/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 - -#sudo kill `ps -aux | grep sstv_decode_prompt| grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 aplay &>/dev/null sudo killall -9 zenity &>/dev/null -#sudo systemctl start rtl_tcp sudo /bin/sh -c '/usr/local/bin/rtl_tcp -a $(hostname -I|cut -f1 -d " ")' From cdcb0d5f6a265fd1e94fff562a33a9a0b7188583 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:35:21 -0400 Subject: [PATCH 10/12] fixed killall's --- groundstation/sdr.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/groundstation/sdr.sh b/groundstation/sdr.sh index d15cdaf7..0783d9ca 100755 --- a/groundstation/sdr.sh +++ b/groundstation/sdr.sh @@ -28,19 +28,17 @@ sudo killall -9 java &>/dev/null sudo killall -9 rtl_fm &>/dev/null +pkill -o chromium &>/dev/null + sudo killall -9 rtl_tcp &>/dev/null sudo killall -9 CubicSDR &>/dev/null sudo killall -9 qsstv &>/dev/null -sudo killall -9 direwolf &>/dev/null - -#sudo kill `ps -aux | grep cubicsdr-packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 aplay &>/dev/null -#sudo kill `ps -aux | grep packet | grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null - -#sudo kill `ps -aux | grep sstv_decode_prompt| grep -v grep | awk '{ print $2 }'` &>/dev/null && killall inotifywait &>/dev/null +sudo killall -9 direwolf &>/dev/null sudo killall -9 zenity &>/dev/null From ec27550b92c7cef3ef521f46dacf37893472e9d5 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:36:50 -0400 Subject: [PATCH 11/12] fixed killall's --- groundstation/sstv_decode_prompt.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/groundstation/sstv_decode_prompt.sh b/groundstation/sstv_decode_prompt.sh index 8dc4a3ff..76eb611f 100755 --- a/groundstation/sstv_decode_prompt.sh +++ b/groundstation/sstv_decode_prompt.sh @@ -20,18 +20,12 @@ sudo systemctl stop rtl_tcp pkill -o chromium &>/dev/null -sudo killall -9 qsstv &>/dev/null - sudo killall -9 rtl_tcp &>/dev/null sudo killall -9 java &>/dev/null sudo killall -9 CubicSDR &>/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 - sudo killall -9 zenity &>/dev/null #echo "s" >> .mode From fecad32a11a6adda7c8e941c441242aa0e689415 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Mon, 11 Oct 2021 21:40:21 -0400 Subject: [PATCH 12/12] kill gpredict --- groundstation/fox-run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/groundstation/fox-run.sh b/groundstation/fox-run.sh index fd9d7b84..c680b47a 100755 --- a/groundstation/fox-run.sh +++ b/groundstation/fox-run.sh @@ -44,6 +44,10 @@ if [ ! -f "$FILE" ]; then echo "b" > /home/pi/FoxTelemetryData/.foxprofile echo + sudo killall -9 java &>/dev/null + + sudo killall -9 gpredict &>/dev/null + FILE=/home/pi/FoxTelemetryData/FoxTelem.properties.0 if [ ! -f "$FILE" ]; then cp /home/pi/FoxTelemetryData/FoxTelem.properties /home/pi/FoxTelemetryData/FoxTelem.properties.0