From f3b3aa7041483b4cc601dbf947a8b59b586f2aa6 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 22 Nov 2020 10:16:30 -0500 Subject: [PATCH] added latitude and longitude variables --- afsk/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 18369aae..11b66e31 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -119,6 +119,7 @@ int sampleTime = 0, frames_sent = 0; int cw_id = ON; int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF; float batteryThreshold = 3.0, batteryVoltage; +float latitude = 39.027702, longitude = -77.078064; int test_i2c_bus(int bus); const char pythonCmd[] = "python3 /home/pi/CubeSatSim/python/voltcurrent.py "; @@ -654,7 +655,9 @@ for (int j = 0; j < frameCnt; j++) //char header_str2[] = ">CQ:>041440zhi hi "; //char header_str2[] = ">CQ:=4003.79N\\07534.33WShi hi "; char header_str2[] = ">CQ:"; - char header_str2b[30]; // for APRS coordinates + 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"; @@ -670,7 +673,10 @@ for (int j = 0; j < frameCnt; j++) { strcat(str, call); strcat(str, header_str2); - sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi",4003.79,'N',0x5c,0x5c,07534.33,'W'); // add APRS latt and long +// sprintf(header_str2b, "=%7.2f%c%c%c%08.2f%cShi hi ",4003.79,'N',0x5c,0x5c,07534.33,'W'); // add APRS lat and long + sprintf(header_lat, "%7.2f%c",latitude * 10.0,'N'); // lat + sprintf(header_long, "%08.2f%c",latitude * (-10.0),'W'); // long + sprintf(header_str2b, "=%s%c%c%shi hi ",header_lat,0x5c,0x5c,header_long); // add APRS lat and long printf("\n\nString is %s \n\n", header_str2b); strcat(str, header_str2b); } else