Merge pull request #347 from alanbjohnston/pacsat-1

Pacsat updates

config

@@ -525,8 +525,10 @@ elif [ "$1" = "-c" ]; then
 	echo "$value" > /dev/null
 	set -- $value
 
+	oldcallsign="$1"
+
 	echo "Current value of CALLSIGN is"	
-	echo $1
+	echo $oldcallsign
 	echo
 	
 #	echo $1 $2 $3 $4 $5 $6 $7 $8 $9 ${10} 
@@ -545,6 +547,8 @@ elif [ "$1" = "-c" ]; then
 
 		echo $callsign $2 $3 $4 $5 $6 $7 $8 $9 ${10} ${11}
 		echo $callsign $2 $3 $4 $5 $6 $7 $8 $9 ${10} ${11} > /home/pi/CubeSatSim/sim.cfg
+
+		sudo sed -i 's/$oldcallsign/$callsign/g' /home/pi/pi_pacsat/Debug/pacsat.config > /dev/null 2>&1
 	fi
 	
 	if [ "$norestart" = "1" ]; then
@@ -1409,6 +1413,15 @@ elif [ "$1" = "-g" ]; then
 
 	fi
 
+elif [ "$1" = "-G" ]; then
+
+	echo "Changing to Pacsat mode"
+	echo
+	sudo systemctl stop cubesatsim
+	sudo systemctl stop transmit
+
+	/home/pi/CubeSatSim/pacsat.sh
+
 elif [ "$1" = "-h" ]; then
 
 	echo "config OPTION"
@@ -1445,6 +1458,7 @@ elif [ "$1" = "-h" ]; then
 	echo "   -o     Change telemetry beacon transmit state"
 	echo "   -L     Change microphone level for command and control"
 	echo "   -g     Reset configuration back to default settings"
+	echo "   -G     Change to Pacsat mode"
 
 	echo
 	exit

groundstation/pacsat.sh

@@ -4,6 +4,7 @@
 
 sudo modprobe snd-aloop
 
+
 sudo systemctl stop cubesatsim &>/dev/null
 
 sudo systemctl stop transmit &>/dev/null
@@ -173,7 +174,7 @@ if [ "$choice" = "7" ] || [ "$choice" = "8" ]  || [ "$frequency" = "Serenity" ]
 
   echo -e "Auto decoding 4800 bps AX.25 packets on $frequency Hz"
 
-  direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -t 0 &
+  direwolf -qd -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -t 0 &
 
 else
 
@@ -181,13 +182,13 @@ else
 
 	  echo -e "Direwolf using USB Sound Card (FM Transceiver) on $frequency Hz"
 
-    direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat.conf -t 0 &
+    direwolf -qd -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat.conf -t 0 &
 
   else
 
     echo -e "Direwolf using RTL-SDR on $frequency Hz"
   
-    direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat.conf -t 0 &
+    direwolf -r 48000 -qd -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-pacsat.conf -t 0 &
 
     sleep 5
 
@@ -202,7 +203,7 @@ else
 
 cd /home/pi/Desktop/PacSatGround_0.46m_linux/
 
-sudo setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSat" &
+sudo setsid java -Xmx512M -jar  PacSatGround.jar "/home/pi/PacSatGround" &
 
 sleep 5
 

install

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo -e "\ninstallation script for CubeSatSim v2.0\n"
+echo -e "\ninstallation script for CubeSatSim v2.1\n"
 
 FILE=/home/pi/CubeSatSim/sim.cfg
 if [ -f "$FILE" ]; then
@@ -148,17 +148,38 @@ mkdir /home/pi/PacSat/pacsat/dir
 
 export LD_LIBRARY_PATH=/mnt/usb-disk/ariss/lib:/usr/local/lib/iors_common:$LD_LIBRARY_PATH
 
-cd
-
-cd PacSat
+value=`cat /home/pi/CubeSatSim/sim.cfg`
+echo "$value" > /dev/null
+set -- $value
 
 echo "bit_rate=9600" > pacsat.config
-echo "bbs_callsign=XY2ZZ-12" >> pacsat.config
-echo "broadcast_callsign=XY2ZZ-11" >> pacsat.config
-echo "digi_callsign=XY2ZZ-1" >> pacsat.config
+echo "bbs_callsign=$1" >> pacsat.config
+echo "broadcast_callsign=$1-11" >> pacsat.config
+echo "digi_callsign=$1-1" >> pacsat.config
 echo "max_frames_in_tx_buffer=5" >> pacsat.config
