From c4e61feb704f994bff6f6416e4a012704eec2cf0 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 08:59:56 -0400 Subject: [PATCH 01/46] use frameTime to determine sleep length --- afsk/main.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index d19fd70b..ed8f7dd7 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -148,6 +148,7 @@ float voltageThreshold = 3.5, batteryVoltage = 4.5, batteryCurrent = 0, currentT float latitude = 39.027702f, longitude = -77.078064f; float lat_file, long_file; double cpuTemp; +int frameTime; 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; @@ -580,9 +581,11 @@ int main(int argc, char * argv[]) { samplePeriod = (int) (((float)((syncBits + 10 * (headerLen + rsFrames * (rsFrameLen + parityLen)))) / (float) bitRate) * 1000 - 500); sleepTime = 0.1f; - - printf("\n FSK Mode, %d bits per frame, %d bits per second, %f seconds per frame, %d ms sample period\n", - bufLen / (samples * frameCnt), bitRate, (float)((float)bufLen / (samples * frameCnt * bitRate)), samplePeriod); + + frameTime = ((float)((float)bufLen / (samples * frameCnt * bitRate))) * 1000; // frame time in ms + + printf("\n FSK Mode, %d bits per frame, %d bits per second, %d ms per frame, %d ms sample period\n", + bufLen / (samples * frameCnt), bitRate, frameTime, samplePeriod); } else if (mode == BPSK) { bitRate = 1200; rsFrames = 3; @@ -602,9 +605,11 @@ int main(int argc, char * argv[]) { // sleepTime = 3.0; samplePeriod = 2200; // reduce dut to python and sensor querying delays sleepTime = 2.2f; + + frameTime = ((float)((float)bufLen / (samples * frameCnt * bitRate))) * 1000; // frame time in ms - printf("\n BPSK Mode, bufLen: %d, %d bits per frame, %d bits per second, %f seconds per frame %d ms sample period\n", - bufLen, bufLen / (samples * frameCnt), bitRate, (float)((float)bufLen / (samples * frameCnt * bitRate)), samplePeriod); + printf("\n BPSK Mode, bufLen: %d, %d bits per frame, %d bits per second, %d ms per frame %d ms sample period\n", + bufLen, bufLen / (samples * frameCnt), bitRate, frameTime, samplePeriod); sin_samples = S_RATE/freq_Hz; // printf("Sin map: "); @@ -1397,10 +1402,16 @@ void get_tlm_fox() { if (firstTime != ON) { // delay for sample period -/* - while ((millis() - sampleTime) < (unsigned int)samplePeriod) - sleep((unsigned int)sleepTime); -*/ +/**/ +// while ((millis() - sampleTime) < (unsigned int)samplePeriod) + while ((millis() - sampleTime) < (unsigned int)frameTime) + sleep(0.25); +// sleep((unsigned int)sleepTime); +/**/ + +/* + // most recent sleep code + if (mode == FSK) { sleep(2.3); // printf("Sleep time 2.3\n"); @@ -1409,8 +1420,8 @@ void get_tlm_fox() { sleep(2.95); // 2.3); printf("Sleep time 2.95\n"); } - -// printf("Sample period: %d\n", millis() - (unsigned int)sampleTime); +*/ + printf("Sample period: %d\n", millis() - (unsigned int)frameTime); sampleTime = (unsigned int) millis(); } else From 41b8756a01e86bb5a6e6c151b8e41aa656296164 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:05:30 -0400 Subject: [PATCH 02/46] changed printf to Sleep period --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index ed8f7dd7..9698c52a 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1421,7 +1421,7 @@ void get_tlm_fox() { printf("Sleep time 2.95\n"); } */ - printf("Sample period: %d\n", millis() - (unsigned int)frameTime); + printf("Sleep period: %d\n", ((millis() - sampleTime) < (unsigned int)frameTime)); sampleTime = (unsigned int) millis(); } else From 95d94385f699052df1100dfd9582a16f03b19e6b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:09:59 -0400 Subject: [PATCH 03/46] fixed sleep period, reduced sleep by 0.1 (100 ms) --- afsk/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 9698c52a..eabfbb91 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1404,7 +1404,8 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) - while ((millis() - sampleTime) < (unsigned int)frameTime) + int startSleep = millis(); + while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) sleep(0.25); // sleep((unsigned int)sleepTime); /**/ @@ -1421,7 +1422,7 @@ void get_tlm_fox() { printf("Sleep time 2.95\n"); } */ - printf("Sleep period: %d\n", ((millis() - sampleTime) < (unsigned int)frameTime)); + printf("Sleep period: %d\n", millis() - startSleep); sampleTime = (unsigned int) millis(); } else From 9a0b27f2a6f2ce3116fb5db84e07992393b21a88 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:15:05 -0400 Subject: [PATCH 04/46] changed sleep(0.5) --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index eabfbb91..c52ea7c3 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1406,7 +1406,7 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) - sleep(0.25); + sleep(0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From a943a57ba632d4dd2a139e28024de0abbbbc8911 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:18:13 -0400 Subject: [PATCH 05/46] send twice first time for FSK too --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index c52ea7c3..9684beb0 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2193,7 +2193,8 @@ 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 + if (firstTime == 1) // only do first time { start = millis(); // send frame twice sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From 9e9cf30e077ce604a73e1a6e7558e7e990b0f416 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:24:43 -0400 Subject: [PATCH 06/46] only continue firstTime if socket open --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 9684beb0..2ca4db46 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2221,7 +2221,8 @@ void get_tlm_fox() { // digitalWrite (0, HIGH); // if (mode == FSK) - firstTime = 0; + if (socket_open == 1) + firstTime = 0; // else if (frames_sent > 0) //5) // firstTime = 0; From 33df7a74556b556e964406e15ff3f1fa336e6e4b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:39:58 -0400 Subject: [PATCH 07/46] send frame 3 times --- afsk/main.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 2ca4db46..f604374e 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2196,7 +2196,7 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { - start = millis(); // send frame twice + start = millis(); // send frame three times sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); printf("socket send 3 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); @@ -2206,6 +2206,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 3d830067db64de361c9f649803002303de09ecc1 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 09:49:16 -0400 Subject: [PATCH 08/46] added for loop for sending 5 times first time --- afsk/main.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index f604374e..6adbd623 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2195,27 +2195,20 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time - { - start = millis(); // send frame three times - sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); - printf("socket send 3 %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 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); - } + { + for (int times = 0; times < 6; times++) + { + start = millis(); // send frame three times + sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); + printf("socket send %d in %d ms bytes: %d \n\n",times, (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 resend %d in %d ms bytes: %d \n\n",times, millis() - start, sock_ret); + } + } } if (sock_ret == -1) { From e0c16cca58f2f8a206816f3a3ef7386f826e679d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 10:01:33 -0400 Subject: [PATCH 09/46] reducing frameTime by 0.5 instead of 0.1 --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 6adbd623..aab6c507 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1405,7 +1405,7 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); - while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) + while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 sleep(0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From c9777087447924375f0d99891c4ef8769d5c12cf Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 10:52:26 -0400 Subject: [PATCH 10/46] try sleep(1.0) --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index aab6c507..e78d0225 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1406,7 +1406,7 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 - sleep(0.5); // 25); + sleep(1.0); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From 0f5f521ebba1050920087e7e1bee24cfbd6c0fd8 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 10:58:40 -0400 Subject: [PATCH 11/46] try initial sleep(4.0) then while sleep(0.1) --- afsk/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index e78d0225..794333ab 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1405,8 +1405,10 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); - while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 - sleep(1.0); // 0.5); // 25); + if ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 + sleep(4.0); // 0.5); // 25); // initial period + while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 + sleep(0.1); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From cacb17b43aa29f0933fabe0acd6f38c576c30b49 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:06:52 -0400 Subject: [PATCH 12/46] trying 6 times at start and sleep(3.8) fixed --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 794333ab..93f03931 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1406,7 +1406,7 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 - sleep(4.0); // 0.5); // 25); // initial period + sleep(3.8); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 sleep(0.1); // 0.5); // 25); // sleep((unsigned int)sleepTime); @@ -2198,7 +2198,7 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { - for (int times = 0; times < 6; times++) + for (int times = 0; times < 7; times++) // FSK 4 worked, trying 6 for BPSK { start = millis(); // send frame three times sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From bdb0786c8a9c47335e6e2cff8f08d1e41b5a88f4 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:12:10 -0400 Subject: [PATCH 13/46] 12 times at start? --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 93f03931..53427aa5 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2198,7 +2198,7 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { - for (int times = 0; times < 7; times++) // FSK 4 worked, trying 6 for BPSK + for (int times = 0; times < 12; times++) // FSK 4 worked, trying 6 for BPSK { start = millis(); // send frame three times sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From 63753b29ffdc35497062ea130e7548f9ca0f4b2b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:19:23 -0400 Subject: [PATCH 14/46] if 500ms at start, exit for loop --- afsk/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 53427aa5..0d835728 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1408,7 +1408,7 @@ void get_tlm_fox() { if ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 sleep(3.8); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 - sleep(0.1); // 0.5); // 25); + sleep(0.25); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ @@ -2203,6 +2203,11 @@ void get_tlm_fox() { start = millis(); // send frame three times sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); printf("socket send %d in %d ms bytes: %d \n\n",times, (unsigned int)millis() - start, sock_ret); + + if ((millis() - start) > 500) { + printf("Buffer filled!\n"); + break; + } if (sock_ret < (ctr * 2 + 2)) { // printf("Not resending\n"); From 44b370a74096d62d801b33d741c7ff775ff9632d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:30:39 -0400 Subject: [PATCH 15/46] BPSK 4 times at start --- afsk/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 0d835728..1594b5a5 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2198,14 +2198,14 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { - for (int times = 0; times < 12; times++) // FSK 4 worked, trying 6 for BPSK + for (int times = 0; times < 4; times++) // FSK 4 worked, trying 6 for BPSK { - start = millis(); // send frame three times + start = millis(); // send frame until buffer fills sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); - printf("socket send %d in %d ms bytes: %d \n\n",times, (unsigned int)millis() - start, sock_ret); + printf("socket send %d in %d ms bytes: %d \n\n",times + 1, (unsigned int)millis() - start, sock_ret); if ((millis() - start) > 500) { - printf("Buffer filled!\n"); + printf("Buffer over filled!\n"); break; } From 1f56695531679810cad784cf65a86978bc75587b Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:35:18 -0400 Subject: [PATCH 16/46] try frameTime - 100 instead of 500 --- afsk/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 1594b5a5..9edb3b25 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1405,9 +1405,9 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); - if ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 + if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK sleep(3.8); // 0.5); // 25); // initial period - while ((millis() - sampleTime) < ((unsigned int)frameTime - 500)) // was 100 + while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 sleep(0.25); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ @@ -2202,7 +2202,7 @@ void get_tlm_fox() { { start = millis(); // send frame until buffer fills sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); - printf("socket send %d in %d ms bytes: %d \n\n",times + 1, (unsigned int)millis() - start, sock_ret); + printf("socket send %d in %d ms bytes: %d \n\n",times + 2, (unsigned int)millis() - start, sock_ret); if ((millis() - start) > 500) { printf("Buffer over filled!\n"); From 4a5f707cd8fa6a3025a28b0db75a2fdb69f8cdf2 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 11:44:09 -0400 Subject: [PATCH 17/46] reset sampleTime when doing firstTme filling --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 9edb3b25..7bd2c829 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2215,7 +2215,8 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket resend %d in %d ms bytes: %d \n\n",times, millis() - start, sock_ret); } - } + } + sampleTime = (unsigned int) millis(); // resetting time for sleeping } if (sock_ret == -1) { From 1639ee7ad51a48f01e5e5d23844b8c7e23330921 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:00:01 -0400 Subject: [PATCH 18/46] added delay after socket refused, flushes --- afsk/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/afsk/main.c b/afsk/main.c index 7bd2c829..aab656a4 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -643,6 +643,7 @@ int main(int argc, char * argv[]) { fclose(uptime_file); printf("++++ Loop time: %5.3f sec +++++\n", (millis() - loopTime)/1000.0); + fflush(stdout); loopTime = millis(); if (sim_mode) { // simulated telemetry @@ -1412,6 +1413,9 @@ void get_tlm_fox() { // sleep((unsigned int)sleepTime); /**/ +// if ((millis() - sampleTime) < 500) // incomplete + + /* // most recent sleep code @@ -1425,6 +1429,7 @@ void get_tlm_fox() { } */ printf("Sleep period: %d\n", millis() - startSleep); + fflush(stdout); sampleTime = (unsigned int) millis(); } else @@ -2174,6 +2179,7 @@ void get_tlm_fox() { printf("\nConnection Failed \n"); printf("Error: %s \n", strerror(errno)); error = 1; + sleep(2.0); // sleep if socket connection refused } if (error == 1) ; //rpitxStatus = -1; @@ -2187,6 +2193,7 @@ void get_tlm_fox() { start = millis(); int sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); printf("socket send 1 %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); + fflush(stdout); if (sock_ret < (ctr * 2 + 2)) { // printf("Not resending\n"); @@ -2217,6 +2224,7 @@ void get_tlm_fox() { } } sampleTime = (unsigned int) millis(); // resetting time for sleeping + fflush(stdout); } if (sock_ret == -1) { From e33b160d7e2e3ee8672341fcaee602b63e054508 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:09:05 -0400 Subject: [PATCH 19/46] max for times of sending, 4 for BPSK, 6 for FSK --- afsk/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index aab656a4..b01c7d18 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2204,8 +2204,14 @@ void get_tlm_fox() { // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time - { - for (int times = 0; times < 4; times++) // FSK 4 worked, trying 6 for BPSK + { + int max; + if (mode == FSK) + max = 6; + else + mex = 4; + + for (int times = 0; times < max; times++) { start = millis(); // send frame until buffer fills sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); From 932d803da78310aeb8979afe63f4b1ba97c76155 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:11:49 -0400 Subject: [PATCH 20/46] max typo --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index b01c7d18..bb3b6591 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2209,7 +2209,7 @@ void get_tlm_fox() { if (mode == FSK) max = 6; else - mex = 4; + max = 4; for (int times = 0; times < max; times++) { From 713c605f456049988a920c39510ac7c09b823f2e Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:28:32 -0400 Subject: [PATCH 21/46] Send Max and Min every 16 packets instead of 8 for FSK --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index bb3b6591..0a3f690f 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1676,7 +1676,7 @@ void get_tlm_fox() { } if (mode == FSK) { - if (loop % 8 == 0) { + if (loop % 16 == 0) { // was 8 printf("Sending MIN frame \n"); frm_type = 0x03; for (int count1 = 0; count1 < 17; count1++) { @@ -1690,7 +1690,7 @@ void get_tlm_fox() { sensor[count1] = sensor_min[count1]; } } - if ((loop + 4) % 8 == 0) { + if ((loop + 8) % 16 == 0) { // was 8 printf("Sending MAX frame \n"); frm_type = 0x02; for (int count1 = 0; count1 < 17; count1++) { From 11f9bffffe8bc38ffa84d9200d1a2bf5ee0b7b1e Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:35:50 -0400 Subject: [PATCH 22/46] send twice all the time --- afsk/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/afsk/main.c b/afsk/main.c index 0a3f690f..d7bd45cc 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2201,7 +2201,17 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } + start = millis(); + int sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); + printf("socket send 1a %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); + fflush(stdout); + 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 2a %d ms bytes: %d \n\n", millis() - start, sock_ret); + } // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { From 88c25bf4ab6dc6bed6eb2259515fbe169ca7e11c Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:37:13 -0400 Subject: [PATCH 23/46] typo --- afsk/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index d7bd45cc..95e3b301 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2201,8 +2201,9 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - start = millis(); - int sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); + if (mode == BPSK) { + start = millis(); + sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); printf("socket send 1a %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); fflush(stdout); @@ -2211,7 +2212,8 @@ void get_tlm_fox() { sleep(0.5); sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 2a %d ms bytes: %d \n\n", millis() - start, sock_ret); - } + } + } // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { From 972a5295342527f4cfe56255bc1aea35dd70ff94 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 13:56:36 -0400 Subject: [PATCH 24/46] back to send once --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 95e3b301..6c037b2c 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2201,7 +2201,7 @@ void get_tlm_fox() { sock_ret = send(sock, &buffer[sock_ret], (unsigned int)(ctr * 2 + 2 - sock_ret), 0); printf("socket send 2 %d ms bytes: %d \n\n", millis() - start, sock_ret); } - if (mode == BPSK) { +/* if (mode == BPSK) { start = millis(); sock_ret = send(sock, buffer, (unsigned int)(ctr * 2 + 2), 0); printf("socket send 1a %d ms bytes: %d \n\n", (unsigned int)millis() - start, sock_ret); @@ -2214,6 +2214,7 @@ void get_tlm_fox() { printf("socket send 2a %d ms bytes: %d \n\n", millis() - start, sock_ret); } } +*/ // if ((mode == BPSK) && (firstTime == 1)) // only do first time if (firstTime == 1) // only do first time { From 7770c58e301ddb9b2873b469c75f886a5368b899 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 14:11:11 -0400 Subject: [PATCH 25/46] just test to see if less than 500 ms, sleep 4.0 --- afsk/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 6c037b2c..70d235f7 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1403,7 +1403,7 @@ void get_tlm_fox() { if (firstTime != ON) { // delay for sample period -/**/ +/* // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK @@ -1411,10 +1411,10 @@ void get_tlm_fox() { while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 sleep(0.25); // 0.5); // 25); // sleep((unsigned int)sleepTime); -/**/ +*/ -// if ((millis() - sampleTime) < 500) // incomplete - + if ((millis() - sampleTime) < 500) // + sleep(4.0); /* // most recent sleep code From 56975eafefdd7e04905830cf6a2cf0ddfd840a0d Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 18 Jun 2021 14:14:11 -0400 Subject: [PATCH 26/46] typo --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 70d235f7..30bfafca 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1427,10 +1427,10 @@ void get_tlm_fox() { sleep(2.95); // 2.3); printf("Sleep time 2.95\n"); } -*/ + printf("Sleep period: %d\n", millis() - startSleep); fflush(stdout); - +*/ sampleTime = (unsigned int) millis(); } else printf("first time - no sleep\n"); From 1c9194e5ec86f751f87920c1f8fb1b7329058f19 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 09:07:57 -0400 Subject: [PATCH 27/46] 5 times plus sleep 2.3 for FSK --- afsk/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 30bfafca..968b81ae 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1414,8 +1414,10 @@ void get_tlm_fox() { */ if ((millis() - sampleTime) < 500) // - sleep(4.0); - + if (mode == BPSK) + sleep(4.0); + else // FSK + sleep(2.3); /* // most recent sleep code @@ -2220,7 +2222,7 @@ void get_tlm_fox() { { int max; if (mode == FSK) - max = 6; + max = 5; // was 6 else max = 4; From 0311e0b2535352f29bbd46c0ad2f06759dfac686 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 09:14:17 -0400 Subject: [PATCH 28/46] always sleep 2.3 for FSK --- afsk/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 968b81ae..ea13d2dc 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1416,8 +1416,9 @@ void get_tlm_fox() { if ((millis() - sampleTime) < 500) // if (mode == BPSK) sleep(4.0); - else // FSK - sleep(2.3); +// else // FSK + if (mode == FSK) + sleep(2.3); /* // most recent sleep code From 6377e56925c8297045807b4f5d1b71c46dc1a093 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 20:23:13 -0400 Subject: [PATCH 29/46] added CPUQuota 5% --- systemd/cubesatsim.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemd/cubesatsim.service b/systemd/cubesatsim.service index 5fc952d0..213fdfea 100644 --- a/systemd/cubesatsim.service +++ b/systemd/cubesatsim.service @@ -9,6 +9,8 @@ StandardOutput=inherit StandardError=inherit Restart=always User=pi +CPUAccounting=true +CPUQuota=5% [Install] WantedBy=default.target From 1812a43cba7351b06cf12c235582d3fd92a066e5 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 20:30:44 -0400 Subject: [PATCH 30/46] max min to 32 --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index ea13d2dc..c3649369 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1679,7 +1679,7 @@ void get_tlm_fox() { } if (mode == FSK) { - if (loop % 16 == 0) { // was 8 + if (loop % 32 == 0) { // was 8 printf("Sending MIN frame \n"); frm_type = 0x03; for (int count1 = 0; count1 < 17; count1++) { @@ -1693,7 +1693,7 @@ void get_tlm_fox() { sensor[count1] = sensor_min[count1]; } } - if ((loop + 8) % 16 == 0) { // was 8 + if ((loop + 16) % 32 == 0) { // was 8 printf("Sending MAX frame \n"); frm_type = 0x02; for (int count1 = 0; count1 < 17; count1++) { From 6be0dbf3d1a4832d409bb1a41a2a4833c491948c Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 22:48:28 -0400 Subject: [PATCH 31/46] added back in frameTime sleeping for both FSK and BPSK --- afsk/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index c3649369..2914ae11 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1403,22 +1403,24 @@ void get_tlm_fox() { if (firstTime != ON) { // delay for sample period -/* +/**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK sleep(3.8); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 - sleep(0.25); // 0.5); // 25); + sleep(0.1); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); -*/ +/**/ +/* if ((millis() - sampleTime) < 500) // if (mode == BPSK) sleep(4.0); // else // FSK if (mode == FSK) sleep(2.3); +*/ /* // most recent sleep code From e2f2d49582fa1e39ab92270661ace76e817ad8a3 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 23:02:35 -0400 Subject: [PATCH 32/46] Update main.c --- afsk/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 2914ae11..ae85aba8 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1407,9 +1407,9 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK - sleep(3.8); // 0.5); // 25); // initial period + sleep(3.5); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 - sleep(0.1); // 25); // 0.5); // 25); + sleep(0.25); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ @@ -1432,10 +1432,10 @@ void get_tlm_fox() { sleep(2.95); // 2.3); printf("Sleep time 2.95\n"); } - +*/ printf("Sleep period: %d\n", millis() - startSleep); fflush(stdout); -*/ + sampleTime = (unsigned int) millis(); } else printf("first time - no sleep\n"); From d5d9303ffd82a58721b6ddd0766f304b1c3463d2 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sat, 19 Jun 2021 23:11:03 -0400 Subject: [PATCH 33/46] 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 ae85aba8..0fce7065 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1407,7 +1407,7 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK - sleep(3.5); // 0.5); // 25); // initial period + sleep(2.5); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 sleep(0.25); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); From aabb4066cef237d56e89a1de00207263a425cd06 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 05:39:53 -0400 Subject: [PATCH 34/46] sleep 2 and - 250 --- afsk/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 0fce7065..fd98280b 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -600,10 +600,10 @@ int main(int argc, char * argv[]) { samples = S_RATE / bitRate; bufLen = (frameCnt * (syncBits + 10 * (headerLen + rsFrames * (rsFrameLen + parityLen))) * samples); - // samplePeriod = ((float)((syncBits + 10 * (headerLen + rsFrames * (rsFrameLen + parityLen))))/(float)bitRate) * 1000 - 1800; + samplePeriod = ((float)((syncBits + 10 * (headerLen + rsFrames * (rsFrameLen + parityLen))))/(float)bitRate) * 1000 - 1800; // samplePeriod = 3000; // sleepTime = 3.0; - samplePeriod = 2200; // reduce dut to python and sensor querying delays + //samplePeriod = 2200; // reduce dut to python and sensor querying delays sleepTime = 2.2f; frameTime = ((float)((float)bufLen / (samples * frameCnt * bitRate))) * 1000; // frame time in ms @@ -1406,9 +1406,9 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); - if ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 500 for FSK - sleep(2.5); // 0.5); // 25); // initial period - while ((millis() - sampleTime) < ((unsigned int)frameTime - 100)) // was 100 + if ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 100 500 for FSK + sleep(2.0); // 0.5); // 25); // initial period + while ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 100 sleep(0.25); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From bcc9e49d4145aeea641ca07995cc08397b945348 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 09:42:37 -0400 Subject: [PATCH 35/46] sleep 0.1 --- afsk/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index fd98280b..2e07e6ae 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -1406,10 +1406,10 @@ void get_tlm_fox() { /**/ // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); - if ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 100 500 for FSK + if ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 250 100 500 for FSK sleep(2.0); // 0.5); // 25); // initial period - while ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 100 - sleep(0.25); // 25); // 0.5); // 25); + while ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 250 100 + sleep(0.1); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); /**/ From 2bbd9489ff87f8d6ea5639345aad2dd7eae9e047 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 10:33:21 -0400 Subject: [PATCH 36/46] fill buffer every 32 samples --- afsk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 2e07e6ae..4f30530f 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2221,8 +2221,8 @@ void get_tlm_fox() { } */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time - if (firstTime == 1) // only do first time - { +// if (firstTime == 1) // only do first time + if ((firstTime == 1) || ((loop_count % 32) == 0)) // do first time and every 32 samples { int max; if (mode == FSK) max = 5; // was 6 From cb28bc05bc77c44c50ee63a9ffd38adbc5aea8f6 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 10:35:32 -0400 Subject: [PATCH 37/46] typo --- afsk/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 4f30530f..d72f8d73 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,8 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count % 32) == 0)) // do first time and every 32 samples { + if ((firstTime == 1) || ((loop_count % 32) == 0)) // do first time and every 32 samples + { int max; if (mode == FSK) max = 5; // was 6 From cc8c1a8e34f24b66c0004bfcb4f19cc61d18909a Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 10:40:28 -0400 Subject: [PATCH 38/46] increment loop_count --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index d72f8d73..44d487d1 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count % 32) == 0)) // do first time and every 32 samples + if ((firstTime == 1) || ((loop_count++ % 32) == 0)) // do first time and every 32 samples { int max; if (mode == FSK) From 21cd65031c5da43d9559266aad57c66d7054493e Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 11:01:29 -0400 Subject: [PATCH 39/46] reduce max by 1 --- afsk/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 44d487d1..2e2be182 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2226,7 +2226,10 @@ void get_tlm_fox() { { int max; if (mode == FSK) - max = 5; // was 6 + if (firstTime == 1) + max = 4; // 5; // was 6 + else + max = 3; else max = 4; From 97f8e373fffb8dbec9d51a4aa6dbce0d2721bbf1 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 11:10:01 -0400 Subject: [PATCH 40/46] 128 loop reset --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 2e2be182..83c7fe94 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count++ % 32) == 0)) // do first time and every 32 samples + if ((firstTime == 1) || ((loop_count++ % 128) == 0)) // do first time and every 32 samples { int max; if (mode == FSK) From 61d2f67a04d1812febadf4a27f52fb3ad390671e Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 11:39:45 -0400 Subject: [PATCH 41/46] every 360 samples --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 83c7fe94..445e248e 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count++ % 128) == 0)) // do first time and every 32 samples + if ((firstTime == 1) || ((loop_count++ % 360) == 0)) // do first time and was every 128 samples { int max; if (mode == FSK) From afa3fb1999ad036a4d564092920be185d1a8785f Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 12:05:15 -0400 Subject: [PATCH 42/46] 180 samples --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index 445e248e..9fca9052 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count++ % 360) == 0)) // do first time and was every 128 samples + if ((firstTime == 1) || ((loop_count++ % 180) == 0)) // do first time and was every 180 samples { int max; if (mode == FSK) From 78f83a483ff6afd096c23560882a4de9c3e322f1 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 12:30:58 -0400 Subject: [PATCH 43/46] BPSK in 80 frames --- afsk/main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 9fca9052..bcaf11c4 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count++ % 180) == 0)) // do first time and was every 180 samples + if ((firstTime == 1) || (((loop_count++ % 180) == 0) && (mode = FSK)) || ((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples { int max; if (mode == FSK) @@ -2230,9 +2230,12 @@ void get_tlm_fox() { max = 4; // 5; // was 6 else max = 3; - else - max = 4; - + else + if (firstTime == 1) + max = 5; // 5; // was 6 + else + max = 4; + for (int times = 0; times < max; times++) { start = millis(); // send frame until buffer fills @@ -2253,6 +2256,8 @@ void get_tlm_fox() { } sampleTime = (unsigned int) millis(); // resetting time for sleeping fflush(stdout); +// if (firstTime == 1) +// max -= 1; } if (sock_ret == -1) { From 41bfbcaea4ecbaa87d2b2846557f8afbf0251566 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 12:32:21 -0400 Subject: [PATCH 44/46] typo ( --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index bcaf11c4..c9e7850a 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || (((loop_count++ % 180) == 0) && (mode = FSK)) || ((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples + if ((firstTime == 1) || ((loop_count++ % 180) == 0) && (mode = FSK)) || ((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples { int max; if (mode == FSK) From ae2eaa5fc36f0e0c1a07af824cf6febfaeafcbaa Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 12:35:55 -0400 Subject: [PATCH 45/46] fix () --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index c9e7850a..c1cf6ed3 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || ((loop_count++ % 180) == 0) && (mode = FSK)) || ((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples + if ((firstTime == 1) || (((loop_count++ % 180) == 0) && (mode = FSK)) || (((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples { int max; if (mode == FSK) From 41d2c44e67cd08f3e0e3dc8355c797e4a45eed5a Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Sun, 20 Jun 2021 13:45:18 -0400 Subject: [PATCH 46/46] == bug --- afsk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/main.c b/afsk/main.c index c1cf6ed3..d896f0c9 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -2222,7 +2222,7 @@ void get_tlm_fox() { */ // if ((mode == BPSK) && (firstTime == 1)) // only do first time // if (firstTime == 1) // only do first time - if ((firstTime == 1) || (((loop_count++ % 180) == 0) && (mode = FSK)) || (((loop_count++ % 80) == 0) && (mode = BPSK))) // do first time and was every 180 samples + if ((firstTime == 1) || (((loop_count++ % 180) == 0) && (mode == FSK)) || (((loop_count++ % 80) == 0) && (mode == BPSK))) // do first time and was every 180 samples { int max; if (mode == FSK)