From ba135d8262587ad9edd7954f0f33d47113dd9bf4 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 21:43:02 -0400 Subject: [PATCH 1/9] Update rpitx.py add 9 second delay to start --- rpitx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index 060667f3..5a486d94 100644 --- a/rpitx.py +++ b/rpitx.py @@ -258,7 +258,7 @@ if __name__ == "__main__": GPIO.setmode(GPIO.BCM) # added to make Tx LED work on Pi 4 GPIO.setup(txLed, GPIO.OUT) - sleep(1) + sleep(10) # delay so cubesatsim code catches up system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") From 9798246004d48f5e37004c25a4738815507b53fb Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 21:44:22 -0400 Subject: [PATCH 2/9] Update main.c stop rpitx then start it again --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index b78eac85..e9a0f84b 100644 --- a/main.c +++ b/main.c @@ -49,8 +49,8 @@ int main(int argc, char * argv[]) { program_radio(); - //FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); - //pclose(rpitx_stop); + FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); + pclose(rpitx_stop); FILE * file_deletes = popen("sudo rm /home/pi/CubeSatSim/ready /home/pi/CubeSatSim/cwready > /dev/null", "r"); pclose(file_deletes); From 077137e471ecd7caa9b52f1b3fe820ccc717ce7c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 21:55:57 -0400 Subject: [PATCH 3/9] Update main.c just restart rpitx, don't stop --- main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index e9a0f84b..0aa42222 100644 --- a/main.c +++ b/main.c @@ -49,7 +49,8 @@ int main(int argc, char * argv[]) { program_radio(); - FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); +// FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); + FILE * rpitx_stop = popen("sudo systemctl restart rpitx", "r"); pclose(rpitx_stop); FILE * file_deletes = popen("sudo rm /home/pi/CubeSatSim/ready /home/pi/CubeSatSim/cwready > /dev/null", "r"); @@ -70,8 +71,8 @@ int main(int argc, char * argv[]) { Serial.println("HAB mode enabled - balloon icon and BAT only telem and no low voltage shutdown"); #endif - FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r"); - pclose(rpitx_restart); +// FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r"); +// pclose(rpitx_restart); mode = FSK; frameCnt = 1; From c990fbe96ca41e765d8eb09f241cc103e05c0226 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 22:09:54 -0400 Subject: [PATCH 4/9] Update rpitx.py remove sleep(10) at start --- rpitx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index 5a486d94..a962bbf4 100644 --- a/rpitx.py +++ b/rpitx.py @@ -258,7 +258,7 @@ if __name__ == "__main__": GPIO.setmode(GPIO.BCM) # added to make Tx LED work on Pi 4 GPIO.setup(txLed, GPIO.OUT) - sleep(10) # delay so cubesatsim code catches up +# sleep(10) # delay so cubesatsim code catches up system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") From a807ff0a0693906e26260beadceb63c039f72a70 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 22:12:09 -0400 Subject: [PATCH 5/9] Update rpitx.py CW ID for aprs back in --- rpitx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index a962bbf4..b4167403 100644 --- a/rpitx.py +++ b/rpitx.py @@ -262,7 +262,8 @@ if __name__ == "__main__": system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") - if (mode != 'a') and (command_tx == True): +# if (mode != 'a') and (command_tx == True): + if (command_tx == True): output(pd, 1) output (ptt, 0) output(txLed, txLedOn) From e191778198f8288d59c7c85c66e750e09a6a206a Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 22:25:57 -0400 Subject: [PATCH 6/9] Update rpitx.py 10 sec back in --- rpitx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index b4167403..ca21fe4f 100644 --- a/rpitx.py +++ b/rpitx.py @@ -258,7 +258,7 @@ if __name__ == "__main__": GPIO.setmode(GPIO.BCM) # added to make Tx LED work on Pi 4 GPIO.setup(txLed, GPIO.OUT) -# sleep(10) # delay so cubesatsim code catches up + sleep(10) # delay so cubesatsim code catches up system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") From 0b90b2c121bab8657d590ca629c23d57e27155e2 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 22:28:49 -0400 Subject: [PATCH 7/9] Update rpitx.py try 5 --- rpitx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index ca21fe4f..0cdc955e 100644 --- a/rpitx.py +++ b/rpitx.py @@ -258,7 +258,7 @@ if __name__ == "__main__": GPIO.setmode(GPIO.BCM) # added to make Tx LED work on Pi 4 GPIO.setup(txLed, GPIO.OUT) - sleep(10) # delay so cubesatsim code catches up + sleep(5) # delay so cubesatsim code catches up system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") From 368ee6352609e42352c7e8eaee862d588b4aba81 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 4 Oct 2023 22:31:00 -0400 Subject: [PATCH 8/9] Update rpitx.py back to 10 --- rpitx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index 0cdc955e..ca21fe4f 100644 --- a/rpitx.py +++ b/rpitx.py @@ -258,7 +258,7 @@ if __name__ == "__main__": GPIO.setmode(GPIO.BCM) # added to make Tx LED work on Pi 4 GPIO.setup(txLed, GPIO.OUT) - sleep(5) # delay so cubesatsim code catches up + sleep(10) # delay so cubesatsim code catches up system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1") From 706b8413b4daeff7ce3872909bc21707168b09e3 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 5 Oct 2023 08:29:36 -0400 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf145833..354ac31e 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To get the software follow these steps: `cd CubeSatSim` -`git checkout beta-v1.3.2` +`git checkout beta-v1.3.1` You are now ready to install the software using this script in the CubeSatSim directory: