From 0e635f8c530296ad0cf6653cc2ad2182f4863da4 Mon Sep 17 00:00:00 2001 From: James Souter Date: Thu, 16 Nov 2023 09:07:19 +0000 Subject: [PATCH 1/2] base frame timestamp off epicsTS --- NDDriverStdArraysApp/src/NDDriverStdArrays.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp b/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp index 1c3e64e..19f3ec0 100644 --- a/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp +++ b/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp @@ -310,7 +310,6 @@ void NDDriverStdArrays::setArrayComplete() void NDDriverStdArrays::doCallbacks() { NDArray *pArray = this->pArrays[0]; - epicsTimeStamp startTime; int imageCounter; if (!pArray) return; @@ -321,9 +320,8 @@ void NDDriverStdArrays::doCallbacks() /* Put the frame number and timestamp into the NDArray */ pArray->uniqueId = imageCounter; - epicsTimeGetCurrent(&startTime); - pArray->timeStamp = startTime.secPastEpoch+startTime.nsec/1.e9; updateTimeStamp(&pArray->epicsTS); + pArray->timeStamp = pArray->epicsTS.secPastEpoch + pArray->epicsTS.nsec/1.e9; this->getAttributes(pArray->pAttributeList); doCallbacksGenericPointer(pArray, NDArrayData, 0); } From cb00bc7087076b36c7100c63be9794ea4279e861 Mon Sep 17 00:00:00 2001 From: James Souter Date: Fri, 17 Nov 2023 09:07:32 +0000 Subject: [PATCH 2/2] use new updateTimeStamps method --- NDDriverStdArraysApp/src/NDDriverStdArrays.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp b/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp index 19f3ec0..93cd392 100644 --- a/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp +++ b/NDDriverStdArraysApp/src/NDDriverStdArrays.cpp @@ -320,8 +320,7 @@ void NDDriverStdArrays::doCallbacks() /* Put the frame number and timestamp into the NDArray */ pArray->uniqueId = imageCounter; - updateTimeStamp(&pArray->epicsTS); - pArray->timeStamp = pArray->epicsTS.secPastEpoch + pArray->epicsTS.nsec/1.e9; + updateTimeStamps(pArray); this->getAttributes(pArray->pAttributeList); doCallbacksGenericPointer(pArray, NDArrayData, 0); }