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.

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 timestamp off epicsTS #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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 pslApp/src/PSL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ asynStatus PSL::getImage()
NDDataType_t dataType=NDUInt8;
NDArray *pImage=NULL;
NDColorMode_t colorMode;
epicsTimeStamp now;
asynStatus status;
NDArrayInfo arrayInfo;
char *pOut=NULL;
Expand Down Expand Up @@ -603,10 +602,8 @@ asynStatus PSL::getImage()
getIntegerParam(NDArrayCounter, &imageCounter);

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

pImage->pAttributeList->add("ColorMode", "Color Mode", NDAttrInt32, &colorMode);

Expand Down