Merge pull request #280 from alanbjohnston/beta-v1.3.1-delay

Beta v1.3.1 delay

README.md

@@ -36,7 +36,7 @@ To get the software follow these steps:
 
 `cd CubeSatSim`
 
-`git checkout beta-v1.3.2`
+`git checkout beta-v1.3.1`
 
 You are now ready to install the software using this script in the CubeSatSim directory:
 

main.c

@@ -50,7 +50,8 @@ int main(int argc, char * argv[]) {
   program_radio();
 	
 //  FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r");
-  //pclose(rpitx_stop);
+  FILE * rpitx_stop = popen("sudo systemctl restart rpitx", "r");
+  pclose(rpitx_stop);
 	
 //  FILE * file_deletes = popen("sudo rm /home/pi/CubeSatSim/ready /home/pi/CubeSatSim/cwready > /dev/null", "r");
 //  pclose(file_deletes);	
@@ -70,8 +71,8 @@ int main(int argc, char * argv[]) {
   Serial.println("HAB mode enabled - balloon icon and BAT only telem and no low voltage shutdown");
 #endif
 	
-  FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r");
+//  FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r");
-  pclose(rpitx_restart);
+//  pclose(rpitx_restart);
 	
   mode = FSK;
   frameCnt = 1;

rpitx.py

@@ -258,11 +258,12 @@ if __name__ == "__main__":
 	GPIO.setmode(GPIO.BCM)  # added to make Tx LED work on Pi 4
 	GPIO.setup(txLed, GPIO.OUT)
 	
-	sleep(1)
+	sleep(10)  # delay so cubesatsim code catches up
 	
 	system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1")	
 	
-	if (mode != 'a') and (command_tx == True):	
+#	if (mode != 'a') and (command_tx == True):	
+	if (command_tx == True):	
 		output(pd, 1)
 		output (ptt, 0)
 		output(txLed, txLedOn)