DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix control flow for time sync sequence indexing

Browse Source
This commit is contained in:
Klaus K Wilting 2020-10-09 21:43:53 +02:00
parent e3858eceef
commit 2375d4943e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/timesync.cpp
View File

@ -29,7 +29,7 @@ static uint32_t timesync_timestamp[TIME_SYNC_SAMPLES][no_of_timestamps];
static TaskHandle_t timeSyncProcTask; static TaskHandle_t timeSyncProcTask;
// create task for timeserver handshake processing, called from main.cpp // create task for timeserver handshake processing, called from main.cpp
void timesync_init() { void timesync_init(void) {
xTaskCreatePinnedToCore(timesync_processReq, // task function xTaskCreatePinnedToCore(timesync_processReq, // task function
"timesync_proc", // name of task "timesync_proc", // name of task
2048, // stack size of task 2048, // stack size of task
@ -69,8 +69,12 @@ void IRAM_ATTR timesync_processReq(void *taskparameter) {
// wait for kickoff // wait for kickoff
ulTaskNotifyTake(pdFALSE, portMAX_DELAY); ulTaskNotifyTake(pdFALSE, portMAX_DELAY);
// initialize flag and counters
timeSyncPending = true; timeSyncPending = true;
time_offset_ms = sample_idx = 0; time_offset_ms = sample_idx = 0;
if (++time_sync_seqNo > TIME_SYNC_MAX_SEQNO)
time_sync_seqNo = 0;
// wait until we are joined if we are not // wait until we are joined if we are not
while (!LMIC.devaddr) { while (!LMIC.devaddr) {
@ -111,9 +115,7 @@ void IRAM_ATTR timesync_processReq(void *taskparameter) {
timesync_timestamp[sample_idx][timesync_tx]; timesync_timestamp[sample_idx][timesync_tx];
#endif #endif
// increment sample_idx and time_sync_seqNo, keeping it in range // increment sample index
if (++time_sync_seqNo > TIME_SYNC_MAX_SEQNO)
time_sync_seqNo = 0;
sample_idx++; sample_idx++;
// if we are not in last cycle, pause until next cycle // if we are not in last cycle, pause until next cycle