From 1f9eb793c36ee9bc7b3f2b949ada49c3ca4dc57b Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 17:08:48 -0400 Subject: [PATCH 01/25] Update payload_pico.ino try higher frequency --- stempayload/payload_pico/payload_pico.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stempayload/payload_pico/payload_pico.ino b/stempayload/payload_pico/payload_pico.ino index 0acaec09..7acdf9e9 100644 --- a/stempayload/payload_pico/payload_pico.ino +++ b/stempayload/payload_pico/payload_pico.ino @@ -185,7 +185,7 @@ void program_radio() { mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS #else - mySerial.println("AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r"); // squelch set to 3 + mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif sleep(0.5); mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 From e6f8849b516f9a883d18954a921d863596cb3cd0 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 20:39:55 -0400 Subject: [PATCH 02/25] Update payload_pico.ino don't program radio via Serial --- stempayload/payload_pico/payload_pico.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stempayload/payload_pico/payload_pico.ino b/stempayload/payload_pico/payload_pico.ino index 7acdf9e9..bbebb246 100644 --- a/stempayload/payload_pico/payload_pico.ino +++ b/stempayload/payload_pico/payload_pico.ino @@ -132,7 +132,7 @@ void setup() { Serial.print("Pi Zero present, so running Payload OK code."); sr_frs_present = true; - program_radio(); +// program_radio(); start_payload(); pinMode(15, INPUT_PULLUP); From c35db174060760911db0c2a89df53fd519d7b456 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:27:07 -0400 Subject: [PATCH 03/25] Update rpitx.py --- rpitx.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpitx.py b/rpitx.py index 467d047f..7aebaafe 100644 --- a/rpitx.py +++ b/rpitx.py @@ -473,30 +473,30 @@ if __name__ == "__main__": 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") + file = open("/home/pi/CubeSatSim/sstv__2_320_x_256.jpg") + print("First SSTV stored detected") + system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/sstv__2_320_x_256.jpg") if (command_tx == True): - print ("Sending SSTV image") + print ("Sending SSTV ") output(txLed, txLedOn) output(pd, 1) output (ptt, 0) if (txc): - system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav") + system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv__2_320_x_256.jpg.wav") 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 434.9e3") + system("cat /home/pi/CubeSatSim/sstv__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 434.9e3") 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 434.9e3 > /dev/null 2>&1") + system("cat /home/pi/CubeSatSim/sstv__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 434.9e3 > /dev/null 2>&1") output(txLed, txLedOff) output (ptt, 1) output(pd, 0) # sleep(1) except: - print("image 2 did not load - copy from CubeSatSim/sstv directory") + print(" 2 did not load - copy from CubeSatSim/sstv directory") while 1: system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") # > /dev/null 2>&1") print("Photo taken") From dfbd41dc7484922ec2b7ed5c790c87c39ecf9e0e Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:29:03 -0400 Subject: [PATCH 04/25] Update rpitx.py revert last --- rpitx.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpitx.py b/rpitx.py index 7aebaafe..467d047f 100644 --- a/rpitx.py +++ b/rpitx.py @@ -473,30 +473,30 @@ if __name__ == "__main__": output(pd, 0) if (camera_present == 1): try: - file = open("/home/pi/CubeSatSim/sstv__2_320_x_256.jpg") - print("First SSTV stored detected") - system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/sstv__2_320_x_256.jpg") + 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") if (command_tx == True): - print ("Sending SSTV ") + print ("Sending SSTV image") output(txLed, txLedOn) output(pd, 1) output (ptt, 0) if (txc): - system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv__2_320_x_256.jpg.wav") + system("aplay -D hw:CARD=Headphones,DEV=0 /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav") else: if (debug_mode == 1): - system("cat /home/pi/CubeSatSim/sstv__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 434.9e3") + 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 434.9e3") else: - system("cat /home/pi/CubeSatSim/sstv__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 434.9e3 > /dev/null 2>&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 434.9e3 > /dev/null 2>&1") output(txLed, txLedOff) output (ptt, 1) output(pd, 0) # sleep(1) except: - print(" 2 did not load - copy from CubeSatSim/sstv directory") + print("image 2 did not load - copy from CubeSatSim/sstv directory") while 1: system("raspistill -o /home/pi/CubeSatSim/camera_out.jpg -w 320 -h 256") # > /dev/null 2>&1") print("Photo taken") From 5fec9b959757fa033046c3e3f3858d0bf966c30b Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:41:12 -0400 Subject: [PATCH 05/25] Update main.c add program_radio --- main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/main.c b/main.c index 9c82ddc9..22da53ba 100644 --- a/main.c +++ b/main.c @@ -2177,3 +2177,43 @@ int get_payload_serial(int debug_camera) { fflush(stdout); return(finished); } + +void program_radio() { +// if (sr_frs_present) { + printf("Programming FM module!\n"); + + pinMode(28, OUTPUT); + pinMode(29, OUTPUT); + digitalWrite(29, HIGH); // enable SR_FRS + digitalWrite(28, HIGH); // stop transmit + +if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 + + for (int i = 0; i < 5; i++) { + sleep(0.5); // delay(500); +#ifdef APRS_VHF + serialPutchar(uart_fd, 'AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r'); +// mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS +// mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS +#else + serialPutchar(uart_fd, 'AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r'); +// mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 +#endif + sleep(0.5); + serialPutchar(uart_fd, 'AT+DMOSETMIC=8,0\r'); +// mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 + + } + } +#ifdef APRS_VHF + printf("Programming FM tx 144.39, rx on 144.39 MHz\n"); +#else + printf("Programming FM tx 434.9, rx on 435.0 MHz\n"); +#endif +// digitalWrite(PTT_PIN, LOW); // transmit carrier for 0.5 sec +// sleep(0.5); +// digitalWrite(PTT_PIN, HIGH); + digitalWrite(29, LOW); // disable SR_FRS + pinMode(28, INPUT); + pinMode(29, INPUT); +} From 00991b2dfd08251c439e2f3e8353c87f1e9b0182 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:42:51 -0400 Subject: [PATCH 06/25] Update main.h add program_radio() --- main.h | 1 + 1 file changed, 1 insertion(+) diff --git a/main.h b/main.h index e92e829b..6a9057dc 100644 --- a/main.h +++ b/main.h @@ -77,6 +77,7 @@ void update_rs(unsigned char parity[32], unsigned char c); void write_little_endian(unsigned int word, int num_bytes, FILE *wav_file); static int init_rf(); extern int Encode_8b10b[][256]; +void program_radio(); int socket_open = 0; int sock = 0; From fd8b0ad67eb438c7df4aa97e20dd35d7c1aeeb89 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:47:04 -0400 Subject: [PATCH 07/25] Update main.c changed to serialPrintf --- main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 22da53ba..cda5d07d 100644 --- a/main.c +++ b/main.c @@ -2192,15 +2192,15 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 for (int i = 0; i < 5; i++) { sleep(0.5); // delay(500); #ifdef APRS_VHF - serialPutchar(uart_fd, 'AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r'); + serialPrintf(uart_fd, 'AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r'); // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS #else - serialPutchar(uart_fd, 'AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r'); + serialPrintf(uart_fd, 'AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r'); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif sleep(0.5); - serialPutchar(uart_fd, 'AT+DMOSETMIC=8,0\r'); + serialPrintf(uart_fd, 'AT+DMOSETMIC=8,0\r'); // mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 } From e8c50e1afa0d6906f3e4a1239f7057743ea95d14 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:49:55 -0400 Subject: [PATCH 08/25] Update main.c changed to strings --- main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index cda5d07d..077289fb 100644 --- a/main.c +++ b/main.c @@ -2192,15 +2192,18 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 for (int i = 0; i < 5; i++) { sleep(0.5); // delay(500); #ifdef APRS_VHF - serialPrintf(uart_fd, 'AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r'); + char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"; + serialPrintf(uart_fd, vhf_string); // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS #else - serialPrintf(uart_fd, 'AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r'); + char uhf_string[] = "AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"; + serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif sleep(0.5); - serialPrintf(uart_fd, 'AT+DMOSETMIC=8,0\r'); + char mic_string[] = "AT+DMOSETMIC=8,0\r"; + serialPrintf(uart_fd, mic_string); // mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 } From 746f0987950d6bdf010084c426bea6a70f5b50cd Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:50:52 -0400 Subject: [PATCH 09/25] Update main.c add program_radio at start --- main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.c b/main.c index 077289fb..daa067af 100644 --- a/main.c +++ b/main.c @@ -44,6 +44,8 @@ int main(int argc, char * argv[]) { } printf("\n\nCubeSatSim v1.3b starting...\n\n"); + + program_radio(); FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); pclose(rpitx_stop); From 30332940bd5dd0c22e1aad016a88e38c73352bb0 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:51:53 -0400 Subject: [PATCH 10/25] Update main.c freq to standard 434.9 and 435 --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index daa067af..d598cf00 100644 --- a/main.c +++ b/main.c @@ -2199,7 +2199,7 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS #else - char uhf_string[] = "AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"; + char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r"; serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif From 534389090395058d454b08aa114c04b8b89a4284 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 21:57:48 -0400 Subject: [PATCH 11/25] Update main.c integer sleep, close serial --- main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index d598cf00..30cc87ad 100644 --- a/main.c +++ b/main.c @@ -2190,9 +2190,9 @@ void program_radio() { digitalWrite(28, HIGH); // stop transmit if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 - + printf("serial opened 9600"); for (int i = 0; i < 5; i++) { - sleep(0.5); // delay(500); + sleep(1); // delay(500); #ifdef APRS_VHF char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"; serialPrintf(uart_fd, vhf_string); @@ -2203,7 +2203,7 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif - sleep(0.5); + sleep(1); char mic_string[] = "AT+DMOSETMIC=8,0\r"; serialPrintf(uart_fd, mic_string); // mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 @@ -2221,4 +2221,6 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 digitalWrite(29, LOW); // disable SR_FRS pinMode(28, INPUT); pinMode(29, INPUT); + + serialClose(uart_fd); } From 3cd1316491dfe8db14b595e65df0968ade180a52 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:04:00 -0400 Subject: [PATCH 12/25] Update main.c moved wiringPisetup --- main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 30cc87ad..61f9d7fd 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,9 @@ int main(int argc, char * argv[]) { printf("\n\nCubeSatSim v1.3b starting...\n\n"); - program_radio(); + wiringPiSetup(); + + program_radio(); FILE * rpitx_stop = popen("sudo systemctl stop rpitx", "r"); pclose(rpitx_stop); @@ -174,8 +176,6 @@ int main(int argc, char * argv[]) { if (strcmp(sim_yes, "yes") == 0) sim_mode = TRUE; - wiringPiSetup(); - if (mode == AFSK) { // Check for SPI and AX-5043 Digital Transceiver Board From 2ef51d396219f06cceefaacf6aa058231418956c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:08:59 -0400 Subject: [PATCH 13/25] Update main.c added \n --- main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 61f9d7fd..83aed5d2 100644 --- a/main.c +++ b/main.c @@ -2190,21 +2190,21 @@ void program_radio() { digitalWrite(28, HIGH); // stop transmit if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 - printf("serial opened 9600"); + printf("serial opened 9600\n"); for (int i = 0; i < 5; i++) { sleep(1); // delay(500); #ifdef APRS_VHF - char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"; + char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r\n"; serialPrintf(uart_fd, vhf_string); // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS #else - char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r"; + char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r\n"; serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 #endif sleep(1); - char mic_string[] = "AT+DMOSETMIC=8,0\r"; + char mic_string[] = "AT+DMOSETMIC=8,0\r\n"; serialPrintf(uart_fd, mic_string); // mySerial.println("AT+DMOSETMIC=8,0\r"); // was 8 From 50f7d587ea188209e4a1156fe9a2c9c084bd1474 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:12:46 -0400 Subject: [PATCH 14/25] Update main.c remove APRS_VHF --- main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index 83aed5d2..6a0b5c65 100644 --- a/main.c +++ b/main.c @@ -2193,16 +2193,16 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 printf("serial opened 9600\n"); for (int i = 0; i < 5; i++) { sleep(1); // delay(500); -#ifdef APRS_VHF - char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r\n"; - serialPrintf(uart_fd, vhf_string); +//#ifdef APRS_VHF +// char vhf_string[] = "AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r\n"; +// serialPrintf(uart_fd, vhf_string); // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS -#else +//#else char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r\n"; serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 -#endif +//#endif sleep(1); char mic_string[] = "AT+DMOSETMIC=8,0\r\n"; serialPrintf(uart_fd, mic_string); @@ -2210,11 +2210,11 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 } } -#ifdef APRS_VHF - printf("Programming FM tx 144.39, rx on 144.39 MHz\n"); -#else +//#ifdef APRS_VHF +// printf("Programming FM tx 144.39, rx on 144.39 MHz\n"); +//#else printf("Programming FM tx 434.9, rx on 435.0 MHz\n"); -#endif +//#endif // digitalWrite(PTT_PIN, LOW); // transmit carrier for 0.5 sec // sleep(0.5); // digitalWrite(PTT_PIN, HIGH); From 7407a9b8b387b58a7772de4a420753227105c76f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:19:47 -0400 Subject: [PATCH 15/25] Update rpitx.py add white background to SSTV telem --- rpitx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index 467d047f..8fad9380 100644 --- a/rpitx.py +++ b/rpitx.py @@ -519,7 +519,8 @@ if __name__ == "__main__": # draw.text((10, 10), callsign, font=font2, fill='white') # draw.text((120, 10), telem_string, font=font2, fill='white') draw.text((10, 10), callsign, font=font2, fill='black') - draw.text((120, 10), telem_string, font=font2, fill='black') + draw.text((121, 11), telem_string, font=font2, fill='black') + draw.text((120, 10), telem_string, font=font2, fill='white') img.save(file) system("/home/pi/PiSSTVpp/pisstvpp -r 48000 -p s2 /home/pi/CubeSatSim/camera_out.jpg") From d154658b0fc92dcccd0d7558686508d764b1ea43 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:29:20 -0400 Subject: [PATCH 16/25] Update rpitx.py pixel offset sstv --- rpitx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpitx.py b/rpitx.py index 8fad9380..fc380774 100644 --- a/rpitx.py +++ b/rpitx.py @@ -518,8 +518,9 @@ if __name__ == "__main__": 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((15, 15), callsign, font=font2, fill='white') draw.text((10, 10), callsign, font=font2, fill='black') - draw.text((121, 11), telem_string, font=font2, fill='black') + draw.text((123, 13), telem_string, font=font2, fill='black') draw.text((120, 10), telem_string, font=font2, fill='white') img.save(file) From ff787c1658a5c1361eb6e481249d33943c4010dd Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:35:07 -0400 Subject: [PATCH 17/25] Update rpitx.py white on black letters in sstv --- rpitx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpitx.py b/rpitx.py index fc380774..27b15e11 100644 --- a/rpitx.py +++ b/rpitx.py @@ -518,8 +518,8 @@ if __name__ == "__main__": 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((15, 15), callsign, font=font2, fill='white') - draw.text((10, 10), callsign, font=font2, fill='black') + draw.text((13, 13), callsign, font=font2, fill='black') + draw.text((10, 10), callsign, font=font2, fill='white') draw.text((123, 13), telem_string, font=font2, fill='black') draw.text((120, 10), telem_string, font=font2, fill='white') img.save(file) From 43ec66927696e1c5115e91f602d8e58deb552ecb Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:39:04 -0400 Subject: [PATCH 18/25] Update main.c don't restart rpitx --- main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 6a0b5c65..ab362019 100644 --- a/main.c +++ b/main.c @@ -49,8 +49,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 stop 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 +70,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"); - pclose(rpitx_restart); + //FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r"); + //pclose(rpitx_restart); mode = FSK; frameCnt = 1; From 1bdc0220d9424e3f3cbe2212cfdc6eaecd7d38c1 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:40:01 -0400 Subject: [PATCH 19/25] Update rpitx.py offset 2 pixels black white --- rpitx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpitx.py b/rpitx.py index 27b15e11..232e4344 100644 --- a/rpitx.py +++ b/rpitx.py @@ -518,9 +518,9 @@ if __name__ == "__main__": 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((13, 13), callsign, font=font2, fill='black') + draw.text((12, 12), callsign, font=font2, fill='black') draw.text((10, 10), callsign, font=font2, fill='white') - draw.text((123, 13), telem_string, font=font2, fill='black') + draw.text((122, 12), telem_string, font=font2, fill='black') draw.text((120, 10), telem_string, font=font2, fill='white') img.save(file) From 87340406eca27d7422338a4226102b5f8bc31c9e Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:41:59 -0400 Subject: [PATCH 20/25] Update main.c change to BAT with current in sstv telem --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index ab362019..bf844cc6 100644 --- a/main.c +++ b/main.c @@ -837,7 +837,7 @@ int main(int argc, char * argv[]) { #endif FILE * fp = fopen("/home/pi/CubeSatSim/telem_string.txt", "w"); printf("Writing telem_string.txt\n"); - fprintf(fp, "Vbatt = %4.2f\n", batteryVoltage); + fprintf(fp, "BAT %4.2fV %5.1fmA\n", batteryVoltage, batteryCurrent); fclose(fp); /**/ From 3ca2a02caeea1b7078dfad3e3e204722a790e55f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:44:21 -0400 Subject: [PATCH 21/25] Update main.c add back in restart rpitx --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index bf844cc6..7374596c 100644 --- a/main.c +++ b/main.c @@ -70,8 +70,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"); - //pclose(rpitx_restart); + FILE * rpitx_restart = popen("sudo systemctl restart rpitx", "r"); + pclose(rpitx_restart); mode = FSK; frameCnt = 1; From 8d7e6a903cb39bae705eea20adff38621c3adf35 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:49:22 -0400 Subject: [PATCH 22/25] Update rpitx.py change font sizes --- rpitx.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpitx.py b/rpitx.py index 232e4344..060667f3 100644 --- a/rpitx.py +++ b/rpitx.py @@ -503,7 +503,7 @@ if __name__ == "__main__": file='/home/pi/CubeSatSim/camera_out.jpg' font1 = ImageFont.truetype('DejaVuSerif.ttf', 20) - font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 20) + font2 = ImageFont.truetype('DejaVuSerif-Bold.ttf', 16) try: filep = open("/home/pi/CubeSatSim/telem_string.txt") @@ -518,8 +518,8 @@ if __name__ == "__main__": 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=font2, fill='black') - draw.text((10, 10), callsign, 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) From f0a4263485c4202551e14eedf68244f1e58fcf30 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Mon, 2 Oct 2023 22:55:55 -0400 Subject: [PATCH 23/25] Update main.c change to 434.99 --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 7374596c..1f2149b3 100644 --- a/main.c +++ b/main.c @@ -2199,7 +2199,7 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS //#else - char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r\n"; + char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9900,0,3,0,0\r\n"; serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 //#endif From 6e3e580cc3138cb13e4d6e145b8d4773978f0c82 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Tue, 3 Oct 2023 07:51:28 -0400 Subject: [PATCH 24/25] Update main.c change freq back to 434.9 --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 1f2149b3..7374596c 100644 --- a/main.c +++ b/main.c @@ -2199,7 +2199,7 @@ if ((uart_fd = serialOpen("/dev/ttyAMA0", 9600)) >= 0) { // was 9600 // mySerial.println("AT+DMOSETGROUP=0,144.3900,144.3900,0,3,0,0\r"); // can change to 144.39 for standard APRS // mySerial.println("AT+DMOSETGROUP=0,145.0000,145.0000,0,3,0,0\r"); // can change to 145 for testing ASPRS //#else - char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9900,0,3,0,0\r\n"; + char uhf_string[] = "AT+DMOSETGROUP=0,435.0000,434.9000,0,3,0,0\r\n"; serialPrintf(uart_fd, uhf_string); // mySerial.println("AT+DMOSETGROUP=0,435.1000,434.9900,0,3,0,0\r"); // squelch set to 3 //#endif From 067f0ce01fa931d996965087b596667b33e613e5 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Tue, 3 Oct 2023 07:58:41 -0400 Subject: [PATCH 25/25] Update main.c remove all serial writes to Pico --- main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.c b/main.c index 7374596c..b78eac85 100644 --- a/main.c +++ b/main.c @@ -352,6 +352,9 @@ int main(int argc, char * argv[]) { payload = OFF; if ((uart_fd = serialOpen("/dev/ttyAMA0", 115200)) >= 0) { // was 9600 + printf("Serial opened to Pico\n"); + payload = ON; +/* char c; int charss = (char) serialDataAvail(uart_fd); if (charss != 0) @@ -392,6 +395,7 @@ int main(int argc, char * argv[]) { payload = ON; } +*/ } else { fprintf(stderr, "Unable to open UART: %s\n -> Did you configure /boot/config.txt and /boot/cmdline.txt?\n", strerror(errno)); }