Merge pull request #362 from alanbjohnston/pacsat-loop-2

changes to make easier to debug
pacsat-tx
Alan Johnston 10 months ago committed by GitHub
commit 35e2e0e3d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -10,7 +10,7 @@ There are several hardware versions and software branches to go with them - see
See the Wiki Software Install page for more details: https://github.com/alanbjohnston/CubeSatSim/wiki/2.-Software-Install. The software runs on any Raspberry Pi including the Raspberry Pi 4B, 3B, 3B+, Pi Zero, Pi Zero W, or Pi Zero 2 W. See the Wiki Software Install page for more details: https://github.com/alanbjohnston/CubeSatSim/wiki/2.-Software-Install. The software runs on any Raspberry Pi including the Raspberry Pi 4B, 3B, 3B+, Pi Zero, Pi Zero W, or Pi Zero 2 W.
There are two ways to get the CubeSatSim software for your Pi. There are two ways to get the CubeSatSim(TM) software for your Pi.
One option is to download the disk image file and write it to a 16GB micro SD card or larger. The image is based on Raspberry Pi OS (Rasbian) Lite, dated December 2020. All software is installed, you just need to login to change your password and set your amateur radio callsign if you have one. You can run the ./update.sh script to update all packages and update and compile the latest CubeSatSim software. One option is to download the disk image file and write it to a 16GB micro SD card or larger. The image is based on Raspberry Pi OS (Rasbian) Lite, dated December 2020. All software is installed, you just need to login to change your password and set your amateur radio callsign if you have one. You can run the ./update.sh script to update all packages and update and compile the latest CubeSatSim software.

@ -3,6 +3,6 @@ ADEVICE plughw:CARD=Loopback,DEV=1 plughw:CARD=Loopback,DEV=1
MYCALL AMSAT-12 MYCALL AMSAT-12
CHANNEL 0 CHANNEL 0
MODEM 1200 MODEM 1200
FULLDUP OFF FULLDUP ON
TXDELAY 15 TXDELAY 15
#FIX_BITS 1 AX25 #FIX_BITS 1 AX25

@ -0,0 +1,6 @@
#!/bin/bash
/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0"

@ -22,7 +22,7 @@ pkill -o chromium &>/dev/null
sudo killall -9 rtl_fm &>/dev/null sudo killall -9 rtl_fm &>/dev/null
sudo killall -9 direwolf &>/dev/null #sudo killall -9 direwolf &>/dev/null
sudo killall -9 sdrpp &>/dev/null sudo killall -9 sdrpp &>/dev/null
@ -40,15 +40,15 @@ sudo killall -9 zenity &>/dev/null
echo echo
sudo systemctl restart pacsatsim #sudo systemctl restart pacsatsim
sudo /etc/init.d/alsa-utils stop #sudo /etc/init.d/alsa-utils stop
sudo /etc/init.d/alsa-utils start #sudo /etc/init.d/alsa-utils start
echo "Waiting 10 seconds for Pacsatsim to start" #echo "Waiting 10 seconds for Pacsatsim to start"
sleep 10 #sleep 10
#value=`cat /home/pi/CubeSatSim/sim.cfg` #value=`cat /home/pi/CubeSatSim/sim.cfg`
#echo "$value" > /dev/null #echo "$value" > /dev/null
@ -72,13 +72,13 @@ echo
cd /home/pi/Desktop/PacSatGround_0.46m_linux/ cd /home/pi/Desktop/PacSatGround_0.46m_linux/
setsid java -Xmx512M -jar PacSatGround.jar "/home/pi/PacSatGround" & setsid java -Xmx512M -jar PacSatGround.jar "/home/pi/PacSatGround" # removed &
#direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0 # & #direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0 # &
/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0" #/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0"
echo "Don't close the direwolf-pacsat-loopback window or the Pacsatsim will stop running." #echo "Don't close the direwolf-pacsat-loopback window or the Pacsatsim will stop running."
#cd /home/pi/Desktop/PacSatGround_0.46m_linux/ #cd /home/pi/Desktop/PacSatGround_0.46m_linux/

@ -0,0 +1,17 @@
#!/bin/bash
/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/pacsatsim-d.sh"
sleep 1
/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/pacsatsim.sh"
sleep 1
/usr/bin/x-terminal-emulator --geometry=120x40 -e "direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat-loopback.conf -t 0"
sleep 1
/usr/bin/x-terminal-emulator --geometry=120x40 -e "bash /home/pi/CubeSatSim/groundstation/pacsat.sh"

@ -0,0 +1,5 @@
#!/bin/bash
sudo modprobe snd-aloop
direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-loopback.conf -t 0

@ -183,10 +183,10 @@ if [ "$choice" = "7" ] || [ "$choice" = "8" ] || [ "$frequency" = "Serenity" ]
else else
echo -e "Auto decoding APRS Pacsat packets on $frequency Hz" # echo -e "Auto decoding APRS Pacsat packets on $frequency Hz"
direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-loopback.conf -t 0 &
# direwolf -P+ -D1 -qd -dp -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim-loopback.conf -t 0 &
echo
fi fi
sleep 5 sleep 5

Loading…
Cancel
Save

Powered by TurnKey Linux.