From 9638b59f366ff4aee9f7f1d43901db5ce464cf9b Mon Sep 17 00:00:00 2001 From: James Souter Date: Thu, 16 Nov 2023 08:56:05 +0000 Subject: [PATCH 1/3] base frame timestamp off epicsTS --- firewireWinApp/src/firewireWinDCAM.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/firewireWinApp/src/firewireWinDCAM.cpp b/firewireWinApp/src/firewireWinDCAM.cpp index 1484ccc..a6347f1 100644 --- a/firewireWinApp/src/firewireWinDCAM.cpp +++ b/firewireWinApp/src/firewireWinDCAM.cpp @@ -464,7 +464,6 @@ void FirewireWinDCAM::imageGrabTask() int numImages, numImagesCounter; int imageMode; int arrayCallbacks; - epicsTimeStamp startTime; int acquire; const char *functionName = "imageGrabTask"; @@ -499,8 +498,6 @@ void FirewireWinDCAM::imageGrabTask() setIntegerParam(ADAcquire, 1); } - /* Get the current time */ - epicsTimeGetCurrent(&startTime); /* We are now waiting for an image */ setIntegerParam(ADStatus, ADStatusWaiting); /* Call the callbacks to update any changes */ @@ -532,8 +529,8 @@ void FirewireWinDCAM::imageGrabTask() /* Put the frame number into the buffer */ this->pRaw->uniqueId = imageCounter; /* Set a timestamp in the buffer */ - this->pRaw->timeStamp = startTime.secPastEpoch + startTime.nsec / 1.e9; updateTimeStamp(&this->pRaw->epicsTS); + this->pRaw->timeStamp = this->pRaw->epicsTS.secPastEpoch + this->pRaw->epicsTS.nsec / 1.e9; /* Get any attributes that have been defined for this driver */ this->getAttributes(this->pRaw->pAttributeList); From c45cfa192998eaaa1a972b273c5d050652ff9da0 Mon Sep 17 00:00:00 2001 From: James Souter Date: Fri, 17 Nov 2023 08:58:12 +0000 Subject: [PATCH 2/3] use new updateTimeStamps method --- firewireWinApp/src/firewireWinDCAM.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/firewireWinApp/src/firewireWinDCAM.cpp b/firewireWinApp/src/firewireWinDCAM.cpp index a6347f1..e711686 100644 --- a/firewireWinApp/src/firewireWinDCAM.cpp +++ b/firewireWinApp/src/firewireWinDCAM.cpp @@ -529,8 +529,7 @@ void FirewireWinDCAM::imageGrabTask() /* Put the frame number into the buffer */ this->pRaw->uniqueId = imageCounter; /* Set a timestamp in the buffer */ - updateTimeStamp(&this->pRaw->epicsTS); - this->pRaw->timeStamp = this->pRaw->epicsTS.secPastEpoch + this->pRaw->epicsTS.nsec / 1.e9; + updateTimeStamp(this->pRaw); /* Get any attributes that have been defined for this driver */ this->getAttributes(this->pRaw->pAttributeList); From 49e9182c08268f78fa2d784c6c70d81ec2d89b44 Mon Sep 17 00:00:00 2001 From: James Souter Date: Fri, 17 Nov 2023 08:59:13 +0000 Subject: [PATCH 3/3] fix typo, updateTimeStamps not updateTimeStamp --- firewireWinApp/src/firewireWinDCAM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firewireWinApp/src/firewireWinDCAM.cpp b/firewireWinApp/src/firewireWinDCAM.cpp index e711686..6ce2b7c 100644 --- a/firewireWinApp/src/firewireWinDCAM.cpp +++ b/firewireWinApp/src/firewireWinDCAM.cpp @@ -529,7 +529,7 @@ void FirewireWinDCAM::imageGrabTask() /* Put the frame number into the buffer */ this->pRaw->uniqueId = imageCounter; /* Set a timestamp in the buffer */ - updateTimeStamp(this->pRaw); + updateTimeStamps(this->pRaw); /* Get any attributes that have been defined for this driver */ this->getAttributes(this->pRaw->pAttributeList);