Merge pull request #425 from alanbjohnston/master-b-q

Updates for PacSat Ground Station version 0.46q
pull/426/head
Alan Johnston 1 week ago committed by GitHub
commit b8d53baf73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -1835,6 +1835,25 @@ elif [ "$1" = "-I" ]; then
reboot=1 reboot=1
sudo echo "P" > /home/pi/CubeSatSim/.mode sudo echo "P" > /home/pi/CubeSatSim/.mode
value=`cat /home/pi/CubeSatSim/sim.cfg`
echo "$value" > /dev/null
set -- $value
if [ "${7}" = "434.9" ] && [ "${8}" = "435" ]; then
echo "The default transmit frequency of 434.9 MHz is set"
echo
echo "Do you want to change it (for example to 435 MHz)?"
read input
echo
if [ "$input" = "y" ] || [ "$input" = "yes" ] ; then
/home/pi/CubeSatSim/config -F n
fi
fi
# if [ "$1" == "f" ] || [ "$1" == "b" ] || [ "$1" == "e" ] ; then # if [ "$1" == "f" ] || [ "$1" == "b" ] || [ "$1" == "e" ] ; then
# FILE=/home/pi/CubeSatSim/battery_saver # FILE=/home/pi/CubeSatSim/battery_saver
# if [ -f "$FILE" ]; then # if [ -f "$FILE" ]; then

@ -104,14 +104,22 @@ elif [ "$loopback" = "1" ] ; then
cd cd
sudo rm PacSatGroundLoop.zip &>/dev/null sudo rm PacSatGroundLoop.zip &>/dev/null
wget https://github.com/alanbjohnston/CubeSatSim/raw/refs/heads/master-b-p/spacecraft/PacSatGround_0.46o/PacSatGroundLoop.zip wget https://github.com/alanbjohnston/CubeSatSim/raw/refs/heads/master-b-p/spacecraft/PacSatGround_0.46o/PacSatGround.zip
unzip PacSatGroundLoop.zip -d PacSatGroundLoop unzip PacSatGround.zip -d PacSatGroundLoop
sudo rm PacSatGroundLoop.zip sudo rm PacSatGround.zip
echo sudo sed -i 's/logfile_dir=\/home\/pi\/PacSatGround/logfile_dir=\/home\/pi\/PacSatGroundLoop/g' /home/pi/PacSatGroundLoop/PacSatGround.properties
echo "The first time you run the Ground Station, you will need to select Yes to override files, then put in your callsign"
sleep 10 FILE=/home/pi/Desktop/PacsatGround/spacecraft/PacSatSim.properties
if [ -f "$FILE" ]; then
FILE2=/home/pi/PacSatGroundLoop/spacecraft/PacSatSim.properties
sudo rm $FILE2
cp $FILE $FILE2
else
echo
echo "The first time you run the Ground Station, you will need to select Yes to override files, then put in your callsign"
sleep 10
fi
fi fi
else else
@ -127,10 +135,17 @@ else
wget https://github.com/alanbjohnston/CubeSatSim/raw/refs/heads/master-b-p/spacecraft/PacSatGround_0.46o/PacSatGround.zip wget https://github.com/alanbjohnston/CubeSatSim/raw/refs/heads/master-b-p/spacecraft/PacSatGround_0.46o/PacSatGround.zip
unzip PacSatGround.zip -d PacSatGround unzip PacSatGround.zip -d PacSatGround
sudo rm PacSatGround.zip sudo rm PacSatGround.zip
echo FILE=/home/pi/Desktop/PacsatGround/spacecraft/PacSatSim.properties
echo "The first time you run the Ground Station, you will need to select Yes to override files, then put in your callsign" if [ -f "$FILE" ]; then
sleep 10 FILE2=/home/pi/PacSatGround/spacecraft/PacSatSim.properties
sudo rm $FILE2
cp $FILE $FILE2
else
echo
echo "The first time you run the Ground Station, you will need to select Yes to override files, then put in your callsign"
sleep 10
fi
fi fi

