From 26be125a780356f2c1efb4debd8fd967263c2836 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 20:56:48 -0400
Subject: [PATCH 01/44] try background SSTV

---
 rpitx.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 1db4dbb2..bd433eea 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -5,6 +5,7 @@ import subprocess
 import time
 import os
 import sys
+from picamera import PiCamera
 
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
@@ -52,13 +53,14 @@ if __name__ == "__main__":
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
 	    GPIO.output(txLed, txLedOn);
-	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
-#	    while True:
-#		GPIO.output(txLed, txLedOff);
-#		print("Sleeping")
-#		time.sleep(10)
-#		print("Transmitting SSTV")
-#		GPIO.output(txLed, txLedOn);
+#	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
+	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
+	    while True:
+		GPIO.output(txLed, txLedOff);
+		print("Sleeping")
+		time.sleep(10)
+		print("Transmitting SSTV")
+		GPIO.output(txLed, txLedOn);
 #		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):
             print("BPSK")

From 54d79f90264a2dc4c07ce19d4c1d7958711285d8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:01:04 -0400
Subject: [PATCH 02/44] Update rpitx.py

---
 rpitx.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpitx.py b/rpitx.py
index bd433eea..cc183112 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -25,6 +25,7 @@ else:
  	txLedOff = False
 	
 GPIO.setup(txLed, GPIO.OUT)
+print(txLed)
 	
 print(transmit)
 

From 1837ecb168de01414b0abb97c9462d61798e2b4f Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:14:26 -0400
Subject: [PATCH 03/44] fixed GPIO22 sensing

