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

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

Base frame timestamp off epicsTS #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d38e89
Base frame timestamp off epicsTS
jsouter Nov 16, 2023
cb17194
use 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
4 changes: 1 addition & 3 deletions App/src/QImaging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,8 @@ void QImage::consumerTask()
if ((arrayCallbacks))
{
// Put the frame number and time stamp into the buffer
// Set the the start time
epicsTimeGetCurrent(&startTime);
pFrames[frameId]->ndArray->uniqueId = frameId;
pFrames[frameId]->ndArray->timeStamp = startTime.secPastEpoch + startTime.nsec / 1.e9;
updateTimeStamps(pFrames[frameId]->ndArray);
// Get any attributes that have been defined for this driver
this->getAttributes(pFrames[frameId]->ndArray->pAttributeList);
// Call the NDArray callback
Expand Down
1 change: 0 additions & 1 deletion Support/QImaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ class QImage : public ADDriver {
};

// Our data
epicsTimeStamp startTime;
epicsEventId stopEventId;
epicsEventId m_acquireEventId;
epicsMutex freeFrameMutex;
Expand Down