From a91c29b9457bbc468a5c63ae838c8a3b60ac58e3 Mon Sep 17 00:00:00 2001 From: James Souter Date: Thu, 16 Nov 2023 08:59:05 +0000 Subject: [PATCH 1/2] base frame timestamp off epicsTS --- lightFieldApp/src/LightField.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lightFieldApp/src/LightField.cpp b/lightFieldApp/src/LightField.cpp index e48e362a..54b6785f 100644 --- a/lightFieldApp/src/LightField.cpp +++ b/lightFieldApp/src/LightField.cpp @@ -645,7 +645,6 @@ void LightField::frameCallback(ImageDataSetReceivedEventArgs^ args) size_t dims[2]; NDArray *pImage; NDDataType_t dataType; - epicsTimeStamp currentTime; static const char *functionName = "frameCallback"; asynPrint(pasynUserSelf, ASYN_TRACE_FLOW, @@ -717,9 +716,8 @@ void LightField::frameCallback(ImageDataSetReceivedEventArgs^ args) setIntegerParam(NDArraySizeY, (int)pImage->dims[1].size); pImage->uniqueId = arrayCounter; - epicsTimeGetCurrent(¤tTime); - pImage->timeStamp = currentTime.secPastEpoch + currentTime.nsec / 1.e9; updateTimeStamp(&pImage->epicsTS); + pImage->timeStamp = pImage->epicsTS.secPastEpoch + pImage->epicsTS.nsec / 1.e9; /* Get any attributes that have been defined for this driver */ getAttributes(pImage->pAttributeList); From 80d26ca5c22b98b5df276c07c96c40ec38eeebd7 Mon Sep 17 00:00:00 2001 From: James Souter Date: Fri, 17 Nov 2023 09:01:27 +0000 Subject: [PATCH 2/2] use new updateTimeStamps method --- lightFieldApp/src/LightField.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lightFieldApp/src/LightField.cpp b/lightFieldApp/src/LightField.cpp index 54b6785f..896f6773 100644 --- a/lightFieldApp/src/LightField.cpp +++ b/lightFieldApp/src/LightField.cpp @@ -716,8 +716,7 @@ void LightField::frameCallback(ImageDataSetReceivedEventArgs^ args) setIntegerParam(NDArraySizeY, (int)pImage->dims[1].size); pImage->uniqueId = arrayCounter; - updateTimeStamp(&pImage->epicsTS); - pImage->timeStamp = pImage->epicsTS.secPastEpoch + pImage->epicsTS.nsec / 1.e9; + updateTimeStamps(pImage); /* Get any attributes that have been defined for this driver */ getAttributes(pImage->pAttributeList);