Skip to content

base frame timestamp off epicsTS #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsouter wants to merge 2 commits into
base: master
Choose a base branch
from
Open

base frame timestamp off epicsTS #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ad55aa
base frame timestamp off epicsTS
Nov 16, 2023
12efd49
use new updateTimeStamps method
Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions LambdaApp/src/ADLambda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,6 @@ void ADLambda::acquireThread(int index)
NDArray* output;

this->lock();
epicsTimeStamp currentTime = epicsTime::getCurrent();

// If there's not an NDArray stored for this frame_no, create one
if (this->hasDecoder)
Expand All @@ -740,8 +739,7 @@ void ADLambda::acquireThread(int index)
output->uniqueId = frame_no;
output->getInfo(&info);

output->timeStamp = currentTime.secPastEpoch + currentTime.nsec / ONE_BILLION;
updateTimeStamp(&(output->epicsTS));
updateTimeStamps(output);

memset((char*) output->pData, 0, imagedims_output[0] * imagedims_output[1] * info.bytesPerElement);

Expand All @@ -752,8 +750,8 @@ void ADLambda::acquireThread(int index)
NDArray* new_frame = pNDArrayPool->alloc(2, imagedims_output, (NDDataType_t) datatype, 0, NULL);
new_frame->uniqueId = 0;
new_frame->getInfo(&info);
new_frame->timeStamp = currentTime.secPastEpoch + currentTime.nsec / ONE_BILLION;
updateTimeStamp(&(new_frame->epicsTS));
new_frame->timeStamp = new_frame->epicsTS.secPastEpoch + new_frame->epicsTS.nsec / ONE_BILLION;

memset((char*) new_frame->pData, 0, imagedims_output[0] * imagedims_output[1] * info.bytesPerElement);

Expand Down