From f0297e56bbee016a33841c8afdd9d8173fa8cb00 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Tue, 30 Mar 2021 12:23:21 -0400 Subject: [PATCH 01/11] added GPIO 13 Wiring Pi 23 check for VHF BPF --- afsk/main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 7bbb728e..ef6d95d6 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -302,7 +302,21 @@ mode = AFSK; onLedOn = HIGH; onLedOff = LOW; transmit = TRUE; - } + } else { + pinMode(23, INPUT); + pullUpDnControl(23, PUD_UP); + + if (digitalRead(23) != HIGH) { + printf("vB5 Present with VHF BPF\n"); + txLed = 2; + txLedOn = HIGH; + txLedOff = LOW; + vB5 = TRUE; + onLed = 27; + onLedOn = HIGH; + onLedOff = LOW; + transmit = TRUE; + } } } } From de0ea0e42b5026ffb97fd73a6b54496f41f6703b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Tue, 30 Mar 2021 12:25:00 -0400 Subject: [PATCH 02/11] TX with VHF BPF --- afsk/main.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index ef6d95d6..e2a5b385 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -303,19 +303,20 @@ mode = AFSK; onLedOff = LOW; transmit = TRUE; } else { - pinMode(23, INPUT); - pullUpDnControl(23, PUD_UP); - - if (digitalRead(23) != HIGH) { - printf("vB5 Present with VHF BPF\n"); - txLed = 2; - txLedOn = HIGH; - txLedOff = LOW; - vB5 = TRUE; - onLed = 27; - onLedOn = HIGH; - onLedOff = LOW; - transmit = TRUE; + pinMode(23, INPUT); + pullUpDnControl(23, PUD_UP); + + if (digitalRead(23) != HIGH) { + printf("vB5 Present with VHF BPF\n"); + txLed = 2; + txLedOn = HIGH; + txLedOff = LOW; + vB5 = TRUE; + onLed = 27; + onLedOn = HIGH; + onLedOff = LOW; + transmit = TRUE; + } } } } From 9cd1f83c259f2c6133b238d4c54045d9b19d10a4 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 14:50:08 -0400 Subject: [PATCH 03/11] don't add sensor payload to telemetry. --- afsk/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index e2a5b385..e6de86fd 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include "status.h" @@ -937,7 +936,7 @@ void get_tlm(void) { sensor_payload[i] = '\0'; printf("Payload string: %s", sensor_payload); - strcat(str, sensor_payload); // append to telemetry string for transmission +// strcat(str, sensor_payload); // append to telemetry string for transmission // parse sensor payload float sensor[17]; From 87ecc581c07facc3e1177849d9f0464953e9d132 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 14:51:40 -0400 Subject: [PATCH 04/11] Update main.c --- afsk/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/afsk/main.c b/afsk/main.c index e6de86fd..3709542d 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -23,6 +23,7 @@ #include #include #include "status.h" +#include #include "ax5043.h" #include "ax25.h" #include "spi/ax5043spi.h" From 8b6d85642e1bbe4af8bc19fe254fed2d92485ce9 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 15:04:14 -0400 Subject: [PATCH 05/11] replaced CQ --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 3709542d..4520677b 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -839,14 +839,14 @@ void get_tlm(void) { char header_str3[] = "echo '"; //char header_str2[] = ">CQ:>041440zhi hi "; //char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi "; - char header_str2[] = ">CQ:"; + char header_str2[] = ">APU25N:"; char header_str2b[30]; // for APRS coordinates char header_lat[10]; char header_long[10]; char header_str4[] = "hi hi "; char footer_str1[] = "\' > t.txt && echo \'"; // char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && 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"; - char footer_str[] = ">CQ:010101/hi hi ' >> t.txt && 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 144.39e3 > /dev/null 2>&1"; + char footer_str[] = ">APU25N:010101/hi hi ' >> t.txt && 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 144.39e3 > /dev/null 2>&1"; if (ax5043) { strcpy(str, header_str); From 5389801d084260f576d16871d8459e3a74ca183e Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 15:27:49 -0400 Subject: [PATCH 06/11] different lat and long --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 4520677b..a8e26950 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -869,7 +869,8 @@ void get_tlm(void) { printf("lat: %s long: %s \n", &header_lat, &header_long); // sprintf(header_str2b, "=3910.10N/07500.32WOhi hi %f %f", latitude, longitude); // APRS balloon symbol sprintf(header_str2b, "=%s%c%s%chi hi ", &header_lat, '/', &header_long, 'O'); // APRS balloon symbol - printf("\n\nString is %s \n\n", &header_str2b); + sprintf(header_str2b, "=3958.95N/07509.16Whi hi"); + printf("\n\nString is %s \n\n", &header_str2b); strcat(str, header_str2b); } else { strcat(str, header_str4); From ba65576d14afab64c60ecf02f068c8e8becc58f9 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 15:29:57 -0400 Subject: [PATCH 07/11] Update main.c --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index a8e26950..5742bcb4 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -869,7 +869,7 @@ void get_tlm(void) { printf("lat: %s long: %s \n", &header_lat, &header_long); // sprintf(header_str2b, "=3910.10N/07500.32WOhi hi %f %f", latitude, longitude); // APRS balloon symbol sprintf(header_str2b, "=%s%c%s%chi hi ", &header_lat, '/', &header_long, 'O'); // APRS balloon symbol - sprintf(header_str2b, "=3958.95N/07509.16Whi hi"); + sprintf(header_str2b, "=3958.95N/07509.16WKhi hi"); printf("\n\nString is %s \n\n", &header_str2b); strcat(str, header_str2b); } else { From 18b6b5e0b8062aa715464e1b249805b0bfe27604 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 1 Apr 2021 15:49:50 -0400 Subject: [PATCH 08/11] initial add --- telem.wav | Bin 0 -> 64836 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 telem.wav diff --git a/telem.wav b/telem.wav new file mode 100644 index 0000000000000000000000000000000000000000..e316e64982af2538b0faf34dcf0761fbedaddea7 GIT binary patch literal 64836 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 D{a_58 literal 0 HcmV?d00001 From 9596997d51c71206ee740172f68fa3c67dbff082 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Thu, 1 Apr 2021 18:28:19 -0400 Subject: [PATCH 09/11] reset back --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 5742bcb4..6004c6cb 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -869,7 +869,7 @@ void get_tlm(void) { printf("lat: %s long: %s \n", &header_lat, &header_long); // sprintf(header_str2b, "=3910.10N/07500.32WOhi hi %f %f", latitude, longitude); // APRS balloon symbol sprintf(header_str2b, "=%s%c%s%chi hi ", &header_lat, '/', &header_long, 'O'); // APRS balloon symbol - sprintf(header_str2b, "=3958.95N/07509.16WKhi hi"); +// sprintf(header_str2b, "=3958.95N/07509.16WKhi hi"); printf("\n\nString is %s \n\n", &header_str2b); strcat(str, header_str2b); } else { @@ -938,7 +938,7 @@ void get_tlm(void) { sensor_payload[i] = '\0'; printf("Payload string: %s", sensor_payload); -// strcat(str, sensor_payload); // append to telemetry string for transmission + strcat(str, sensor_payload); // append to telemetry string for transmission // parse sensor payload float sensor[17]; From d4929538d4df9e13d2985899d1af598a63259aed Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 1 Apr 2021 18:30:40 -0400 Subject: [PATCH 10/11] updated with full packet --- telem.wav | Bin 64836 -> 132676 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/telem.wav b/telem.wav index e316e64982af2538b0faf34dcf0761fbedaddea7..7d96ec000c6852b0030954e1c9810f50803bd46e 100644 GIT binary patch delta 1553 zcmaJ>zfapx5SE=bj2%$rkW`xW=mS|Y6{7Wu2V_8G?Cnb4`r5Z!$M+IE7^A+=^4 zjm$+{M@v1t_8u&QCX71s358|6*)_ab&n(%gwq$lSr(aO;fJLWJEv^W9SAemuyVXx}g7v?<`;v5L(2ZX4K=j_3f zqc%VsDLUX;#Ux7LGq(aoKt~EqOv9hiz_q`LZxDpiPy{qZo55^CVyI_Yzf`3Nl&dwq zi&y(Nttcn09GHthx+z$A2CgcD^CeF68{}WVM1Qr&IRXUh$~<5$ckXnQAG_{KoR!fj zvN(dHp!O?60k_f3^VY+<`KwS}$~9b@Q^|j|23ESzM&GL{&I3)lb>?aV!gdc4fol9d zb#^i7WeCUpx;hmI{s2EzhjPQQZdH{XWHBHVRQ+(y9+NkVSRyO0T}@t)cY(B(w#`$f z;^c1R-T?lccQEZ>b|_N(6EsZ7^qOuDILEEsZv2Y~paMalvq2KLnN906kUft#o>_`I zB}j7%XeKwT5^Ej*%_UrM1k~L|j=ezv3!WmPn&)y#Z!wXgl)waq?9RcMXM^+#P<%QR z5wj|!8csaYoQ0GkA06Erf{X_{QHr&GafbW!UX_Yk53{RBEpO07ZP81RBXJQs5AvI- Xry6}*e4)`z!O$ovx77@nV%qu(!X2vw delta 510 zcmXAmF-RL>6vz863CUm~n`x0$QmD5SBBkXhf>(&gMG!xNU=RlfDH%eEODUahuy_(N zNxup=h}`BOD3Le3q=Pt!IJ))5V3(tGxS>N@Nb!AUIllYfyWjoZ|E~5jSN{^}O4+jJ zMvpq_0*uaQ51?bF@fr$cG%nhJ!=uXt8vUY%wS5yv7jUa#=3^VkO#-LAN>P)=`IxG! zkWFGOnof|r3?hZ$$pEmo?r5_6(#PD-0Z=#tZIF$Ez?;Kc&Mkqx&qa-DufWmp#^vuB z9~kX@VKjwJo+cv)%uzAgztpMEr`oy+$59JXo!LF=eN_{~I$y#c1CU`qreK;gVjw$v zE%=?n&57+a+B1sq!~}HnjHynso%`I!Olb}9?%4~Fde)at$wy;t4shl1H$d+VGt~;w z3d>(E2>N8Pt`tuN+JD(o&$F$%rJ)Ut1O>Zlo1o6^=-;`m=!^jy?|kwcC1r2HMv{Uh z)n4^9o0Lvjps~rIv97MG<)haM5;ggS;qF5NJ4|uPJ_f_0qbuEv;KV(<3*n7p^D{;m~Edr{m2*_PDs From dece72029974fa2bed60924d162d3257a5f45551 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 2 Apr 2021 10:13:46 -0400 Subject: [PATCH 11/11] try WIDE1 --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 6004c6cb..ce65fd25 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -839,7 +839,7 @@ void get_tlm(void) { char header_str3[] = "echo '"; //char header_str2[] = ">CQ:>041440zhi hi "; //char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi "; - char header_str2[] = ">APU25N:"; + char header_str2[] = ">WIDE1:"; char header_str2b[30]; // for APRS coordinates char header_lat[10]; char header_long[10];