-echo "pb_open=1" >> pacsat.config
-echo "uplink_open=1" >> pacsat.config
+
+echo "pb_open=1" > pacsat.state
+echo "uplink_open=1" >> pacsat.state
+
+sudo sed -i 's/#hdmi_group=1/hdmi_group=2/g' /boot/config.txt
+sudo sed -i 's/#hdmi_mode=1/hdmi_mode=16/g' /boot/config.txt
+sudo sed -i 's/#hdmi_force_hotplug=1/hdmi_force_hotplug=1/g' /boot/config.txt
+
+sudo raspi-config nonint do_vnc 0
+
+cd /tmp
+
+wget https://www.g0kla.com/pacsat/downloads/test/PacSatGround_0.46m_linux.tar.gz
+
+tar -xzf PacSatGround_0.46m_linux.tar.gz -C /home/pi/Desktop
+
+rm PacSatGround_0.46m_linux.tar.gz
+
+cp /home/pi/CubeSatSim/spacecraft/PacSatGround_0.46m/* /home/pi/Desktop/PacSatGround_0.46m_linux/spacecraft/
+
+mkdir /home/pi/PacSatGround
+
+sudo apt-get install default-jdk -y
 
 cd
 
@@ -190,10 +211,9 @@ sudo raspi-config nonint do_legacy 0
 
 ##  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=1 r/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
   

pacsatsim.sh

@@ -46,20 +46,22 @@ echo
 
 #exit
 
-echo "Choose the number for the packet decoding option:"
-echo
-echo "1. APRS US 2m (144390 kHz)"
-echo "2. CubeSatSim (434900 kHz)"
-echo "3. APRS European 2m (144800 kHz)"
-echo "4. APRS Australian 2m (145175 kHz)"
-echo "5. APRS on another frequency"
-echo "6. APRS on ISS (145825 kHz)"
-echo "7. Serenity CubeSat 4800 bps (437.1 MHz)"
-echo "8. Test Serenity CubeSat decoding with WAV file"
-echo "9. Test APRS decoding with CubeSatSim WAV file"
-echo
-
-read -r choice
+#echo "Choose the number for the packet decoding option:"
+#echo
+#echo "1. APRS US 2m (144390 kHz)"
+#echo "2. CubeSatSim (434900 kHz)"
+#echo "3. APRS European 2m (144800 kHz)"
+#echo "4. APRS Australian 2m (145175 kHz)"
+#echo "5. APRS on another frequency"
+#echo "6. APRS on ISS (145825 kHz)"
+#echo "7. Serenity CubeSat 4800 bps (437.1 MHz)"
+#echo "8. Test Serenity CubeSat decoding with WAV file"
+#echo "9. Test APRS decoding with CubeSatSim WAV file"
+#echo
+
+#read -r choice
+
+choice=2
 
 #fi
 
@@ -175,13 +177,13 @@ if [ "$choice" = "7" ] || [ "$choice" = "8" ]  || [ "$frequency" = "Serenity" ]
 
   echo -e "Auto decoding 4800 bps AX.25 packets on $frequency Hz"
 
-  direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -t 0 &
+  direwolf -qd -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-4800.conf -t 0 &
 
 else
 
   echo -e "Auto decoding APRS Pacsat packets on $frequency Hz"
 
-  direwolf -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim.conf -t 0 &
+  direwolf -qd -r 48000 -c /home/pi/CubeSatSim/direwolf/direwolf-pacsatsim.conf -t 0 &
 
 fi
 
@@ -193,6 +195,8 @@ set -- $value
 
 #rtl_fm -M fm -f $frequency -s 48k | tee >(aplay -D hw:${2:0:1},0,0 -r 48000 -t raw -f S16_LE -c 1) | aplay -D hw:0,0 -r 48000 -t raw -f S16_LE -c 1 &
 
-/home/pi/pi_pacsat/Debug/pi_pacsat -c /home/pi/pi_pacsat/Debug/pacsat.config -d /home/pi/PacSat
+cd /home/pi/pi_pacsat/Debug
+
+./pi_pacsat -c pacsat.config -d /home/pi/PacSat
 
 sleep 5