---
 rpitx.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index cc183112..340793ed 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -9,14 +9,14 @@ from picamera import PiCamera
 
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
-GPIO.setup(27, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+GPIO.setup(22, GPIO.IN, pull_up_down=GPIO.PUD_UP)
 GPIO.setup(12, GPIO.IN, pull_up_down=GPIO.PUD_UP)
 transmit = False
 if GPIO.input(12) == False:
 	transmit = True
-if GPIO.input(27) == False:
+if GPIO.input(22) == False:
 	transmit = True
-	txLed = 22
+	txLed = 27
 	txLedOn = False
  	txLedOff = True
 else:
@@ -25,7 +25,7 @@ else:
  	txLedOff = False
 	
 GPIO.setup(txLed, GPIO.OUT)
-print(txLed)
+print(txLedOn)
 	
 print(transmit)
 

From c431e65e7590c59a285a9671e3a10a30c1d3ed29 Mon Sep 17 00:00:00 2001
From: Alan Johnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:36:39 -0400
Subject: [PATCH 04/44] worknig tx LED python

---
 rpitx.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 340793ed..5096c821 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -17,15 +17,18 @@ if GPIO.input(12) == False:
 if GPIO.input(22) == False:
 	transmit = True
 	txLed = 27
-	txLedOn = False
- 	txLedOff = True
+	txLedOn = 0
+ 	txLedOff = 1
 else:
 	txLed = 27
-	txLedOn = True
- 	txLedOff = False
+	txLedOn = 1 
+ 	txLedOff = 0
 	
 GPIO.setup(txLed, GPIO.OUT)
 print(txLedOn)
+print(txLed)
+GPIO.setup(27, GPIO.OUT)
+GPIO.output(27, 0)
 	
 print(transmit)
 
@@ -33,8 +36,10 @@ file = open("/home/pi/CubeSatSim/sim.cfg")
 callsign = file.readline().split(" ")[0]
 print(callsign)
 
+#GPIO.output(27, 1);
 GPIO.output(txLed, txLedOn);
 os.system("echo 'de " + callsign + "' > id.txt && gen_packets -M 20 id.txt -o morse.wav -r 48000 > /dev/null 2>&1 && cat morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
+#GPIO.output(27, 0);
 GPIO.output(txLed, txLedOff);
 
 time.sleep(2)
@@ -57,11 +62,15 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
-		GPIO.output(txLed, txLedOff);
+		GPIO.output(txLed, txLedOn);
+	#	GPIO.output(27, 0);
 		print("Sleeping")
 		time.sleep(10)
 		print("Transmitting SSTV")
-		GPIO.output(txLed, txLedOn);
+		GPIO.output(txLed, txLedOff);
+#		GPIO.output(27, 1);
+		time.sleep(10)
+
 #		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):
             print("BPSK")

From 8df166c9088cc8e38692760b7e98bb936399aa52 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:40:28 -0400
Subject: [PATCH 05/44] added camera capture

---
 rpitx.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rpitx.py b/rpitx.py
index 5096c821..5399e751 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -62,6 +62,15 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
+		try:
+			camera = PiCamera()
+			camera.resolution = (640, 496)
+			camera.start_preview()
+			# Camera warm-up time
+			sleep(2)
+			camera.capture('sstv_image.jpg')
+		catch:
+			
 		GPIO.output(txLed, txLedOn);
 	#	GPIO.output(27, 0);
 		print("Sleeping")

From aeb3b4d24d98dd730b4fc8583ebb096f937837aa Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:43:26 -0400
Subject: [PATCH 06/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 5399e751..a89a49f9 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
 			# Camera warm-up time
 			sleep(2)
 			camera.capture('sstv_image.jpg')
-		catch:
+		except:
 			
 		GPIO.output(txLed, txLedOn);
 	#	GPIO.output(27, 0);

From ed316c9a79052d1fb604fe6c8afa489f994c4ba3 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:44:59 -0400
Subject: [PATCH 07/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index a89a49f9..81bfe9fc 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
 			# Camera warm-up time
 			sleep(2)
 			camera.capture('sstv_image.jpg')
-		except:
+#		except:
 			
 		GPIO.output(txLed, txLedOn);
 	#	GPIO.output(27, 0);

From 8e654509e3abc8ce73e3087a1b3beb639ef44332 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Fri, 14 May 2021 21:49:27 -0400
Subject: [PATCH 08/44] Update rpitx.py

---
 rpitx.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 81bfe9fc..05968761 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -69,16 +69,15 @@ if __name__ == "__main__":
 			# Camera warm-up time
 			sleep(2)
 			camera.capture('sstv_image.jpg')
-#		except:
-			
-		GPIO.output(txLed, txLedOn);
+		finally:			
+			GPIO.output(txLed, txLedOn);
 	#	GPIO.output(27, 0);
-		print("Sleeping")
-		time.sleep(10)
-		print("Transmitting SSTV")
-		GPIO.output(txLed, txLedOff);
+			print("Sleeping")
+			time.sleep(10)
+			print("Transmitting SSTV")
+			GPIO.output(txLed, txLedOff);
 #		GPIO.output(27, 1);
-		time.sleep(10)
+			time.sleep(10)
 
 #		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):

From 7b42cc9e78c8fa8553dca9f5183fb93da6746300 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 06:31:04 -0400
Subject: [PATCH 09/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 05968761..4815427c 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -67,7 +67,7 @@ if __name__ == "__main__":
 			camera.resolution = (640, 496)
 			camera.start_preview()
 			# Camera warm-up time
-			sleep(2)
+			time.sleep(2)
 			camera.capture('sstv_image.jpg')
 		finally:			
 			GPIO.output(txLed, txLedOn);

From 067aab822f1b4b480612a922df26697207c2ebd5 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 08:08:11 -0400
Subject: [PATCH 10/44] Update rpitx.py

---
 rpitx.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 4815427c..76b4ee79 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -5,7 +5,7 @@ import subprocess
 import time
 import os
 import sys
-from picamera import PiCamera
+# from picamera import PiCamera
 
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
@@ -62,22 +62,26 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
-		try:
-			camera = PiCamera()
-			camera.resolution = (640, 496)
-			camera.start_preview()
+		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496 > /dev/null 2>&1")
+		os.system("python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav > /dev/null 2>&1")
+		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1")
+		
+#		try:
+#			camera = PiCamera()
+#			camera.resolution = (640, 496)
+#			camera.start_preview()
 			# Camera warm-up time
-			time.sleep(2)
-			camera.capture('sstv_image.jpg')
-		finally:			
-			GPIO.output(txLed, txLedOn);
+#			time.sleep(2)
+#			camera.capture('sstv_image.jpg')
+#		finally:			
+		GPIO.output(txLed, txLedOn);
 	#	GPIO.output(27, 0);
-			print("Sleeping")
-			time.sleep(10)
-			print("Transmitting SSTV")
-			GPIO.output(txLed, txLedOff);
+		print("Sleeping")
+		time.sleep(10)
+		print("Transmitting SSTV")
+		GPIO.output(txLed, txLedOff);
 #		GPIO.output(27, 1);
-			time.sleep(10)
+		time.sleep(10)
 
 #		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):

From 4afcc04ff1f2ecac124749b7972b5213280922f3 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 08:15:11 -0400
Subject: [PATCH 11/44] Update rpitx.py

---
 rpitx.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 76b4ee79..8844e335 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -62,9 +62,9 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
-		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496 > /dev/null 2>&1")
-		os.system("python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav > /dev/null 2>&1")
-		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1")
+		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496 > /dev/null") # 2>&1")
+		os.system("python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
+		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:
 #			camera = PiCamera()

From 7327afe8be8209ecb5fe5645d321f0795a74134b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 08:19:15 -0400
Subject: [PATCH 12/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 8844e335..e59c8a47 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -62,7 +62,7 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
-		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496 > /dev/null") # 2>&1")
+		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		os.system("python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
 		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		

From 5ee89b9dc2c2e8b7917ba589c9d3f858b46236a7 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 08:38:26 -0400
Subject: [PATCH 13/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index e59c8a47..7688f3e4 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
 		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
-		os.system("python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
+		os.system("sudo python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
 		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:

From 25d8a35827fe77a9e90126b68d4534054d3b13ea Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 09:18:56 -0400
Subject: [PATCH 14/44] Update rpitx.py

---
 rpitx.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 7688f3e4..35642bfa 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -62,8 +62,11 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
+		GPIO.output(txLed, txLedOn);
 		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+		print("Picture taken")
 		os.system("sudo python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
+		print ("Sending picture")
 		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:
@@ -74,7 +77,7 @@ if __name__ == "__main__":
 #			time.sleep(2)
 #			camera.capture('sstv_image.jpg')
 #		finally:			
-		GPIO.output(txLed, txLedOn);
+
 	#	GPIO.output(27, 0);
 		print("Sleeping")
 		time.sleep(10)

From e40054d496e2bd4af95166df7fbe3a6f192f0096 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 09:21:35 -0400
Subject: [PATCH 15/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 35642bfa..029daa01 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -65,7 +65,7 @@ if __name__ == "__main__":
 		GPIO.output(txLed, txLedOn);
 		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		print("Picture taken")
-		os.system("sudo python3 -m pysstv --mode PD120 ~/camera_out.jpg sstv_camera.wav") #  > /dev/null 2>&1")
+		os.system("sudo python3 -m pysstv --mode PD120 ~/camera_out.jpg ~/sstv_camera.wav") #  > /dev/null 2>&1")
 		print ("Sending picture")
 		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		

From 3cfd6f2d05be5755fae2b285f9f727c8f2f66ccc Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 09:50:28 -0400
Subject: [PATCH 16/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 029daa01..e6d538ad 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -60,7 +60,7 @@ if __name__ == "__main__":
             print("SSTV")
 	    GPIO.output(txLed, txLedOn);
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
-	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
+#	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
 		GPIO.output(txLed, txLedOn);
 		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")

From d47c82b0ca509b25385206e907c4111b91cc48b5 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 13:27:25 -0400
Subject: [PATCH 17/44] Update rpitx.py

---
 rpitx.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index e6d538ad..123fb599 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -63,11 +63,11 @@ if __name__ == "__main__":
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
 		GPIO.output(txLed, txLedOn);
-		os.system("raspistill -o ~/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+		os.system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		print("Picture taken")
-		os.system("sudo python3 -m pysstv --mode PD120 ~/camera_out.jpg ~/sstv_camera.wav") #  > /dev/null 2>&1")
+		os.system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
 		print ("Sending picture")
-		os.system("cat sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
+		os.system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:
 #			camera = PiCamera()

From 0cd59038cfaa2ed39084c61e255f25b357ea0e2c Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 13:34:47 -0400
Subject: [PATCH 18/44] Update rpitx.py

---
 rpitx.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 123fb599..23db145e 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -3,9 +3,10 @@
 import RPi.GPIO as GPIO
 import subprocess
 import time
-import os
+#import os
 import sys
 # from picamera import PiCamera
+from os import system
 
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
@@ -38,7 +39,7 @@ print(callsign)
 
 #GPIO.output(27, 1);
 GPIO.output(txLed, txLedOn);
-os.system("echo 'de " + callsign + "' > id.txt && gen_packets -M 20 id.txt -o morse.wav -r 48000 > /dev/null 2>&1 && cat morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
+system("echo 'de " + callsign + "' > id.txt && gen_packets -M 20 id.txt -o morse.wav -r 48000 > /dev/null 2>&1 && cat morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 #GPIO.output(27, 0);
 GPIO.output(txLed, txLedOff);
 
@@ -60,14 +61,15 @@ if __name__ == "__main__":
             print("SSTV")
 	    GPIO.output(txLed, txLedOn);
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
-#	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
+	    system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while True:
 		GPIO.output(txLed, txLedOn);
-		os.system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+		system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		print("Picture taken")
-		os.system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+		system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
 		print ("Sending picture")
-		os.system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
+		system("sudo killall -9 rpitx > /dev/null 2>&1")
+		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:
 #			camera = PiCamera()

From a459bfa8cdd97e8537e8db1d2f558853a8eed000 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 13:39:34 -0400
Subject: [PATCH 19/44] Update rpitx.py

---
 rpitx.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 23db145e..fe5ef966 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -62,13 +62,14 @@ if __name__ == "__main__":
 	    GPIO.output(txLed, txLedOn);
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
-	    while True:
-		GPIO.output(txLed, txLedOn);
+	    while 1:
+		GPIO.output(txLed, txLedOff);
 		system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
-		print("Picture taken")
+		print("Photo taken")
 		system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
-		print ("Sending picture")
+		print ("Sending SSTV photo")
 		system("sudo killall -9 rpitx > /dev/null 2>&1")
+		GPIO.output(txLed, txLedOn);		
 		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		
 #		try:
@@ -81,12 +82,12 @@ if __name__ == "__main__":
 #		finally:			
 
 	#	GPIO.output(27, 0);
-		print("Sleeping")
-		time.sleep(10)
-		print("Transmitting SSTV")
-		GPIO.output(txLed, txLedOff);
+#		print("Sleeping")
+#		time.sleep(10)
+#		print("Transmitting SSTV")
+#		GPIO.output(txLed, txLedOff);
 #		GPIO.output(27, 1);
-		time.sleep(10)
+#		time.sleep(10)
 
 #		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):

From 6319886344ed31ac3c56341aee2170577a49c4df Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 13:56:35 -0400
Subject: [PATCH 20/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index fe5ef966..e9288768 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -61,8 +61,8 @@ if __name__ == "__main__":
             print("SSTV")
 	    GPIO.output(txLed, txLedOn);
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
-	    system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 	    while 1:
+	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 		GPIO.output(txLed, txLedOff);
 		system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		print("Photo taken")

From 7af9e6520132329e30e42e8319ead4ba02196887 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 14:01:43 -0400
Subject: [PATCH 21/44] Update rpitx.py

---
 rpitx.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index e9288768..1a453ee1 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -59,15 +59,18 @@ if __name__ == "__main__":
     		time.sleep(5)
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
-	    GPIO.output(txLed, txLedOn);
+	    GPIO.output(txLed, txLedOn)
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    while 1:
 	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
-		GPIO.output(txLed, txLedOff);
+		GPIO.output(txLed, txLedOff)
 		system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
 		print("Photo taken")
+		GPIO.output(txLed, txLedOn)
 		system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+		GPIO.output(txLed, txLedOff)
 		print ("Sending SSTV photo")
+		time.sleep(1)
 		system("sudo killall -9 rpitx > /dev/null 2>&1")
 		GPIO.output(txLed, txLedOn);		
 		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")

From dcad81e7e0f7be706d533df29e0fb83fa06e3066 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 14:27:24 -0400
Subject: [PATCH 22/44] Update rpitx.py

---
 rpitx.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 1a453ee1..c6df0b35 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -59,7 +59,7 @@ if __name__ == "__main__":
     		time.sleep(5)
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
-	    GPIO.output(txLed, txLedOn)
+#	    GPIO.output(txLed, txLedOn)
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    while 1:
 	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
@@ -72,6 +72,7 @@ if __name__ == "__main__":
 		print ("Sending SSTV photo")
 		time.sleep(1)
 		system("sudo killall -9 rpitx > /dev/null 2>&1")
+		system("sudo killall -9 csdr > /dev/null 2>&1")
 		GPIO.output(txLed, txLedOn);		
 		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		

From bc026ab9664dbe562ebb560636328efb56767e53 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 14:54:58 -0400
Subject: [PATCH 23/44] Update rpitx.py

---
 rpitx.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpitx.py b/rpitx.py
index c6df0b35..49c24bc2 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -73,6 +73,7 @@ if __name__ == "__main__":
 		time.sleep(1)
 		system("sudo killall -9 rpitx > /dev/null 2>&1")
 		system("sudo killall -9 csdr > /dev/null 2>&1")
+		system("sudo killall -9 cat > /dev/null 2>&1")
 		GPIO.output(txLed, txLedOn);		
 		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 		

From 6d9f0c79cf60e8f72e3fae6f08b24fec6df7b2c4 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 15:28:16 -0400
Subject: [PATCH 24/44] trying camera test

---
 rpitx.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 49c24bc2..8672a210 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -4,8 +4,8 @@ import RPi.GPIO as GPIO
 import subprocess
 import time
 #import os
-import sys
-# from picamera import PiCamera
+import system
+from picamera import PiCamera
 from os import system
 
 GPIO.setmode(GPIO.BCM)
@@ -59,6 +59,13 @@ if __name__ == "__main__":
     		time.sleep(5)
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
+	    try: 
+	    	camera = PiCamera()
+		print("Camera present")
+	    except:
+		print("No camera")
+	    finally:
+		print("Continuing")
 #	    GPIO.output(txLed, txLedOn)
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    while 1:

From bbc726cb8cb52aa0870f84fba92dfef60a40348e Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 15:29:54 -0400
Subject: [PATCH 25/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 8672a210..fee5501a 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -4,7 +4,7 @@ import RPi.GPIO as GPIO
 import subprocess
 import time
 #import os
-import system
+import sys
 from picamera import PiCamera
 from os import system
 

From ba5e62dc96029f1e06d712d8900fefe09169777f Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 15:44:26 -0400
Subject: [PATCH 26/44] added camera conditional for sstv

---
 rpitx.py | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index fee5501a..70ba8a2f 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -8,6 +8,16 @@ import sys
 from picamera import PiCamera
 from os import system
 
+try: 
+	camera = PiCamera()
+	print("Camera present")
+	camera_present = 1
+except:
+	print("No camera")
+	camera_present = 0
+finally:
+	print("Continuing")
+
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
 GPIO.setup(22, GPIO.IN, pull_up_down=GPIO.PUD_UP)
@@ -71,19 +81,25 @@ if __name__ == "__main__":
 	    while 1:
 	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 		GPIO.output(txLed, txLedOff)
-		system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
-		print("Photo taken")
-		GPIO.output(txLed, txLedOn)
-		system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
-		GPIO.output(txLed, txLedOff)
-		print ("Sending SSTV photo")
-		time.sleep(1)
-		system("sudo killall -9 rpitx > /dev/null 2>&1")
-		system("sudo killall -9 csdr > /dev/null 2>&1")
-		system("sudo killall -9 cat > /dev/null 2>&1")
-		GPIO.output(txLed, txLedOn);		
-		system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
-		
+		if (camera_present == 1):
+			system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+			print("Photo taken")
+			GPIO.output(txLed, txLedOn)
+			system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+			GPIO.output(txLed, txLedOff)
+			print ("Sending SSTV photo")
+			time.sleep(1)
+			system("sudo killall -9 rpitx > /dev/null 2>&1")
+			system("sudo killall -9 csdr > /dev/null 2>&1")
+			system("sudo killall -9 cat > /dev/null 2>&1")
+			GPIO.output(txLed, txLedOn);		
+			system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
+		else:
+			while 1:
+				GPIO.output(txLed, txLedOn)
+				time.sleep(60)
+				GPIO.output(txLed, txLedOff)
+				time.sleep(1)
 #		try:
 #			camera = PiCamera()
 #			camera.resolution = (640, 496)

From 1f5a799194010754b1fe8feb969a383e3841c0cc Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 15:52:08 -0400
Subject: [PATCH 27/44] Update rpitx.py

---
 rpitx.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 70ba8a2f..9d27ef3b 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -8,16 +8,6 @@ import sys
 from picamera import PiCamera
 from os import system
 
-try: 
-	camera = PiCamera()
-	print("Camera present")
-	camera_present = 1
-except:
-	print("No camera")
-	camera_present = 0
-finally:
-	print("Continuing")
-
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
 GPIO.setup(22, GPIO.IN, pull_up_down=GPIO.PUD_UP)
@@ -40,6 +30,16 @@ print(txLedOn)
 print(txLed)
 GPIO.setup(27, GPIO.OUT)
 GPIO.output(27, 0)
+
+try: 
+	camera = PiCamera()
+	print("Camera present")
+	camera_present = 1
+except:
+	print("No camera")
+	camera_present = 0
+finally:
+	print("Continuing")
 	
 print(transmit)
 
@@ -69,13 +69,13 @@ if __name__ == "__main__":
     		time.sleep(5)
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
-	    try: 
-	    	camera = PiCamera()
-		print("Camera present")
-	    except:
-		print("No camera")
-	    finally:
-		print("Continuing")
+#	    try: 
+#	    	camera = PiCamera()
+#		print("Camera present")
+#	    except:
+#		print("No camera")
+#	    finally:
+#		print("Continuing")
 #	    GPIO.output(txLed, txLedOn)
 #	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	    while 1:

From 62cc17d55bd2ca93b092a96c3d1f3cef3a168d21 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 16:06:04 -0400
Subject: [PATCH 28/44] added camera close

---
 rpitx.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpitx.py b/rpitx.py
index 9d27ef3b..f49039b1 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -35,6 +35,7 @@ try:
 	camera = PiCamera()
 	print("Camera present")
 	camera_present = 1
+	camera.close()
 except:
 	print("No camera")
 	camera_present = 0

From 68869934733213cd974796ef0757d8739b5105e5 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 16:22:09 -0400
Subject: [PATCH 29/44] no finally

---
 rpitx.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index f49039b1..6ff032a7 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -31,17 +31,6 @@ print(txLed)
 GPIO.setup(27, GPIO.OUT)
 GPIO.output(27, 0)
 
-try: 
-	camera = PiCamera()
-	print("Camera present")
-	camera_present = 1
-	camera.close()
-except:
-	print("No camera")
-	camera_present = 0
-finally:
-	print("Continuing")
-	
 print(transmit)
 
 file = open("/home/pi/CubeSatSim/sim.cfg")
@@ -70,6 +59,18 @@ if __name__ == "__main__":
     		time.sleep(5)
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
+	    try: 
+		camera = PiCamera()
+		print("Camera present")
+		camera_present = 1
+		camera.close()
+	    except:
+		print("No camera")
+		camera_present = 0
+#	   finally:
+#		print("Continuing")
+		
+	
 #	    try: 
 #	    	camera = PiCamera()
 #		print("Camera present")

From 8ed01c55d58d454f37b42bb2cec025d66117f704 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 16:57:54 -0400
Subject: [PATCH 30/44] cleanup with working auto detect camera SSTV mode

---
 rpitx.py | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 6ff032a7..61b0f77d 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -67,20 +67,8 @@ if __name__ == "__main__":
 	    except:
 		print("No camera")
 		camera_present = 0
-#	   finally:
-#		print("Continuing")
-		
-	
-#	    try: 
-#	    	camera = PiCamera()
-#		print("Camera present")
-#	    except:
-#		print("No camera")
-#	    finally:
-#		print("Continuing")
-#	    GPIO.output(txLed, txLedOn)
-#	    os.system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
-	    while 1:
+
+		while 1:
 	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 		GPIO.output(txLed, txLedOff)
 		if (camera_present == 1):
@@ -102,33 +90,16 @@ if __name__ == "__main__":
 				time.sleep(60)
 				GPIO.output(txLed, txLedOff)
 				time.sleep(1)
-#		try:
-#			camera = PiCamera()
-#			camera.resolution = (640, 496)
-#			camera.start_preview()
-			# Camera warm-up time
-#			time.sleep(2)
-#			camera.capture('sstv_image.jpg')
-#		finally:			
-
-	#	GPIO.output(27, 0);
-#		print("Sleeping")
-#		time.sleep(10)
-#		print("Transmitting SSTV")
-#		GPIO.output(txLed, txLedOff);
-#		GPIO.output(27, 1);
-#		time.sleep(10)
 
-#		os.system("cat /home/pi/CubeSatSim/wav/sstv.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3")
 	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):
             print("BPSK")
-	    os.system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float")
+	    system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float")
 	else:
             print("FSK") 
-	    os.system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
+	    system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
     else:
         print("FSK") 
-	os.system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
+	system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
   else:
     print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
     while True:

From 03c3047080990183a52271ced05bac02c3f3418b Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 17:05:33 -0400
Subject: [PATCH 31/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 61b0f77d..eea82cd9 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -68,7 +68,7 @@ if __name__ == "__main__":
 		print("No camera")
 		camera_present = 0
 
-		while 1:
+	    while 1:
 	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 		GPIO.output(txLed, txLedOff)
 		if (camera_present == 1):

From 363f250e21bddcdb5c40fc4ffff77dc3d15a66b0 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 18:52:30 -0400
Subject: [PATCH 32/44] try moving picamera import

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index eea82cd9..30c9446c 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -5,7 +5,6 @@ import subprocess
 import time
 #import os
 import sys
-from picamera import PiCamera
 from os import system
 
 GPIO.setmode(GPIO.BCM)
@@ -60,6 +59,7 @@ if __name__ == "__main__":
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
 	    try: 
+		from picamera import PiCamera	
 		camera = PiCamera()
 		print("Camera present")
 		camera_present = 1

From 08f8ed4a89a19334d2bc30c16a168b065cae114a Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:04:01 -0400
Subject: [PATCH 33/44] added PySSTV import test

---
 rpitx.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 30c9446c..d81499db 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -59,7 +59,8 @@ if __name__ == "__main__":
         elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
             print("SSTV")
 	    try: 
-		from picamera import PiCamera	
+		from picamera import PiCamera
+		from pysstv.sstv import SSTV
 		camera = PiCamera()
 		print("Camera present")
 		camera_present = 1

From 89d58d1f17b060d0827d74ec079be72f90fa8550 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:20:29 -0400
Subject: [PATCH 34/44] fixed tabs

---
 rpitx.py | 112 +++++++++++++++++++++++++++----------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index d81499db..3ab03f1f 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -18,11 +18,11 @@ if GPIO.input(22) == False:
 	transmit = True
 	txLed = 27
 	txLedOn = 0
- 	txLedOff = 1
+	txLedOff = 1
 else:
 	txLed = 27
 	txLedOn = 1 
- 	txLedOff = 0
+	txLedOff = 0
 	
 GPIO.setup(txLed, GPIO.OUT)
 print(txLedOn)
@@ -46,62 +46,62 @@ time.sleep(2)
 
 if __name__ == "__main__":
 	
-  if (transmit):
+	if (transmit):
 	
-    print 'Length: ', len(sys.argv)
+		print 'Length: ', len(sys.argv)
     
-    if (len(sys.argv)) > 1:
-#        print("There are arguments!")
-        if (('a' == sys.argv[1]) or ('afsk' in sys.argv[1])):
-            print("AFSK") 
-	    while True:
-    		time.sleep(5)
-        elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
-            print("SSTV")
-	    try: 
-		from picamera import PiCamera
-		from pysstv.sstv import SSTV
-		camera = PiCamera()
-		print("Camera present")
-		camera_present = 1
-		camera.close()
-	    except:
-		print("No camera")
-		camera_present = 0
+		if (len(sys.argv)) > 1:
+#        		print("There are arguments!")
+			if (('a' == sys.argv[1]) or ('afsk' in sys.argv[1])):
+				print("AFSK") 
+				while True:
+					time.sleep(5)
+			elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
+				print("SSTV")
+				try: 
+					from picamera import PiCamera
+					from pysstv.sstv import SSTV
+					camera = PiCamera()
+					print("Camera present")
+					camera_present = 1
+					camera.close()
+				except:
+					print("No camera")
+					camera_present = 0
 
-	    while 1:
-	    	system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
-		GPIO.output(txLed, txLedOff)
-		if (camera_present == 1):
-			system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
-			print("Photo taken")
-			GPIO.output(txLed, txLedOn)
-			system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
-			GPIO.output(txLed, txLedOff)
-			print ("Sending SSTV photo")
-			time.sleep(1)
-			system("sudo killall -9 rpitx > /dev/null 2>&1")
-			system("sudo killall -9 csdr > /dev/null 2>&1")
-			system("sudo killall -9 cat > /dev/null 2>&1")
-			GPIO.output(txLed, txLedOn);		
-			system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
-		else:
-			while 1:
-				GPIO.output(txLed, txLedOn)
-				time.sleep(60)
-				GPIO.output(txLed, txLedOff)
-				time.sleep(1)
+				while 1:
+					system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
+					GPIO.output(txLed, txLedOff)
+					if (camera_present == 1):
+						system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+						print("Photo taken")
+						GPIO.output(txLed, txLedOn)
+						system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+						GPIO.output(txLed, txLedOff)
+						print ("Sending SSTV photo")
+						time.sleep(1)
+						system("sudo killall -9 rpitx > /dev/null 2>&1")
+						system("sudo killall -9 csdr > /dev/null 2>&1")
+						system("sudo killall -9 cat > /dev/null 2>&1")
+						GPIO.output(txLed, txLedOn);		
+						system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
+					else:
+						while 1:
+							GPIO.output(txLed, txLedOn)
+							time.sleep(60)
+							GPIO.output(txLed, txLedOff)
+							time.sleep(1)
 
-	elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):
-            print("BPSK")
-	    system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float")
+			elif (('b' == sys.argv[1]) or ('bpsk' in sys.argv[1])):
+				print("BPSK")
+				system("sudo nc -l 8080 | csdr convert_i16_f | csdr fir_interpolate_cc 2 | csdr dsb_fc | csdr bandpass_fir_fft_cc 0.002 0.06 0.01 | csdr fastagc_ff | sudo /home/pi/rpitx/sendiq -i /dev/stdin -s 96000 -f 434.9e6 -t float")
+			else:
+				print("FSK") 
+				system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
+		else:
+        		print("FSK") 
+			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
-            print("FSK") 
-	    system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
-    else:
-        print("FSK") 
-	system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
-  else:
-    print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
-    while True:
-      time.sleep(5)
+    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
+    		while True:
+			time.sleep(5)

From 8b6bd7bbc5a555e1ee56b3706fbb8d4ab70910f7 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:22:10 -0400
Subject: [PATCH 35/44] removed length print

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 3ab03f1f..97d41b5e 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
 	
 	if (transmit):
 	
-		print 'Length: ', len(sys.argv)
+#		print 'Length: ', len(sys.argv)
     
 		if (len(sys.argv)) > 1:
 #        		print("There are arguments!")

From 6b37a1bdc3bc4e691bcff53620c37164acb167b4 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:24:10 -0400
Subject: [PATCH 36/44] Update rpitx.py

---
 rpitx.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 97d41b5e..d7520168 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -99,9 +99,9 @@ if __name__ == "__main__":
 				print("FSK") 
 				system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 		else:
-        		print("FSK") 
+			print("FSK") 
 			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
-    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
+    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.") 
     		while True:
 			time.sleep(5)

From 492e9343cf19a1815d9789be0e9fbc46fb77505a Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:24:52 -0400
Subject: [PATCH 37/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index d7520168..528ca6e1 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -103,5 +103,5 @@ if __name__ == "__main__":
 			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
     		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.") 
-    		while True:
+    		while 1:
 			time.sleep(5)

From 2a1a5cfcc09deba6ddae7ee48b630c8fae2bd69c Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:25:43 -0400
Subject: [PATCH 38/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 528ca6e1..52be6541 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -103,5 +103,5 @@ if __name__ == "__main__":
 			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
     		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.") 
-    		while 1:
+		while 1:
 			time.sleep(5)

From 6cd52b5ac3ef392fcc0327580dbb9524d1316257 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:26:33 -0400
Subject: [PATCH 39/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 52be6541..e3730d11 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -102,6 +102,6 @@ if __name__ == "__main__":
 			print("FSK") 
 			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
-    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.") 
+    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
 		while 1:
 			time.sleep(5)

From f6f932251fa5191e66024d3f6791037f54ca00d0 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:27:23 -0400
Subject: [PATCH 40/44] Update rpitx.py

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index e3730d11..2a5f9a90 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -102,6 +102,6 @@ if __name__ == "__main__":
 			print("FSK") 
 			system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3")
 	else:
-    		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
+		print("No Band Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the BPF.")
 		while 1:
 			time.sleep(5)

From 0fd9db98120da6abc1d9f080312340ea36e4e9df Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Sat, 15 May 2021 21:37:29 -0400
Subject: [PATCH 41/44] changed from python to python3

---
 rpitx.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rpitx.sh b/rpitx.sh
index 409f9caf..afc736a2 100755
--- a/rpitx.sh
+++ b/rpitx.sh
@@ -8,18 +8,18 @@ if [ "$1" = "c" ]; then
     echo $y
           if [ $(($y % 4)) = 3 ]; then
    	   echo "Mode is continuous AFSK"
-    	   python -u /home/pi/CubeSatSim/rpitx.py a
+    	   python3 -u /home/pi/CubeSatSim/rpitx.py a
       elif [ $(($y % 4)) = 1 ]; then
    	   echo "Mode is continuous BPSK"  
-    	   python -u /home/pi/CubeSatSim/rpitx.py b
+    	   python3 -u /home/pi/CubeSatSim/rpitx.py b
       elif [ $(($y % 4)) = 2 ]; then
    	   echo "Mode is continuous SSTV"  
-    	   python -u /home/pi/CubeSatSim/rpitx.py s
+    	   python3 -u /home/pi/CubeSatSim/rpitx.py s
       else
          echo "Mode is continuous FSK"
-         python -u /home/pi/CubeSatSim/rpitx.py f
+         python3 -u /home/pi/CubeSatSim/rpitx.py f
       fi
 else
-    python -u /home/pi/CubeSatSim/rpitx.py $1
+    python3 -u /home/pi/CubeSatSim/rpitx.py $1
 fi
 

From bc57f1f03e224ca280e3629a983873c111a9b703 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Thu, 27 May 2021 12:54:17 -0400
Subject: [PATCH 42/44] changed to use PiSSTVpp for faster conversion

---
 rpitx.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rpitx.py b/rpitx.py
index 2a5f9a90..5fa9a149 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -70,13 +70,14 @@ if __name__ == "__main__":
 					camera_present = 0
 
 				while 1:
-					system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
+#					system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 					GPIO.output(txLed, txLedOff)
 					if (camera_present == 1):
-						system("raspistill -o /home/pi/camera_out.jpg -w 640 -h 496") #  > /dev/null 2>&1")
+						system("raspistill -o /home/pi/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
 						print("Photo taken")
 						GPIO.output(txLed, txLedOn)
-						system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+#						system("sudo python3 -m pysstv --mode PD120 /home/pi/camera_out.jpg /home/pi/sstv_camera.wav") #  > /dev/null 2>&1")
+						system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/camera_out.jpg") #  > /dev/null 2>&1")
 						GPIO.output(txLed, txLedOff)
 						print ("Sending SSTV photo")
 						time.sleep(1)
@@ -84,8 +85,9 @@ if __name__ == "__main__":
 						system("sudo killall -9 csdr > /dev/null 2>&1")
 						system("sudo killall -9 cat > /dev/null 2>&1")
 						GPIO.output(txLed, txLedOn);		
-						system("cat /home/pi/sstv_camera.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
+						system("cat /home/pi/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3") #  > /dev/null 2>&1")
 					else:
+						system("(while true; do (sleep 5 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f 434.9e3 &")
 						while 1:
 							GPIO.output(txLed, txLedOn)
 							time.sleep(60)

From 22d03f1334451c0cfe64fb3bd34738e1dc8d4fd8 Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Thu, 27 May 2021 13:47:07 -0400
Subject: [PATCH 43/44] removed pysstv test

---
 rpitx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 5fa9a149..3b3fe8b2 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -60,7 +60,7 @@ if __name__ == "__main__":
 				print("SSTV")
 				try: 
 					from picamera import PiCamera
-					from pysstv.sstv import SSTV
+#					from pysstv.sstv import SSTV
 					camera = PiCamera()
 					print("Camera present")
 					camera_present = 1

From a97e0e3d98d5626190645739d5275cc141ae818d Mon Sep 17 00:00:00 2001
From: alanbjohnston <alan.b.johnston@gmail.com>
Date: Wed, 2 Jun 2021 17:21:22 -0400
Subject: [PATCH 44/44] put APRS changes from dev into this branch for merge

---
 rpitx.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rpitx.py b/rpitx.py
index 3b3fe8b2..7bfc90d9 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -55,7 +55,13 @@ if __name__ == "__main__":
 			if (('a' == sys.argv[1]) or ('afsk' in sys.argv[1])):
 				print("AFSK") 
 				while True:
-					time.sleep(5)
+					try:
+						f = open("ready")
+						os.system("gen_packets -o telem.wav t.txt -r 48000 > /dev/null 2>&1 && cat telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f 434.9e3 > /dev/null 2>&1")
+						os.system("rm ready")
+						time.sleep(0.5)
+					except:		  
+						time.sleep(0.5)
 			elif (('s' == sys.argv[1]) or ('sstv' in sys.argv[1])):
 				print("SSTV")
 				try: