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 when not using driver timestamps #24

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

base frame timestamp off epicsTS when not using driver timestamps #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af6da80
base frame timestamp off epicsTS when not using driver timestamps
jsouter Nov 16, 2023
017ffdc
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
8 changes: 2 additions & 6 deletions PICamApp/src/ADPICam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4881,7 +4881,6 @@ void ADPICam::piHandleNewImageTask(void)
int arrayCounter;
int arrayCallbacks;
NDArrayInfo arrayInfo;
epicsTimeStamp currentTime;
PicamError error;
int useDriverTimestamps;
int useFrameTracking;
Expand Down Expand Up @@ -4993,10 +4992,7 @@ void ADPICam::piHandleNewImageTask(void)
PicamParameter_FrameSize,
&frameSize);
if (!useDriverTimestamps){
epicsTimeGetCurrent(&currentTime);
pImage->timeStamp = currentTime.secPastEpoch
+ currentTime.nsec / 1.e9;
updateTimeStamp(&pImage->epicsTS);
updateTimeStamps(pImage);
}
else {
pTimeStampValue =
Expand All @@ -5012,9 +5008,9 @@ void ADPICam::piHandleNewImageTask(void)
timeStampResolution,
frameSize,
(double)timeStampValue /(double)timeStampResolution);
updateTimeStamps(pImage);
pImage->timeStamp = (double)timeStampValue /
(double)timeStampResolution;
updateTimeStamp(&pImage->epicsTS);
}
// use frame tracking for UniqueID if requested
if (!useFrameTracking) {
Expand Down