Skip to content
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

base frame time stamp on epicsTS #7

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

base frame time stamp on epicsTS #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e2411
base frame time stamp on epicsTS
jsouter Nov 16, 2023
95abbfc
update timestamp from new updateTimeStamps method
jsouter 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
5 changes: 1 addition & 4 deletions dexelaApp/src/Dexela.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ void Dexela::newFrameCallback(int frameCounter, int bufferNumber)
size_t dims[2];
NDArray *pImage;
NDDataType_t dataType = NDUInt16;
epicsTimeStamp currentTime;
DexImage dataImage;
static const char *functionName = "newFrameCallback";

Expand Down Expand Up @@ -507,9 +506,7 @@ void Dexela::newFrameCallback(int frameCounter, int bufferNumber)

/* Put the frame number and time stamp into the buffer */
pImage->uniqueId = frameCounter;
epicsTimeGetCurrent(&currentTime);
pImage->timeStamp = currentTime.secPastEpoch + currentTime.nsec / 1.e9;
updateTimeStamp(&pImage->epicsTS);
updateTimeStamps(pImage);

/* Get any attributes that have been defined for this driver */
getAttributes(pImage->pAttributeList);
Expand Down