From f05976c7ea23fdba9c3b81599527fe4e75cfa59c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sun, 30 Jul 2023 21:41:08 -0400 Subject: [PATCH] move command query to right place --- rpitx.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/rpitx.py b/rpitx.py index 35187bce..2d3ad787 100644 --- a/rpitx.py +++ b/rpitx.py @@ -294,22 +294,6 @@ if __name__ == "__main__": file = open("/home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg") print("First SSTV stored image detected") system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg") - - output(pd, 1) - if GPIO.input(squelch) == False: - print("carrier received!") - command_tx = not command_tx - print(command_tx) - if (command_tx == True): - print("Turning on transmit") - system("echo > command_tx True") -# output(txLed, txLedOn) -# sleep(0.5) -# output(txLed, txLedff) - else: - print("Turning off transmit") - system("echo > command_tx False") - output(pd, 0) if (command_tx == True): print ("Sending SSTV image") @@ -337,6 +321,22 @@ if __name__ == "__main__": system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/camera_out.jpg") system("sudo rm /home/pi/CubeSatSim/camera_out.jpg > /dev/null 2>&1") + output(pd, 1) + if GPIO.input(squelch) == False: + print("carrier received!") + command_tx = not command_tx + print(command_tx) + if (command_tx == True): + print("Turning on transmit") + system("echo > command_tx True") +# output(txLed, txLedOn) +# sleep(0.5) +# output(txLed, txLedff) + else: + print("Turning off transmit") + system("echo > command_tx False") + output(pd, 0) + if (command_tx == True): print ("Sending SSTV image") output(txLed, txLedOn)