From 4f15a97a95cdcfa9a2988dba1dd2370d2faa8ba0 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 17:14:57 -0400 Subject: [PATCH 01/11] moved sensor read, sim telem, and payload read to common code --- afsk/main.c | 264 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 228 insertions(+), 36 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 8e63831d..91b7f936 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -151,6 +151,9 @@ float axis[3], angle[3], volts_max[3], amps_max[3], batt, speed, period, tempS, int i2c_bus0 = OFF, i2c_bus1 = OFF, i2c_bus3 = OFF, camera = OFF, sim_mode = FALSE, SafeMode = FALSE, rxAntennaDeployed = 0, txAntennaDeployed = 0; double eclipse_time; +float voltage[9], current[9], sensor[17], other[3]; +char sensor_payload[500]; + int test_i2c_bus(int bus); const char pythonCmd[] = "python3 -u /home/pi/CubeSatSim/python/voltcurrent.py "; @@ -645,9 +648,220 @@ int main(int argc, char * argv[]) { fflush(stdout); fflush(stderr); // frames_sent++; - + + sensor_payload[0] = 0; + memset(voltage, 0, sizeof(voltage)); + memset(current, 0, sizeof(current)); + memset(sensor, 0, sizeof(sensor)); + memset(other, 0, sizeof(other)); + + FILE * uptime_file = fopen("/proc/uptime", "r"); + fscanf(uptime_file, "%f", & uptime_sec); + uptime = (int) uptime_sec; + #ifdef DEBUG_LOGGING + printf("INFO: Reset Count: %d Uptime since Reset: %ld \n", reset_count, uptime); + #endif + fclose(uptime_file); + printf("++++ Loop time: %d +++++\n", millis() - loopTime); loopTime = millis(); + + if (sim_mode) { // simulated telemetry + + double time = ((long int)millis() - time_start) / 1000.0; + + if ((time - eclipse_time) > period) { + eclipse = (eclipse == 1) ? 0 : 1; + eclipse_time = time; + printf("\n\nSwitching eclipse mode! \n\n"); + } + + double Xi = eclipse * amps_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2); + double Yi = eclipse * amps_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2); + double Zi = eclipse * amps_max[2] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-2, 2); + + double Xv = eclipse * volts_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-0.2, 0.2); + double Yv = eclipse * volts_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-0.2, 0.2); + double Zv = 2.0 * eclipse * volts_max[2] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-0.2, 0.2); + + // printf("Yi: %f Zi: %f %f %f Zv: %f \n", Yi, Zi, amps_max[2], angle[2], Zv); + + current[map[PLUS_X]] = (Xi >= 0) ? Xi : 0; + current[map[MINUS_X]] = (Xi >= 0) ? 0 : ((-1.0f) * Xi); + current[map[PLUS_Y]] = (Yi >= 0) ? Yi : 0; + current[map[MINUS_Y]] = (Yi >= 0) ? 0 : ((-1.0f) * Yi); + current[map[PLUS_Z]] = (Zi >= 0) ? Zi : 0; + current[map[MINUS_Z]] = (Zi >= 0) ? 0 : ((-1.0f) * Zi); + + voltage[map[PLUS_X]] = (Xv >= 1) ? Xv : rnd_float(0.9, 1.1); + voltage[map[MINUS_X]] = (Xv <= -1) ? ((-1.0f) * Xv) : rnd_float(0.9, 1.1); + voltage[map[PLUS_Y]] = (Yv >= 1) ? Yv : rnd_float(0.9, 1.1); + voltage[map[MINUS_Y]] = (Yv <= -1) ? ((-1.0f) * Yv) : rnd_float(0.9, 1.1); + voltage[map[PLUS_Z]] = (Zv >= 1) ? Zv : rnd_float(0.9, 1.1); + voltage[map[MINUS_Z]] = (Zv <= -1) ? ((-1.0f) * Zv) : rnd_float(0.9, 1.1); + + // printf("temp: %f Time: %f Eclipse: %d : %f %f | %f %f | %f %f\n",tempS, time, eclipse, voltage[map[PLUS_X]], voltage[map[MINUS_X]], voltage[map[PLUS_Y]], voltage[map[MINUS_Y]], current[map[PLUS_Z]], current[map[MINUS_Z]]); + + tempS += (eclipse > 0) ? ((temp_max - tempS) / 50.0f) : ((temp_min - tempS) / 50.0f); + tempS += +rnd_float(-1.0, 1.0); + // IHUcpuTemp = (int)((tempS + rnd_float(-1.0, 1.0)) * 10 + 0.5); + other[IHU_TEMP] = tempS; + + voltage[map[BUS]] = rnd_float(5.0, 5.005); + current[map[BUS]] = rnd_float(158, 171); + + // float charging = current[map[PLUS_X]] + current[map[MINUS_X]] + current[map[PLUS_Y]] + current[map[MINUS_Y]] + current[map[PLUS_Z]] + current[map[MINUS_Z]]; + float charging = eclipse * (fabs(amps_max[0] * 0.707) + fabs(amps_max[1] * 0.707) + rnd_float(-4.0, 4.0)); + + current[map[BAT]] = ((current[map[BUS]] * voltage[map[BUS]]) / batt) - charging; + + // printf("charging: %f bat curr: %f bus curr: %f bat volt: %f bus volt: %f \n",charging, current[map[BAT]], current[map[BUS]], batt, voltage[map[BUS]]); + + batt -= (batt > 3.5) ? current[map[BAT]] / 30000 : current[map[BAT]] / 3000; + if (batt < 3.0) { + batt = 3.0; + SafeMode = 1; + printf("Safe Mode!\n"); + } else + SafeMode= 0; + + if (batt > 4.5) + batt = 4.5; + + voltage[map[BAT]] = batt + rnd_float(-0.01, 0.01); + + // end of simulated telemetry + } + else { + int count1; + char * token; + fputc('\n', file1); + fgets(cmdbuffer, 1000, file1); + fprintf(stderr, "Python read Result: %s\n", cmdbuffer); + + const char space[2] = " "; + token = strtok(cmdbuffer, space); + + for (count1 = 0; count1 < 8; count1++) { + if (token != NULL) { + voltage[count1] = (float) atof(token); + #ifdef DEBUG_LOGGING + // printf("voltage: %f ", voltage[count1]); + #endif + token = strtok(NULL, space); + if (token != NULL) { + current[count1] = (float) atof(token); + if ((current[count1] < 0) && (current[count1] > -0.5)) + current[count1] *= (-1.0f); + #ifdef DEBUG_LOGGING + // printf("current: %f\n", current[count1]); + #endif + token = strtok(NULL, space); + } + } + } + + batteryVoltage = voltage[map[BAT]]; + batteryCurrent = current[map[BAT]]; + + if (batteryVoltage < 3.6) { + SafeMode = 1; + printf("Safe Mode!\n"); + } else + SafeMode = 0; + + FILE * cpuTempSensor = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); + if (cpuTempSensor) { + double cpuTemp; + fscanf(cpuTempSensor, "%lf", & cpuTemp); + cpuTemp /= 1000; + + #ifdef DEBUG_LOGGING +// printf("CPU Temp Read: %6.1f\n", cpuTemp); + #endif + + other[IHU_TEMP] = (double)cpuTemp; + + // IHUcpuTemp = (int)((cpuTemp * 10.0) + 0.5); + } + fclose(cpuTempSensor); + + if (payload == ON) { // -55 + STEMBoardFailure = 0; + + + char c; + unsigned int waitTime; + int i, end, trys = 0; + sensor_payload[0] = 0; + sensor_payload[1] = 0; + while (((sensor_payload[0] != 'O') || (sensor_payload[1] != 'K')) && (trys++ < 10)) { + i = 0; + serialPutchar(uart_fd, '?'); + sleep(0.05); // added delay after ? + printf("%d Querying payload with ?\n", trys); + waitTime = millis() + 500; + end = FALSE; + // int retry = FALSE; + while ((millis() < waitTime) && !end) { + int chars = (char) serialDataAvail(uart_fd); + while ((chars > 0) && !end) { +// printf("Chars: %d\ ", chars); + chars--; + c = (char) serialGetchar(uart_fd); + // printf ("%c", c); + // fflush(stdout); + if (c != '\n') { + sensor_payload[i++] = c; + } else { + end = TRUE; + } + } + } + + sensor_payload[i++] = ' '; + // sensor_payload[i++] = '\n'; + sensor_payload[i] = '\0'; + printf(" Response from STEM Payload board: %s\n", sensor_payload); + sleep(0.1); // added sleep between loops + } + if ((sensor_payload[0] == 'O') && (sensor_payload[1] == 'K')) // only process if valid payload response + { + int count1; + char * token; + // char cmdbuffer[1000]; + + // FILE *file = popen("python3 /home/pi/CubeSatSim/python/voltcurrent.py 1 11", "r"); + // fgets(cmdbuffer, 1000, file); + // printf("result: %s\n", cmdbuffer); + // pclose(file); + + const char space[2] = " "; + token = strtok(sensor_payload, space); + for (count1 = 0; count1 < 17; count1++) { + if (token != NULL) { + sensor[count1] = (float) atof(token); + #ifdef DEBUG_LOGGING + // printf("sensor: %f ", sensor[count1]); + #endif + token = strtok(NULL, space); + } + } + printf("\n"); + } + else + payload = OFF; // turn off since STEM Payload is not responding + } + if ((sensor_payload[0] == 'O') && (sensor_payload[1] == 'K')) { + for (count1 = 0; count1 < 17; count1++) { + if (sensor[count1] < sensor_min[count1]) + sensor_min[count1] = sensor[count1]; + if (sensor[count1] > sensor_max[count1]) + sensor_max[count1] = sensor[count1]; + // printf("Smin %f Smax %f \n", sensor_min[count1], sensor_max[count1]); + } + } + } #ifdef DEBUG_LOGGING fprintf(stderr, "INFO: Battery voltage: %5.2f V Threshold %5.2f V Current: %6.1f mA Threshold: %6.1f mA\n", batteryVoltage, voltageThreshold, batteryCurrent, currentThreshold); @@ -772,7 +986,9 @@ void get_tlm(void) { memset(tlm, 0, sizeof tlm); // Reading I2C voltage and current sensors - + +/* + int count1; char * token; // char cmdbuffer[1000]; @@ -837,21 +1053,6 @@ void get_tlm(void) { eclipse_time = time; printf("\n\nSwitching eclipse mode! \n\n"); } - - /* - double Xi = eclipse * amps_max[0] * sin(2.0 * 3.14 * time / (46.0 * speed)) * fabs(sin(2.0 * 3.14 * time / (46.0 * speed))) + rnd_float(-2, 2); - double Yi = eclipse * amps_max[1] * sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14/2.0)) * fabs(sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14/2.0))) + rnd_float(-2, 2); - double Zi = eclipse * amps_max[2] * sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) * fabs(sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2])) + rnd_float(-2, 2); - */ -/* - double Xi = eclipse * amps_max[0] * sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2); - double Yi = eclipse * amps_max[1] * sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2); - double Zi = eclipse * amps_max[2] * sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-2, 2); - - double Xv = eclipse * volts_max[0] * sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-0.2, 0.2); - double Yv = eclipse * volts_max[1] * sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-0.2, 0.2); - double Zv = 2.0 * eclipse * volts_max[2] * sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-0.2, 0.2); -*/ float Xi = eclipse * amps_max[0] * (float) sin(2.0 * 3.14 * time / (46.0 * speed)) + rnd_float(-2, 2); float Yi = eclipse * amps_max[1] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + (3.14 / 2.0)) + rnd_float(-2, 2); float Zi = eclipse * amps_max[2] * (float) sin((2.0 * 3.14 * time / (46.0 * speed)) + 3.14 + angle[2]) + rnd_float(-2, 2); @@ -903,6 +1104,9 @@ void get_tlm(void) { // end of simulated telemetry } + + */ + tlm[1][A] = (int)(voltage[map[BUS]] / 15.0 + 0.5) % 100; // Current of 5V supply to Pi tlm[1][B] = (int)(99.5 - current[map[PLUS_X]] / 10.0) % 100; // +X current [4] tlm[1][C] = (int)(99.5 - current[map[MINUS_X]] / 10.0) % 100; // X- current [10] @@ -1232,7 +1436,7 @@ void get_tlm_fox() { sampleTime = (unsigned int) millis(); } else printf("first time - no sleep\n"); - +/* float voltage[9], current[9], sensor[17], other[3]; char sensor_payload[500]; sensor_payload[0] = 0; @@ -1248,7 +1452,8 @@ void get_tlm_fox() { printf("INFO: Reset Count: %d Uptime since Reset: %ld \n", reset_count, uptime); #endif fclose(uptime_file); - +*/ +/* if (sim_mode) { // simulated telemetry double time = ((long int)millis() - time_start) / 1000.0; @@ -1318,14 +1523,10 @@ void get_tlm_fox() { else { int count1; char * token; -// char cmdbuffer[1000]; -/**/ -// FILE * file = popen(pythonStr, "r"); fputc('\n', file1); fgets(cmdbuffer, 1000, file1); fprintf(stderr, "Python read Result: %s\n", cmdbuffer); -// pclose(file); -/**/ + const char space[2] = " "; token = strtok(cmdbuffer, space); @@ -1347,10 +1548,6 @@ void get_tlm_fox() { } } } - // printf("\n"); - -// sleep(0.5); -// printf("Sleep over\n"); batteryVoltage = voltage[map[BAT]]; batteryCurrent = current[map[BAT]]; @@ -1382,14 +1579,6 @@ void get_tlm_fox() { char c; - /* - int charss = (char) serialDataAvail(uart_fd); - if (charss != 0) - printf("Clearing buffer of %d chars \n", charss); - while ((charss--> 0)) - c = (char) serialGetchar(uart_fd); // clear buffer -*/ - unsigned int waitTime; int i, end, trys = 0; sensor_payload[0] = 0; @@ -1461,6 +1650,9 @@ void get_tlm_fox() { } } } + +*/ + // if (mode == FSK) { // just moved for (int count1 = 0; count1 < 8; count1++) { From 382f8076db0a101a4ebda5304dcdc2d4b0f17f53 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 17:19:51 -0400 Subject: [PATCH 02/11] moved variable definitions --- afsk/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 91b7f936..c3cbb595 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -120,6 +120,7 @@ float amplitude; // = ; // 20000; // 32767/(10%amp+5%amp+100%amp) float freq_Hz = 3000; // 1200 short int sin_samples; short int sin_map[16]; +int STEMBoardFailure = 1; int smaller; int flip_ctr = 0; @@ -146,6 +147,7 @@ int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onL float voltageThreshold = 3.5, batteryVoltage = 4.5, batteryCurrent = 0, currentThreshold = 100; float latitude = 39.027702f, longitude = -77.078064f; float lat_file, long_file; +double cpuTemp; 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; @@ -772,7 +774,7 @@ int main(int argc, char * argv[]) { FILE * cpuTempSensor = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); if (cpuTempSensor) { - double cpuTemp; + // double cpuTemp; fscanf(cpuTempSensor, "%lf", & cpuTemp); cpuTemp /= 1000; @@ -1378,7 +1380,7 @@ void get_tlm_fox() { short int rs_frame[rsFrames][223]; unsigned char parities[rsFrames][parityLen], inputByte; - int id, frm_type = 0x01, STEMBoardFailure = 1, NormalModeFailure = 0, groundCommandCount = 0; + int id, frm_type = 0x01, NormalModeFailure = 0, groundCommandCount = 0; int PayloadFailure1 = 0, PayloadFailure2 = 0; int PSUVoltage = 0, PSUCurrent = 0, Resets = 0, Rssi = 2048; int batt_a_v = 0, batt_b_v = 0, batt_c_v = 0, battCurr = 0; From 643998c424000c0a4fd91dc780c7444be11dcd55 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:11:49 -0400 Subject: [PATCH 03/11] firstTime for real --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index c3cbb595..d4d9abf2 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2204,7 +2204,7 @@ void get_tlm_fox() { printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - if ((mode == BPSK) && (firstTime = 1)) // only do first time + if ((mode == BPSK) && (firstTime == 1)) // only do first time { start = millis(); // send frame twice sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From 0aa9a12daf6d29ad281cb1928cddcbb3355b81db Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:20:31 -0400 Subject: [PATCH 04/11] 3x first time --- afsk/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/afsk/main.c b/afsk/main.c index d4d9abf2..ad54bf56 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2216,6 +2216,16 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 4 %d ms bytes: %d \n\n", millis() - start, sock_ret); } + start = millis(); // send frame twice + sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); + printf("socket send 5 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); + + if (sock_ret < (ctr * 2 + 2)) { + // printf("Not resending\n"); + sleep(0.5); + sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); + printf("socket send 6 %d ms bytes: %d \n\n", millis() - start, sock_ret); + } } if (sock_ret == -1) { From 13b6a2c55b37efc09c44433b92e67a8dd11efbe3 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:26:14 -0400 Subject: [PATCH 05/11] back to twice every time --- afsk/main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index ad54bf56..eb3b8991 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2204,7 +2204,7 @@ void get_tlm_fox() { printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - if ((mode == BPSK) && (firstTime == 1)) // only do first time + if ((mode == BPSK)) // && (firstTime == 1)) // only do first time { start = millis(); // send frame twice sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); @@ -2216,16 +2216,6 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 4 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - start = millis(); // send frame twice - sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); - printf("socket send 5 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); - - if (sock_ret < (ctr * 2 + 2)) { - // printf("Not resending\n"); - sleep(0.5); - sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); - printf("socket send 6 %d ms bytes: %d \n\n", millis() - start, sock_ret); - } } if (sock_ret == -1) { From 74f1b5606969c53bdf6f48771e9282e033c1c690 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:33:56 -0400 Subject: [PATCH 06/11] and 1st time 2x only --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index eb3b8991..d4d9abf2 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2204,7 +2204,7 @@ void get_tlm_fox() { printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - if ((mode == BPSK)) // && (firstTime == 1)) // only do first time + if ((mode == BPSK) && (firstTime == 1)) // only do first time { start = millis(); // send frame twice sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From 0d9bb0371aea1dc1ad2082f6731c1b2695bc567d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:47:47 -0400 Subject: [PATCH 07/11] changed to sleep(3.0) --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index d4d9abf2..eb26502d 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1428,7 +1428,8 @@ void get_tlm_fox() { sleep((unsigned int)sleepTime); */ // if (mode == FSK) - sleep(2.3); // No sleep at all! + sleep(3.0); // 2.3); // No sleep at all! + printf("Sleep time 3.0"); // else // sleep(1.3); From 6545f632e20564911b9101cd0559c8dd5a6a65de Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 20:55:13 -0400 Subject: [PATCH 08/11] 3.1 --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index eb26502d..dd0e4c70 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1428,7 +1428,7 @@ void get_tlm_fox() { sleep((unsigned int)sleepTime); */ // if (mode == FSK) - sleep(3.0); // 2.3); // No sleep at all! + sleep(3.1); // 2.3); // No sleep at all! printf("Sleep time 3.0"); // else // sleep(1.3); From 60838506895f51dcf6a5ace03a54d11d516fd742 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 21:02:02 -0400 Subject: [PATCH 09/11] sleep(2.9) --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index dd0e4c70..0fab305d 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1428,7 +1428,7 @@ void get_tlm_fox() { sleep((unsigned int)sleepTime); */ // if (mode == FSK) - sleep(3.1); // 2.3); // No sleep at all! + sleep(2.9); // 2.3); // No sleep at all! printf("Sleep time 3.0"); // else // sleep(1.3); From 9a350b97c7f85d07438c830d26c435425a41409b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 21:07:48 -0400 Subject: [PATCH 10/11] 2.95 --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 0fab305d..b491b03a 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1428,7 +1428,7 @@ void get_tlm_fox() { sleep((unsigned int)sleepTime); */ // if (mode == FSK) - sleep(2.9); // 2.3); // No sleep at all! + sleep(2.95); // 2.3); // No sleep at all! printf("Sleep time 3.0"); // else // sleep(1.3); From 514b709469dfd961c3909f17a0384ed654dd12d8 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 16 Jun 2021 21:08:51 -0400 Subject: [PATCH 11/11] printf --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index b491b03a..3fb6d2e4 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1429,7 +1429,7 @@ void get_tlm_fox() { */ // if (mode == FSK) sleep(2.95); // 2.3); // No sleep at all! - printf("Sleep time 3.0"); + printf("Sleep time 2.95\n"); // else // sleep(1.3);