Merge branch 'pacsat-loop' of http://github.com/alanbjohnston/CubeSatSim into pacsat-loop

groundstation/direwolf/direwolf-fm-pacsat-jp14.conf

@@ -1,10 +1,19 @@
 MYCALL AMSAT
-ADEVICE plughw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
-#PTT GPIO 20
+ADEVICE hw:CARD=Device,DEV=0 plughw:CARD=Device,DEV=0
+PTT GPIO -20
 CHANNEL 0
 MODEM 1200
 KISSPORT 8100
 AGWPORT 8002
-FULLDUP OFF
-TXDELAY 30
+#FULLDUP OFF
+#TXDELAY 30
 #FIX_BITS 1 AX25
+
+#DWAIT 0
+DWAIT 20
+SLOTTIME 300
+PERSIST 63
+#TXDELAY 1000
+TXDELAY 150
+#TXTAIL 10
+FULLDUP OFF

groundstation/pacsat-df.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo modprobe snd-aloop
+
+#gpio -g mode 20 out
+
+#gpio -g write 20 1
+
+direwolf -r 48000 -c /home/pi/CubeSatSim/groundstation/direwolf/direwolf-fm-pacsat-jp14.conf -t 0 
+

groundstation/pacsat.sh

@@ -4,9 +4,9 @@
 
 sudo modprobe snd-aloop
 
-sudo systemctl stop cubesatsim >/dev/null 2>&1
+#sudo systemctl stop cubesatsim >/dev/null 2>&1
 
-sudo systemctl stop transmit >/dev/null 2>&1
+#sudo systemctl stop transmit >/dev/null 2>&1
 
 sudo systemctl stop command >/dev/null 2>&1
 
@@ -77,9 +77,10 @@ echo
 #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 "/home/pi/CubeSatSim/groundstation/pacsat-d.sh"
+/usr/bin/x-terminal-emulator --geometry=120x40 -e "/home/pi/CubeSatSim/groundstation/pacsat-df.sh"
 
-arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 435045 &
+# arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 435045 &
+##arecord -D plughw:CARD=Loopback,DEV=1 -f S16_LE -r 48000 -c 1 | csdr convert_s16_f | csdr gain_ff 4000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 435045 &
 
 echo "Don't close the direwolf window or the Pacsatsim will stop running."