diff --git a/rpitx.py b/rpitx.py
index 8c079e7a..8b137891 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -1,832 +1 @@
-#!/usr/bin/env python
 
-import RPi.GPIO as GPIO
-from RPi.GPIO import output
-#import subprocess
-#import time
-from time import sleep
-#import os
-import sys
-from os import system
-from PIL import Image, ImageDraw, ImageFont, ImageColor
-import serial	
-
-def battery_saver_check():
-	try:
-		global txc
-		f = open("/home/pi/CubeSatSim/battery_saver", "r")
-		f.close()
-		txc = False
-		print("Safe Mode!")
-		print("battery saver activated")
-	except:
-		print("battery saver not activated")
-#		txc = True
-		
-def increment_mode():
-	print("increment mode")
-	powerPin = 16
-	try:
-		file = open("/home/pi/CubeSatSim/.mode")
-		mode = file.read(1)
-	except:
-#		mode = "f"
-		if (debug_mode == 1):
-			print("Can't open .mode file") # , defaulting to FSK")
-	file.close()
-	print("Mode is: ")
-	print(mode)
-	if (mode == 'a'):
-		mode = 'f'
-		GPIO.output(powerPin, 0) # blink two times
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(2.5)
-
-	elif (mode == 'f'):
-		mode = 'b'
-		GPIO.output(powerPin, 0) # blink three times
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)	
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(2.5)
-	
-	elif (mode == 'b'):
-		mode = 's'
-		GPIO.output(powerPin, 0) # blink four times
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)	
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)	
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(2.5)
-
-	elif (mode == 's'):
-		mode = 'm'
-		GPIO.output(powerPin, 0) # blink five times
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)	
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1);
-		GPIO.output(powerPin, 1)	
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(0.1)
-		GPIO.output(powerPin, 0)
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(2.5)
-	else:
-		mode = 'a'
-		GPIO.output(powerPin, 0) # blink one time
-		sleep(0.1)
-		GPIO.output(powerPin, 1)
-		sleep(2.5)
-
-	try:	
-		file = open("/home/pi/CubeSatSim/.mode", "w")
-		count_string = str(command_count)
-		file.write(mode)
-		file.close()
-		print(".mode file written")
-		
-		GPIO.setwarnings(False)
-		GPIO.output(txLed, 0)
-		GPIO.output(powerPin, 0)
-		print("sudo reboot -h now")
-		GPIO.setwarnings(False)
-		GPIO.setup(powerPin, GPIO.OUT)
-		GPIO.output(powerPin, 0);
-#		system("reboot -h now")
-#		release = True;
-
-		print("Changing mode now")
-#		system("/home/pi/CubeSatSim/config -" + mode)
-		system("reboot -h now")
-
-		sleep(10);
-	except:
-		print("can't write to .mode file")
-		
-
-print("CubeSatSim v1.3.2 rpitx.py starting...")
-
-pd = 21
-ptt = 20
-txc_pin = 7
-squelch = 6
-green = 16
-powerPin = 16
-
-command_tx = True
-
-GPIO.setmode(GPIO.BCM)
-GPIO.setwarnings(False)
-GPIO.setup(13, GPIO.IN, pull_up_down=GPIO.PUD_UP)
-GPIO.setup(12, GPIO.IN, pull_up_down=GPIO.PUD_UP)
-GPIO.setup(27, GPIO.IN, pull_up_down=GPIO.PUD_UP)
-GPIO.setup(txc_pin, GPIO.IN, pull_up_down=GPIO.PUD_UP)
-GPIO.setup(green, GPIO.OUT)
-GPIO.output(powerPin, 1)
-
-transmit = False
-txLed = 27
-txLedOn = 1 
-txLedOff = 0
-if GPIO.input(12) == False:
-	print("Version is v1 with UHF LPF")
-	transmit = True
-else:
-	print("No LPF")
-
-
-# GPIO.setup(txLed, GPIO.OUT)
-# output(txLed, txLedOff)
-
-GPIO.setmode(GPIO.BCM) # Repeat to make LED work on Pi 4
-GPIO.setwarnings(False)
-GPIO.setup(txLed, GPIO.OUT)
-
-GPIO.setup(pd, GPIO.OUT)
-#output(pd, 1)
-output(pd, 0)
-GPIO.setup(ptt, GPIO.OUT)
-output (ptt, 1)
-
-txc = False
-if GPIO.input(txc_pin) == False:
-	print("TXC is present")
-	txc = True;
-else:
-	print("TXC not present")
-
-# txc = False  # forcing it off
-output(txLed, txLedOn)
-sleep(1)
-output(txLed, txLedOff)
-
-battery_saver_check()	
-
-# print(txLedOn)
-print(txLed)
-# GPIO.setup(27, GPIO.OUT)
-# GPIO.output(27, 0)
-
-debug_mode = 0  #no debugging rpitx
-
-skip = False
-
-if __name__ == "__main__":
-	mode = "y"
-	if (len(sys.argv)) > 1:
-#        	print("There are arguments!")
-		if (('d' == sys.argv[1]) or ('-d' in sys.argv[1])):
-			debug_mode = 1
-		elif (('x' == sys.argv[1]) or ('-x' in sys.argv[1])):	
-			mode = "x"
-			print("Forcing APRS mode")
-		elif (('s' == sys.argv[1]) or ('-s' in sys.argv[1])):
-			skip = True
-			print("Skipping delay and CW ID")
-			
-	print(transmit)
-
-
-	try:
-		system("cat /proc/uptime > /home/pi/CubeSatSim/uptime")
-		file = open("/home/pi/CubeSatSim/uptime")
-		up = file.read().split(" ")[0]
-		print(up)
-		uptime = float(up)
-		print(uptime)
-		if (uptime < 45):
-			print("Uptime < 45 seconds")
-		else:
-			print("Uptime > 45 seconds")
-			skip = True
-		file.close() 
-	except:
-		print("Can't open /proc/uptime") 
-
-	if ( mode == "y"):
-		try:
-			file = open("/home/pi/CubeSatSim/.mode")
-			mode = file.read(1)
-		except:
-			mode = "f"
-			if (debug_mode == 1):
-				print("Can't open .mode file, defaulting to FSK")
-	print("Mode is: ")
-	print(mode)
-
-	try:
-		file = open("/home/pi/CubeSatSim/beacon_off")
-		file.close()
-		command_tx = False
-	except:
-		command_tx = True
-		if (debug_mode == 1):
-			print("Can't open beacon_off file, defaulting to False")
-	print("Command_tx: ")
-	print(command_tx)
-	
-	try:
-		file = open("/home/pi/CubeSatSim/command_count.txt", "r")
-		string = file.read()
-		command_count = int(string)
-	except:
-		command_count = 0
-		if (debug_mode == 1):
-			print("Can't open command_count file, setting to 0")
-		file = open("/home/pi/CubeSatSim/command_count.txt", "w")
-		count_string = str(command_count)
-		file.write(count_string)
-		file.close()
-	print("Command_count: ")
-	print(command_count)	
-
-	tx_value = '0'
-	rx_value = '0'
-	sq = '0'
-	tx = '434.9000'	
-	rx = '435.0000'	
-	
-	try:
-		file = open("/home/pi/CubeSatSim/sim.cfg")
-#		callsign = file.readline().split(" ")[0]
-		config = file.readline().split()		
-		callsign = config[0]
-		if len(config) > 5:
-			sq = config[5]
-			print(sq)
-		if len(config) > 6:
-                        txf = float(config[6])
-#                        print(txf)
-#                        print( "{:.4f}".format(txf))
-                        tx = "{:.4f}".format(txf)
-                        print(tx)
-		if len(config) > 7:
-                        rxf = float(config[7])
-#                        print(rxf)
-#                        print( "{:.4f}".format(rxf))
-                        rx = "{:.4f}".format(rxf)
-                        print(rx)
-		if len(config) > 9:
-                        rxpl = float(config[9])
- #                       print(rxpl)
- #                       print( "{:.0f}".format(rxpl))
-                        rxpl_value = "{:.0f}".format(rxpl)
-                        print(rxpl_value)
-		if len(config) > 10:
-                        txpl = float(config[10])
-#                        print(txpl)
-#                        print( "{:.0f}".format(txpl))
-                        txpl_value = "{:.0f}".format(txpl)
-                        print(txpl_value)			
-		print(config)
-		print
-#		print(callsign)
-		print(sq)
-		if sq == '8':
-			print("squelch set to 8, no command input!")
-			no_command = True
-		else:
-			no_command = False		
-		print(no_command)
-	except:
-		callsign = "AMSAT"
-		if (debug_mode == 1):
-			print("Can't read callsign from sim.cfg file, defaulting to AMSAT")	
-	file.close()
-
-	try:
-		f = open("/home/pi/CubeSatSim/command_control", "r")
-		f.close()
-		GPIO.setmode(GPIO.BCM)
-		GPIO.setwarnings(False)
-		GPIO.setup(squelch, GPIO.IN, pull_up_down=GPIO.PUD_UP)  ## pull up in case pin is not connected
-		if GPIO.input(squelch) == False:
-			print("squelch not set correctly, no command input!")
-			no_command = True
-		else:
-			print("command and control is activated")
-			no_command = False
-#			system("/home/pi/CubeSatSim/command &")
-			system("sudo systemctl start command")
-	except:
-		print("command and control not activated")
-		no_command = True
-	
-	print(callsign)
-	GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
-	print(txLed)
-	print(txLedOn)
-	GPIO.setup(txLed, GPIO.OUT)
-
-	print("Programming FM module!\n");	
-	output(pd, 1)
-	output (ptt, 1)
-	try:
-		ser = serial.Serial("/dev/ttyAMA0", 9600)
-		print(ser.portstr)
-#		uhf_string = "AT+DMOSETGROUP=0," + rx +"," + tx + ",0,3,0,0\r\n"
-		uhf_string = "AT+DMOSETGROUP=0," + rx + "," + tx + "," + rxpl_value + "," + sq + "," + txpl_value + ",0\r\n"
-		print(uhf_string)
-		for i in range(6):
-#			ser.write(b"AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r\n")
-			ser.write(uhf_string.encode())
-			sleep(0.1)
-		ser.close()
-		ser = serial.Serial("/dev/ttyAMA0", 115200) # reset back to 115200 for cubesatsim code for payload sensor data
-	except:
-		print("Error in serial write")
-	output(pd, 0)
-
-#	if (mode != 'x') and (skip == False):
-#		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")
-	
-#	command_control_check()
-	
-#	if (mode != ) and (command_tx == True):	
-#	if (command_tx == True):	
-	if ((mode == 'a') or (mode == 'b') or (mode == 'f') or (mode == 's')) and (command_tx == True) and (skip == False):	
-#		battery_saver_mode
-		GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-		GPIO.setup(txLed, GPIO.OUT)	
-		output(txLed, txLedOn)			
-#		if (txc):
-#			output(pd, 1)
-#			output (ptt, 0)
-#			sleep(0.1)
-#			system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/morse.wav")
-#			sleep(0.1)
-#			output (ptt, 1)
-#			output(pd, 0)
-#		else:	
-		if (True):
-			if (debug_mode == 1):
-#				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 && cat /home/pi/CubeSatSim/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 '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 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3")
-			else:
-#				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 && cat /home/pi/CubeSatSim/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 > /dev/null 2>&1")
-				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 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-		
-		output(txLed, txLedOff)
-
-		sleep(1)
-	else:
-		print("Don't transmit CW ID since command_tx is False or APRS mode")
-
-	if (transmit):
-	
-#		print 'Length: ', len(sys.argv)
-    
-#		if (len(sys.argv)) > 1:
-#        		print("There are arguments!")
-		if (mode == 'a') or (mode == 'x') or (mode == 'n'):
-#			command_control_check()	
-			output(pd, 1)
-			output(ptt, 1)
-			if (mode == 'a'):
-				print("AFSK")
-			else:
-				GPIO.output(powerPin, 0)
-				print("Transmit APRS Commands")
-#			while True:
-#				sleep(0.1)
-			if (mode != 'n'):
-				system("touch /home/pi/CubeSatSim/ready")
-
-			while True:
-				try:
-					f = open("/home/pi/CubeSatSim/ready")
-					f.close()
-					if (debug_mode == 1):
-						print("Packet ready!")
-					system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1")
-					system("cat /home/pi/CubeSatSim/t.txt")
-					if (command_tx == True):
-						GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-						GPIO.setup(txLed, GPIO.OUT)	
-						output(txLed, txLedOn)
-#						output(pd, 1)
-#						output (ptt, 0)
-#						sleep(.1)
-#						
-#						battery_saver_check()
-						if (txc):
-#							output(pd, 1)
-							sleep(0.1) # add delay before transmit
-							output (ptt, 0)
-							sleep(0.3)   # add even more time at start
-							system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/telem.wav")							
-							sleep(0.2)  # add more time at end
-							output (ptt, 1)
-#							output(pd, 0)							
-						else:
-							system("echo 'AMSAT-11>APCSS:010101/hi hi ' >> t.txt")
-							if (debug_mode == 1):
-								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3")
-							else:
-								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-					
-						sleep(0.1)  
-#						output (ptt, 1)
-#						output(pd, 0)
-						output(txLed, txLedOff)
-						system("sudo rm /home/pi/CubeSatSim/ready")
-					f.close()
-				
-					if (debug_mode == 1):
-						print("Ready for next packet!")
-						
-					sleep(0.5)
-				except:
-#					command_control_check()
-					sleep(1)
-		elif (mode == 'm'):
-			system("touch /home/pi/CubeSatSim/cwready")
-			print("CW")
-			while True:
-#				command_control_check()
-				output (pd, 1)
-				output (ptt, 1)				
-				try:
-					f = open("/home/pi/CubeSatSim/cwready")
-					f.close()
-					system("sudo rm /home/pi/CubeSatSim/cwready")
-##					ch = 1
-					for chan in range(7):
-						command = "gen_packets -M 20 -o /home/pi/CubeSatSim/morse.wav /home/pi/CubeSatSim/cw" + str(chan) + ".txt -r 48000 > /dev/null 2>&1"
-						print(command)
-						system(command)
-##						chan = chan + 1						
-						if (command_tx == True):
-							GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-							GPIO.setup(txLed, GPIO.OUT)	
-							output(txLed, txLedOn)					
-	
-							if (txc):
-#								output (pd, 1)
-								sleep(0.3)
-								output (ptt, 0)	
-								system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/morse.wav")
-								sleep(0.1)
-								output (ptt, 1)
-#								output (pd, 0)
-							else:
-								if (debug_mode == 1):
-									system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3")
-								else:
-									system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo /home/pi/rpitx/rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")					
-							output(txLed, txLedOff)
-							
-#						command_control_check()
-						sleep(2)
-					f.close()
-					sleep(10)
-				except:	
-#					command_control_check()
-					sleep(1)
-		elif (mode == 's'):
-			print("SSTV")
-#			command_control_check()	
-			output (ptt, 1)
-			output(pd, 1)			
-			try: 
-#				from picamera import PiCamera
-#					from pysstv.sstv import SSTV
-#				camera = PiCamera()
-				print("Testing for camera")
-				system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256")
-				f = open("/home/pi/CubeSatSim/camera_out.jpg")
-				f.close()
-				print("Camera present")
-				camera_present = 1
-#				camera.close()
-			except:
-				print("No camera available")
-				print(" -> if camera plugged in, is software enabled?")
-				camera_present = 0
-
-#				while 1:
-			output(txLed, txLedOff)
-#			output (ptt, 1)
-#			output(pd, 0)
-			if (camera_present == 1):
-				try:
-					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") 
-#					command_control_check()	
-					
-					if (command_tx == True):
-						print ("Sending SSTV image")
-						GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-						GPIO.setup(txLed, GPIO.OUT)	
-						output(txLed, txLedOn)
-#						battery_saver_check()
-
-						if (txc):
-#							output(pd, 1)
-							output (ptt, 0)
-							system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav")
-							output (ptt, 1)
-#							output(pd, 0)
-						else:	
-							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3")
-							else:
-								system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-
-						output(txLed, txLedOff)
-
-	#					sleep(1)
-				except:
-					print("image 2 did not load - copy from CubeSatSim/sstv directory")
-				while 1:
-#					command_control_check()			
-					
-					system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") #  > /dev/null 2>&1")
-					print("Photo taken")
-
-					file='/home/pi/CubeSatSim/camera_out.jpg'
-					font1 = ImageFont.truetype('DejaVuSerif.ttf', 20)
-					font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16)
-
-					try:
-						filep = open("/home/pi/CubeSatSim/telem_string.txt")
-						telem_string = filep.readline()
-					except:
-						telem_string = ""
-						if (debug_mode == 1):
-							print("Can't read telem_string.txt")		
-					print(telem_string)
-					
-					img = Image.open(file)
-					draw = ImageDraw.Draw(img) 
-#					draw.text((10, 10), callsign, font=font2, fill='white')
-#					draw.text((120, 10), telem_string, font=font2, fill='white')					
-					draw.text((12, 12), callsign, font=font1, fill='black')
-					draw.text((10, 10), callsign, font=font1, fill='white')
-					draw.text((122, 12), telem_string, font=font2, fill='black')
-					draw.text((120, 10), telem_string, font=font2, fill='white')
-					img.save(file)
-					
-#					command_control_check()			
-					
-					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") 
-
-#					command_control_check()			
-
-					if (command_tx == True):
-						print ("Sending SSTV image")
-						GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-						GPIO.setup(txLed, GPIO.OUT)	
-						output(txLed, txLedOn)
-#						battery_saver_check()
-
-						if (txc):
-#							output(pd, 1)
-							output (ptt, 0)
-							system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/camera_out.jpg.wav")	
-							output(ptt, 1)
-#							output (pd, 0)
-						else:	
-							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3")
-							else:
-								system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-
-						output(txLed, txLedOff)
-#						output (ptt, 1)
-					
-#					output(pd, 0)
-					system("sudo rm /home/pi/CubeSatSim/camera_out.jpg.wav > /dev/null 2>&1") 
-					sleep(10)
-			else:
-				try:
-	#				command_control_check()			
-					
-					file = open("/home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg")
-					print("First SSTV stored image detected")
-					system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg") 
-
-#					command_control_check()			
-					
-					if (command_tx == True):
-
-						print ("Sending SSTV image")
-						GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-						GPIO.setup(txLed, GPIO.OUT)	
-						output(txLed, txLedOn)
-
-#						battery_saver_check()
-
-						if (txc):
-#							output(pd, 1)
-							output (ptt, 0)
-							system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav")
-							output(ptt, 1)
-#							output (pd, 0)
-						else:	
-							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3")
-							else:
-								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-
-						output(txLed, txLedOff)
-#						output (ptt, 1)
-#						output(pd, 0)
-					sleep(1)
-				except:
-					print("image 1 did not load - copy from CubeSatSim/sstv directory")
-				try:
-#					command_control_check()			
-					
-					file = open("/home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg")
-					print("Second SSTV stored image detected")
-					system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg")
-
-					while 1:
-
-#						command_control_check()		
-	
-						if (command_tx == True):
-							print ("Sending SSTV image")
-							GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-							GPIO.setup(txLed, GPIO.OUT)	
-							output(txLed, txLedOn)
-#							battery_saver_check()
-
-							if (txc):
-#								output(pd, 1)
-								output (ptt, 0)
-								system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav")
-								output(ptt, 1)
-#								output (pd, 0)
-							else:
-								if (debug_mode == 1):
-									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3") 
-								else:
-									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-
-							output(txLed, txLedOff)
-#							output (ptt, 1)
-#							output(pd, 0)
-						sleep(10)
-				except:	
-					print("image 2 did not load - copy from CubeSatSim/sstv directory")
-					if (txc == False):
-						if (command_tx == True):
-							system("(while true; do (sleep 10 && 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 " + tx + "e3 &")
-					while 1:
-						if (command_tx == True):
-#							command_control_check()	
-							
-							GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-							GPIO.setup(txLed, GPIO.OUT)	
-							output(txLed, txLedOn)
-
-#							battery_saver_check()
-						
-							if (txc):
-#								output(pd, 1)
-								output (ptt, 0)		
-								system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv.wav")
-								output(ptt, 1)
-#								output (pd, 0)		
-							else:
-								sleep(60)
-							
-							output(txLed, txLedOff)
-#							output (ptt, 1)
-#							output(pd, 0)
-						sleep(10)
-						
-		elif (mode == 'b'):
-#			command_control_check()	
-			print("BPSK")
-			print("turn on FM rx")
-			output(pd, 1)
-			output(ptt, 1)
-
-			GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
-			GPIO.setup(txLed, GPIO.OUT)
-			
-			if (command_tx == True):
-#				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 " + tx + "e6 -t float &")
-			print("Turning LED on/off and listening for carrier")
-			while 1:
-				output(txLed, txLedOff)
-				sleep(0.4)
-#				if (command_tx == False):
-#					output(txLed, txLedOn)
-#					sleep(0.03)
-#					output(txLed, txLedOff)
-#				command_control_check()
-				
-				if (command_tx == True):		
-					GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-					GPIO.setup(txLed, GPIO.OUT)
-					output(txLed, txLedOn)
-#					print(txLed)
-#					print(txLedOn)
-				sleep(4.2)
-		elif (mode == 'e'):  # code based on https://zr6aic.blogspot.com/2016/11/creating-2m-fm-repeater-with-raspberry.html
-			print("Repeater")
-			print("Stopping command and control")
-			system("sudo systemctl stop command")
-			print("turn on FM rx")
-			output(pd, 1)
-			output(ptt, 1)
-			GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
-			GPIO.setup(txLed, GPIO.OUT)
-			GPIO.setup(powerPin, GPIO.OUT)
-			GPIO.setup(squelch, GPIO.IN, pull_up_down=GPIO.PUD_UP)  ## pull up in case pin is not connected	
-			GPIO.output(powerPin, 0)
-			while True:
-				sleep(0.5)
-				if (GPIO.input(squelch) == False):
-					print("Carrier detected, starting repeater")
-					GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-					GPIO.setup(txLed, GPIO.OUT)						
-					output(txLed, txLedOn)
-#					system("arecord -D hw:CARD=Device,DEV=0  | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
-##					system("arecord -D hw:CARD=Device,DEV=0 -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 " + tx + "e3 &")
-					system("sudo nc -l 8011 | csdr convert_i16_f | csdr gain_ff 16000 | csdr convert_f_samplerf 20833 | sudo rpitx -i- -m RF -f " + tx + "e3 &")
-					sleep(1)
-					system("sudo arecord -D plughw:1 -r48000 -fS16_LE -c1 | nc localhost 8011 &")
-					GPIO.output(powerPin, 1)
-					sleep(0.5)
-					GPIO.output(powerPin, 0)
-					while (GPIO.input(squelch) == False):
-						sleep(1)
-					print("No carrier detected, stopping repeater")
-					output(txLed, txLedOff)
-					system("sudo killall -9 arecord")
-					system("sudo killall -9 nc")
-					system("sudo killall -9 rpitx")
-		
-		else:
-			print("FSK") 
-			print("turn on FM rx")
-			output(pd, 1)
-			output(ptt, 1)
-			
-			GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
-			GPIO.setup(txLed, GPIO.OUT)
-			
-			if (command_tx == True):
-				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 " + tx + "e3 &")
-			print("Turning LED on/off and listening for carrier")
-			while 1:
-				output(txLed, txLedOff)
-				sleep(0.4)
-#				if (command_tx == False):
-#					output(txLed, txLedOn)
-#					sleep(0.03)
-#					output(txLed, txLedOff)
-#				command_control_check()
-				if (command_tx == True):		
-					GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi Zero 2 and Pi 4		
-					GPIO.setup(txLed, GPIO.OUT)					
-					output(txLed, txLedOn)
-#					print(txLed)
-#					print(txLedOn)					
-				sleep(4.2)
-	else:
-		print("No Low Pass Filter so no telemetry transmit.  See http://cubesatsim.org/wiki for instructions on how to build the LPF.")
-		while 1:
-			sleep(5)