@ -65,10 +65,10 @@ if [[ $(grep '11.' /etc/debian_version) ]]; then
sudo sed -i 's/console=serial0,115200 //g' /boot/cmdline.txt sudo sed -i 's/console=serial0,115200 //g' /boot/cmdline.txt
sudo sed -i 's/console=tty1 r/console=tty1 maxcpus=1 r/g' /boot/cmdline.txt # single core if Pi Zero 2 sudo sed -i 's/console=tty1 r/console=tty1 maxcpus=2 r/g' /boot/cmdline.txt # single core if Pi Zero 2
# sudo sed -i 's/console=tty1 maxcpus=1 r/console=tty1 r/g' /boot/cmdline.txt # sudo sed -i 's/console=tty1 maxcpus=1 r/console=tty1 r/g' /boot/cmdline.txt
sudo sed -i 's/maxcpus=2/maxcpus=1/g' /boot/cmdline.txt # single core if Pi Zero 2 sudo sed -i 's/maxcpus=1/maxcpus=2/g' /boot/cmdline.txt # single core if Pi Zero 2
sudo sed -i 's/#dtparam=i2c_arm=on/dtparam=i2c_arm=on/g' /boot/config.txt sudo sed -i 's/#dtparam=i2c_arm=on/dtparam=i2c_arm=on/g' /boot/config.txt
@ -163,10 +163,10 @@ if [[ $(grep 'bookworm' /etc/os-release) ]]; then
sudo sed -i 's/console=serial0,115200 //g' /boot/firmware/cmdline.txt sudo sed -i 's/console=serial0,115200 //g' /boot/firmware/cmdline.txt
sudo sed -i 's/console=tty1 r/console=tty1 maxcpus=1 r/g' /boot/firmware/cmdline.txt # single core if Pi Zero 2 sudo sed -i 's/console=tty1 r/console=tty1 maxcpus=2 r/g' /boot/firmware/cmdline.txt # single core if Pi Zero 2
# sudo sed -i 's/console=tty1 maxcpus=1 r/console=tty1 r/g' /boot/firmware/cmdline.txt # sudo sed -i 's/console=tty1 maxcpus=1 r/console=tty1 r/g' /boot/firmware/cmdline.txt
sudo sed -i 's/maxcpus=2/maxcpus=1/g' /boot/firmware/cmdline.txt # single core if Pi Zero 2 sudo sed -i 's/maxcpus=1/maxcpus=2/g' /boot/firmware/cmdline.txt # single core if Pi Zero 2
sudo sed -i 's/#dtparam=i2c_arm=on/dtparam=i2c_arm=on/g' /boot/firmware/config.txt sudo sed -i 's/#dtparam=i2c_arm=on/dtparam=i2c_arm=on/g' /boot/firmware/config.txt
@ -586,10 +586,10 @@ sudo raspi-config nonint do_vnc 0
if [ ! -d "/home/pi/Desktop/PacsatGround" ]; then if [ ! -d "/home/pi/Desktop/PacsatGround" ]; then
cd /tmp cd /tmp
wget https://www.g0kla.com/pacsat/downloads/test/PacsatGround_unix_0_46o.tar.gz wget https://www.g0kla.com/pacsat/downloads/test/PacsatGround_unix_0_46q.tar.gz
tar -xzf PacsatGround_unix_0_46o.tar.gz -C /home/pi/Desktop tar -xzf PacsatGround_unix_0_46q.tar.gz -C /home/pi/Desktop
rm PacsatGround_unix_0_46o.tar.gz rm PacsatGround_unix_0_46q.tar.gz
cp /home/pi/CubeSatSim/spacecraft/PacSatGround_0.46o/* /home/pi/Desktop/PacsatGround/spacecraft/ # cp /home/pi/CubeSatSim/spacecraft/PacSatGround_0.46o/* /home/pi/Desktop/PacsatGround/spacecraft/
# mkdir /home/pi/PacSatGround # mkdir /home/pi/PacSatGround
sudo usermod -a -G gpio pi sudo usermod -a -G gpio pi
sudo apt-get install default-jdk -y sudo apt-get install default-jdk -y

@ -67,7 +67,7 @@ callsign="$1"
txfrequency="$7e3" txfrequency="$7e3"
rxfrequency="$8e3" rxfrequency="$8e3"
echo -n "PacSat allsign is " echo -n "PacSat callsign is "
echo $callsign echo $callsign
echo -n "Transmit Frequency is " echo -n "Transmit Frequency is "
echo $txfrequency echo $txfrequency
@ -84,11 +84,11 @@ if [ ! -d "/home/pi/PacSat" ]; then
cd cd
sudo rm pacsat-dir.zip sudo rm pacsat-dir.zip
mkdir PacSat mkdir /home/pi/PacSat
mkdir PacSat/pacsat mkdir /home/pi/PacSat/pacsat
mkdir PacSat/pacsat/dir mkdir /home/pi/PacSat/pacsat/dir
wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.1/pacsat-dir.zip wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pacsat-dir.zip
unzip pacsat-dir.zip -d PacSat/pacsat/dir unzip pacsat-dir.zip
sudo rm pacsat-dir.zip sudo rm pacsat-dir.zip
cd cd
@ -96,8 +96,8 @@ if [ ! -d "/home/pi/PacSat" ]; then
sudo rm /home/pi/pi_pacsat/Debug/pacsat.state sudo rm /home/pi/pi_pacsat/Debug/pacsat.state
sudo rm /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat sudo rm /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat
sudo rm pi_pacsat.zip sudo rm pi_pacsat.zip
wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.1/pi_pacsat.zip wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pi_pacsat.zip
unzip pi_pacsat.zip -d /home/pi/pi_pacsat/Debug unzip pi_pacsat.zip -d /
sudo rm pi_pacsat.zip sudo rm pi_pacsat.zip
# mkdir /home/pi/PacSat # mkdir /home/pi/PacSat

Loading…
Cancel
Save

Powered by TurnKey Linux.