Skip to content
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
2 changes: 1 addition & 1 deletion EuresysApp/src/ADEuresys.cpp
Copy link

@bhill-slac bhill-slac Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KuktaeKim Please rework this pull request as it undoes the support Mark added for SLAC in ADEuresys::createFeature() for the new feature name string prefixes like DV_, IF_, and SY_.
This pull request should also update the egrabber SDK version in iocs/EuresysIOC/configure/CONFIG_SITE.linux-x86_64.Common.
I would also recommend you move the support for NDBitsPerPixel to a separate pull request as Mark hasn't included our NDBitsPerPixel support in ADCore master branch.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @bhill-slac,

Thank you for your review. I’ll rework this PR and resubmit it.

Copy link
Author

@KuktaeKim KuktaeKim Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KuktaeKim Please rework this pull request as it undoes the support Mark added for SLAC in ADEuresys::createFeature() for the new feature name string prefixes like DV_, IF_, and SY_. This pull request should also update the egrabber SDK version in iocs/EuresysIOC/configure/CONFIG_SITE.linux-x86_64.Common. I would also recommend you move the support for NDBitsPerPixel to a separate pull request as Mark hasn't included our NDBitsPerPixel support in ADCore master branch.

I’ve reworked this pull request to only update EgrabberClientVersion to EGrabberApiVersion. Updating configure/CONFIG_SITE.linux-x86_64.Common is unnecessary because the README.md already states that "configure/CONFIG_SITE or CONFIG_SITE.$(EPICS_HOST_ARCH).Common must be edited to point to the local install." The user can create a symbolic link to the current SDK version (e.g., egrabber -> /opt/euresys/egrabber-linux-x86_64-25.02.0.39).

Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ ADEuresys::ADEuresys(const char *portName, const char* cameraId, int numEGBuffer
epicsSnprintf(driverVersionString, sizeof(driverVersionString), "%d.%d.%d",
DRIVER_VERSION, DRIVER_REVISION, DRIVER_MODIFICATION);
setStringParam(NDDriverVersion,driverVersionString);
setStringParam(ADSDKVersion, Euresys::Internal::EGrabberClientVersion);
setStringParam(ADSDKVersion, Euresys::Internal::EGrabberApiVersion);
resetErrorCounts();

// shutdown on exit
Expand Down