From 32275c8d6c927e927aafaf4aba36679d3cd4c13f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Fri, 29 Mar 2024 10:26:39 -0400 Subject: [PATCH 1/4] Update main.c exit sim_mode if battery voltage sensor present --- main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index 1c89e9b3..c82dd2bd 100644 --- a/main.c +++ b/main.c @@ -89,7 +89,7 @@ int main(int argc, char * argv[]) { } if (strcmp(sim_yes, "yes") == 0) { - sim_mode = TRUE; + = TRUE; fprintf(stderr, "Sim mode is ON\n"); } if (strcmp(hab_yes, "yes") == 0) { @@ -429,10 +429,10 @@ int main(int argc, char * argv[]) { } } - if ((i2c_bus3 == OFF) || (sim_mode == TRUE)) { -// if (sim_mode == TRUE) { + if ((i2c_bus3 == OFF) || ( == TRUE)) { +// if ( == TRUE) { - sim_mode = TRUE; + = TRUE; fprintf(stderr, "Simulated telemetry mode!\n"); @@ -547,7 +547,7 @@ int main(int argc, char * argv[]) { memset(sensor, 0, sizeof(sensor)); memset(other, 0, sizeof(other)); - if (((mode == FSK) || (mode == BPSK))) // && !sim_mode) + if (((mode == FSK) || (mode == BPSK))) // && !) get_tlm_fox(); // fill transmit buffer with reset count 0 packets that will be ignored firstTime = 1; @@ -641,8 +641,11 @@ int main(int argc, char * argv[]) { } if (voltage[map[BAT]] == 0.0) batteryVoltage = 4.5; - else + else { batteryVoltage = voltage[map[BAT]]; + if (sim_mode) // if Voltage sensor on Battery board is present, exit simulated telemetry mode + sim_mode = FALSE; + } batteryCurrent = current[map[BAT]]; } @@ -792,7 +795,7 @@ int main(int argc, char * argv[]) { // end of simulated telemetry } - else { +// else { // code moved /* @@ -828,7 +831,7 @@ int main(int argc, char * argv[]) { batteryVoltage = voltage[map[BAT]]; batteryCurrent = current[map[BAT]]; */ - } +// } // batteryVoltage = voltage[map[BAT]]; // batteryCurrent = current[map[BAT]]; From 8b5d5d796eddcf8c226dfdc8efdda94baf86879c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Fri, 29 Mar 2024 10:30:42 -0400 Subject: [PATCH 2/4] Update main.c revert replace all sim_mode --- main.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index c82dd2bd..6dd2f47a 100644 --- a/main.c +++ b/main.c @@ -89,7 +89,7 @@ int main(int argc, char * argv[]) { } if (strcmp(sim_yes, "yes") == 0) { - = TRUE; + sim_mode = TRUE; fprintf(stderr, "Sim mode is ON\n"); } if (strcmp(hab_yes, "yes") == 0) { @@ -429,10 +429,10 @@ int main(int argc, char * argv[]) { } } - if ((i2c_bus3 == OFF) || ( == TRUE)) { -// if ( == TRUE) { + if ((i2c_bus3 == OFF) || (sim_mode == TRUE)) { +// if (sim_mode == TRUE) { - = TRUE; + sim_mode = TRUE; fprintf(stderr, "Simulated telemetry mode!\n"); @@ -547,7 +547,7 @@ int main(int argc, char * argv[]) { memset(sensor, 0, sizeof(sensor)); memset(other, 0, sizeof(other)); - if (((mode == FSK) || (mode == BPSK))) // && !) + if (((mode == FSK) || (mode == BPSK))) // && !sim_mode) get_tlm_fox(); // fill transmit buffer with reset count 0 packets that will be ignored firstTime = 1; @@ -641,10 +641,12 @@ int main(int argc, char * argv[]) { } if (voltage[map[BAT]] == 0.0) batteryVoltage = 4.5; - else { + else { batteryVoltage = voltage[map[BAT]]; - if (sim_mode) // if Voltage sensor on Battery board is present, exit simulated telemetry mode + if (sim_mode) { // if Voltage sensor on Battery board is present, exit simulated telemetry mode sim_mode = FALSE; + fprintf(stderr, "Turning off sim_mode since battery sensor is present\n"); + } } batteryCurrent = current[map[BAT]]; @@ -795,7 +797,7 @@ int main(int argc, char * argv[]) { // end of simulated telemetry } -// else { + else { // code moved /* @@ -831,7 +833,7 @@ int main(int argc, char * argv[]) { batteryVoltage = voltage[map[BAT]]; batteryCurrent = current[map[BAT]]; */ -// } + } // batteryVoltage = voltage[map[BAT]]; // batteryCurrent = current[map[BAT]]; From da36d036db314e8293aff0a2e9d13d5e0f296db4 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Fri, 29 Mar 2024 10:47:25 -0400 Subject: [PATCH 3/4] Update main.h added sim_config --- main.h | 1 + 1 file changed, 1 insertion(+) diff --git a/main.h b/main.h index 7e7a8507..2f5b3fe6 100644 --- a/main.h +++ b/main.h @@ -149,6 +149,7 @@ long int newGpsTime; float axis[3], angle[3], volts_max[3], amps_max[3], batt, speed, period, tempS, temp_max, temp_min, eclipse; int i2c_bus0 = OFF, i2c_bus1 = OFF, i2c_bus3 = OFF, camera = OFF, sim_mode = FALSE, SafeMode = FALSE, rxAntennaDeployed = 0, txAntennaDeployed = 0; +int sim_config = FALSE; // sim mode not set by configuration double eclipse_time; float voltage[9], current[9], sensor[SENSOR_FIELDS], other[3]; From 2d3f86c07c759db57a61bda8eff947192185269f Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Fri, 29 Mar 2024 10:49:02 -0400 Subject: [PATCH 4/4] Update main.c added sim_config check so config overrides --- main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 6dd2f47a..de207ac0 100644 --- a/main.c +++ b/main.c @@ -90,7 +90,8 @@ int main(int argc, char * argv[]) { if (strcmp(sim_yes, "yes") == 0) { sim_mode = TRUE; - fprintf(stderr, "Sim mode is ON\n"); + fprintf(stderr, "Sim mode is turned ON by configuration\n"); + sim_config = TRUE; } if (strcmp(hab_yes, "yes") == 0) { hab_mode = TRUE; @@ -643,7 +644,7 @@ int main(int argc, char * argv[]) { batteryVoltage = 4.5; else { batteryVoltage = voltage[map[BAT]]; - if (sim_mode) { // if Voltage sensor on Battery board is present, exit simulated telemetry mode + if (sim_mode && !sim_config) { // if Voltage sensor on Battery board is present, exit simulated telemetry mode sim_mode = FALSE; fprintf(stderr, "Turning off sim_mode since battery sensor is present\n"); }