Update rpitx.py FSK and BPSK use tx, force txc off

rpitx.py

@@ -187,7 +187,6 @@ txc = False
 if GPIO.input(7) == False:
 	print("TXC is present")
 	txc = True;
-	txc = False; 
 else:
 	print("TXC not present")
 output(txLed, txLedOn)
@@ -754,7 +753,7 @@ if __name__ == "__main__":
 					if (command_tx == True):
 						print("Turning on transmit")
 						system("echo > 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 &")
 					else:
 						print("Turning off transmit") # and rebooting")
 						system("echo > command_tx False")
@@ -770,7 +769,7 @@ if __name__ == "__main__":
 			output(pd, 1)
 			output(ptt, 1)
 			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 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 " + tx + "e3 &")
 			print("Turning LED on/off and listening for carrier")
 			while 1:
 				output(txLed, txLedOff)
@@ -802,7 +801,7 @@ if __name__ == "__main__":
 					if (command_tx == True):
 						print("Turning on transmit")
 						system("echo > 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 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 " + tx + "e3 &")
 					else:
 						print("Turning of transmit and rebooting")
 						system("echo > command_tx False")