From 4b405fafcb326071dd9003f3d4f562bd6c9af380 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 28 Aug 2025 09:39:23 -0400 Subject: [PATCH 1/4] Update main.c add S for simulated telem in APRS and CW --- main.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index d3c1403d..a8cdb502 100644 --- a/main.c +++ b/main.c @@ -677,12 +677,17 @@ int main(int argc, char * argv[]) { char timeStampNoNl[31], bat_string[31]; snprintf(timeStampNoNl, 30, "%.24s", ctime(&timeStamp)); // printf("TimeStamp: %s\n", timeStampNoNl); - +/* if (c2cStatus == DISABLED) snprintf(bat_string, 30, "BAT %4.2f %5.1f", batteryVoltage, batteryCurrent); else snprintf(bat_string, 30, "BAT %4.2f %5.1f C", batteryVoltage, batteryCurrent); - + */ + snprintf(bat_string, 30, "BAT %4.2f %5.1f", batteryVoltage, batteryCurrent); + if (c2cStatus != DISABLED) + strcpy(bat_string," C"); + if (sim_mode || (failureMode != FAIL_NONE)) + strcpy(bat_string," S"); fprintf(telem_file, "%s %s %s\n", timeStampNoNl, bat_string, sensor_payload); // write telemetry string to telem.txt file fclose(telem_file); @@ -992,11 +997,21 @@ int main(int argc, char * argv[]) { FILE * fp = fopen("/home/pi/CubeSatSim/telem_string.txt", "w"); if (fp != NULL) { // printf("Writing telem_string.txt\n"); - if (batteryVoltage != 4.5) + if (batteryVoltage != 4.5) { +/* if (c2cStatus == DISABLED) fprintf(fp, "BAT %4.2fV %4.0fmA\n", batteryVoltage, batteryCurrent); else fprintf(fp, "BAT %4.2fV %4.0fmA C\n", batteryVoltage, batteryCurrent); // show command and control is on + */ + fprintf(fp, "BAT %4.2fV %4.0fmA", batteryVoltage, batteryCurrent); + if (c2cStatus != DISABLED) + fprintf(fp," C"); + if (sim_mode || (failureMode != FAIL_NONE)) + fprintf(fp," S\n"); + else + fprintf(fp,"\n"); + } else fprintf(fp, "\n"); // don't show voltage and current if it isn't a sensor value @@ -1233,13 +1248,19 @@ void get_tlm(void) { // fclose(file_append); // } } else { // APRS - +/* if (c2cStatus == 0) sprintf(tlm_str, "BAT %4.2f %5.1f ", batteryVoltage, batteryCurrent); else sprintf(tlm_str, "BAT %4.2f %5.1f C ", batteryVoltage, batteryCurrent); - - strcat(str, tlm_str); +*/ + snprintf(tlm_str, 30, "BAT %4.2f %5.1f ", batteryVoltage, batteryCurrent); + if (c2cStatus != DISABLED) + strcpy(tlm_str,"C "); + if (sim_mode || (failureMode != FAIL_NONE)) + strcpy(tlm_str,"S "); + + strcat(str, tlm_str); } // strcpy(sensor_payload, buffer2); From 4aa43f18eab57f87a4dc3a5a256e5317fd1dce01 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 28 Aug 2025 09:45:29 -0400 Subject: [PATCH 2/4] Update main.c copy to cat --- main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index a8cdb502..c41940cc 100644 --- a/main.c +++ b/main.c @@ -685,9 +685,9 @@ int main(int argc, char * argv[]) { */ snprintf(bat_string, 30, "BAT %4.2f %5.1f", batteryVoltage, batteryCurrent); if (c2cStatus != DISABLED) - strcpy(bat_string," C"); + strcat(bat_string," C"); if (sim_mode || (failureMode != FAIL_NONE)) - strcpy(bat_string," S"); + strcat(bat_string," S"); fprintf(telem_file, "%s %s %s\n", timeStampNoNl, bat_string, sensor_payload); // write telemetry string to telem.txt file fclose(telem_file); @@ -1256,9 +1256,9 @@ void get_tlm(void) { */ snprintf(tlm_str, 30, "BAT %4.2f %5.1f ", batteryVoltage, batteryCurrent); if (c2cStatus != DISABLED) - strcpy(tlm_str,"C "); + strcat(tlm_str,"C "); if (sim_mode || (failureMode != FAIL_NONE)) - strcpy(tlm_str,"S "); + strcat(tlm_str,"S "); strcat(str, tlm_str); } From 373d72f62678f231e6526a468c96ca3987eeab29 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 28 Aug 2025 09:50:55 -0400 Subject: [PATCH 3/4] Update main.c remove extra spaces --- main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index c41940cc..1bcd9a33 100644 --- a/main.c +++ b/main.c @@ -683,7 +683,7 @@ int main(int argc, char * argv[]) { else snprintf(bat_string, 30, "BAT %4.2f %5.1f C", batteryVoltage, batteryCurrent); */ - snprintf(bat_string, 30, "BAT %4.2f %5.1f", batteryVoltage, batteryCurrent); + snprintf(bat_string, 30, "BAT %.2f %.1f", batteryVoltage, batteryCurrent); if (c2cStatus != DISABLED) strcat(bat_string," C"); if (sim_mode || (failureMode != FAIL_NONE)) @@ -1004,7 +1004,7 @@ int main(int argc, char * argv[]) { else fprintf(fp, "BAT %4.2fV %4.0fmA C\n", batteryVoltage, batteryCurrent); // show command and control is on */ - fprintf(fp, "BAT %4.2fV %4.0fmA", batteryVoltage, batteryCurrent); + fprintf(fp, "BAT %.2fV %.0fmA", batteryVoltage, batteryCurrent); if (c2cStatus != DISABLED) fprintf(fp," C"); if (sim_mode || (failureMode != FAIL_NONE)) @@ -1254,7 +1254,7 @@ void get_tlm(void) { else sprintf(tlm_str, "BAT %4.2f %5.1f C ", batteryVoltage, batteryCurrent); */ - snprintf(tlm_str, 30, "BAT %4.2f %5.1f ", batteryVoltage, batteryCurrent); + snprintf(tlm_str, 30, "BAT %.2f %.1f ", batteryVoltage, batteryCurrent); if (c2cStatus != DISABLED) strcat(tlm_str,"C "); if (sim_mode || (failureMode != FAIL_NONE)) From 6f4c68d50dd14eb605bfaabf1b091e367306ae84 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Thu, 28 Aug 2025 10:26:09 -0400 Subject: [PATCH 4/4] Update main.c fix cw --- main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 1bcd9a33..887ab76b 100644 --- a/main.c +++ b/main.c @@ -1215,8 +1215,11 @@ void get_tlm(void) { strcat(str, header_str4); strcat(str, call); if (c2cStatus != DISABLED) { - strcat(str, header_c2c); + strcat(str, " C"); } + if (sim_mode || failureMode != FAIL_NONE) { + strcat(str, " S"); + } sprintf(tlm_str, "%s' > cw0.txt", &str); printf("CW string to execute: %s\n", &tlm_str); @@ -1259,8 +1262,8 @@ void get_tlm(void) { strcat(tlm_str,"C "); if (sim_mode || (failureMode != FAIL_NONE)) strcat(tlm_str,"S "); - - strcat(str, tlm_str); +// printf("tlm_str: %s\n", tlm_str); +// strcat(str, tlm_str); } // strcpy(sensor_payload, buffer2);