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

timesync.cpp fixes

Browse Source
This commit is contained in:
Klaus K Wilting 2020-03-15 20:21:26 +01:00
parent 9abd0e7a07
commit 64b3a2c491
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/timesync.cpp
View File

@ -57,7 +57,8 @@ void timesync_request(void) {
// task for processing time sync request // task for processing time sync request
void IRAM_ATTR timesync_processReq(void *taskparameter) { void IRAM_ATTR timesync_processReq(void *taskparameter) {
uint32_t rcv_seqNo = TIME_SYNC_END_FLAG, time_offset_ms; uint32_t rcv_seqNo = TIME_SYNC_END_FLAG;
uint32_t time_offset_sec = 0, time_offset_ms = 0;
// this task is an endless loop, waiting in blocked mode, until it is // this task is an endless loop, waiting in blocked mode, until it is
// unblocked by timesync_request(). It then waits to be notified from // unblocked by timesync_request(). It then waits to be notified from
@ -88,13 +89,14 @@ void IRAM_ATTR timesync_processReq(void *taskparameter) {
SendPayload(TIMEPORT, prio_high); SendPayload(TIMEPORT, prio_high);
#elif (TIME_SYNC_LORAWAN) // ask network (requires LoRAWAN >= 1.0.3) #elif (TIME_SYNC_LORAWAN) // ask network (requires LoRAWAN >= 1.0.3)
LMIC_requestNetworkTime(timesync_serverAnswer, &time_sync_seqNo); LMIC_requestNetworkTime(timesync_serverAnswer, &time_sync_seqNo);
// trigger send to immediately get DevTimeAns on class A device // trigger to immediately get DevTimeAns from class A device
LMIC_sendAlive(); LMIC_sendAlive();
#endif #endif
// wait until a timestamp was received // wait until a timestamp was received
if (xTaskNotifyWait(0x00, ULONG_MAX, &rcv_seqNo, if (xTaskNotifyWait(0x00, ULONG_MAX, &rcv_seqNo,
pdMS_TO_TICKS(TIME_SYNC_TIMEOUT * 1000)) == pdFALSE) { pdMS_TO_TICKS(TIME_SYNC_TIMEOUT * 1000)) == pdFALSE) {
ESP_LOGW(TAG, "[%0.3f] Timesync aborted: timed out", millis() / 1000.0); ESP_LOGW(TAG, "[d%0.3f] Timesync aborted: timed out",
millis() / 1000.0);
goto Fail; // no timestamp received before timeout goto Fail; // no timestamp received before timeout
} }
@ -128,17 +130,20 @@ void IRAM_ATTR timesync_processReq(void *taskparameter) {
mask_user_IRQ(); mask_user_IRQ();
// calculate average time offset over the summed up difference // calculate average time offset over the summed up difference
// add msec from latest gateway time, and apply a compensation constant for
// processing times on node and gateway
time_offset_ms /= TIME_SYNC_SAMPLES; time_offset_ms /= TIME_SYNC_SAMPLES;
time_offset_ms +=
TIME_SYNC_FIXUP + timesync_timestamp[sample_idx - 1][gwtime_msec];
// calculate absolute UTC time: take latest timestamp received from // take latest timestamp received from gateway
// gateway, convert to whole seconds, round to ceil, add fraction seconds // and add time difference rounded to whole seconds
setMyTime(timesync_timestamp[sample_idx - 1][gwtime_sec] + time_offset_sec = timesync_timestamp[sample_idx - 1][gwtime_sec];
time_offset_ms / 1000, time_offset_sec += time_offset_ms / 1000;
time_offset_ms % 1000, _lora);
// add milliseconds from latest gateway time, and apply a compensation
// constant for processing times on node and gateway, strip full seconds
time_offset_ms += timesync_timestamp[sample_idx - 1][gwtime_msec];
time_offset_ms += TIME_SYNC_FIXUP;
time_offset_ms %= 1000;
setMyTime(time_offset_sec, time_offset_ms, _lora);
// send timesync end char to show timesync was successful // send timesync end char to show timesync was successful
payload.reset(); payload.reset();
@ -159,7 +164,7 @@ void IRAM_ATTR timesync_processReq(void *taskparameter) {
// store incoming timestamps // store incoming timestamps
void timesync_store(uint32_t timestamp, timesync_t timestamp_type) { void timesync_store(uint32_t timestamp, timesync_t timestamp_type) {
ESP_LOGD(TAG, "[%0.3f] seq#%d[%d]: timestamp(t%d)=%d", millis() / 1000.0, ESP_LOGD(TAG, "[%0.3f] seq#%d[%d]: t%d=%d", millis() / 1000.0,
time_sync_seqNo, sample_idx, timestamp_type, timestamp); time_sync_seqNo, sample_idx, timestamp_type, timestamp);
timesync_timestamp[sample_idx][timestamp_type] = timestamp; timesync_timestamp[sample_idx][timestamp_type] = timestamp;
} }
@ -171,14 +176,14 @@ void IRAM_ATTR timesync_serverAnswer(void *pUserData, int flag) {
if (!timeSyncPending) if (!timeSyncPending)
return; return;
// mask application irq to ensure accurate timing
mask_user_IRQ();
// store LMIC time when we received the timesync answer // store LMIC time when we received the timesync answer
ostime_t rxTime = osticks2ms(os_getTime()); ostime_t rxTime = osticks2ms(os_getTime());
// mask application irq to ensure accurate timing
mask_user_IRQ();
int rc = 0; int rc = 0;
// cast back function void parameter to a pointer // cast back void parameter to a pointer
uint8_t *p = (uint8_t *)pUserData, rcv_seqNo = *p; uint8_t *p = (uint8_t *)pUserData, rcv_seqNo = *p;
uint16_t timestamp_msec = 0; uint16_t timestamp_msec = 0;
uint32_t timestamp_sec = 0; uint32_t timestamp_sec = 0;
@ -246,6 +251,7 @@ void IRAM_ATTR timesync_serverAnswer(void *pUserData, int flag) {
// Add delay between the instant the time was received on the gateway and the // Add delay between the instant the time was received on the gateway and the
// current time on the node // current time on the node
timestamp_msec = rxTime - lmicTime.tLocal; timestamp_msec = rxTime - lmicTime.tLocal;
goto Finish; goto Finish;
#endif // (TIME_SYNC_LORAWAN) #endif // (TIME_SYNC_LORAWAN)