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 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 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 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 & + 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 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 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 " ")' 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 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 diff --git a/hardware/README.md b/hardware/README.md index e0163146..cbfe8a55 100644 --- a/hardware/README.md +++ b/hardware/README.md @@ -1,5 +1,9 @@ -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. +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. 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