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

feat: Timestaming with UTAG #107

Merged
merged 23 commits into from
Dec 14, 2023
Merged

Conversation

jerzyjamroz
Copy link
Contributor

@jerzyjamroz jerzyjamroz commented Dec 5, 2023

The timestamping can be used in two ways from now on:

  • Timestaming with UTAG (new): import file evreventutag.db instead of evrevent.db. UTAG value is applied by writing into: "$(EN)-SP" record, the timestamp+UTAG is provided by $(EN)Cnt-I record (EPICS Base 7 or higher).
  • Timestaming (legacy): import file evrevent.db and ignore evreventutag.db, the timestamp is provided by $(EN)Cnt-I record, so as it was before (legacy).

The solution is based on the:

  1. Feedback from the epics core team:
  1. Initial implementation and tests by @joaopaulosm: Implementation of UTAG setpoint associated with EVR events jerzyjamroz/mrfioc2#5

@jerzyjamroz jerzyjamroz self-assigned this Dec 5, 2023
@jerzyjamroz jerzyjamroz marked this pull request as ready for review December 6, 2023 09:08
@jerzyjamroz jerzyjamroz changed the title feat: UTAG support added together with the timestamping feat: Timestaming with UTAG Dec 6, 2023
joaopaulosm and others added 19 commits December 6, 2023 10:59
* First implementation, simple set/get UTAG

* Remove I/O Intr link that is not needed

* Adding UTAG for each event

* Add new getTimeStampUTag method to avoid mutex being locked twice in a row

* Minor adjust in UTAG setpoint record name

* Fix typo on nanosseconds assignment; convertTS is now template

* Overload getTimeStamp; Use define guards to compile for older versions; Clean-up comments and defines

* Additional comments and clean-up
@jerzyjamroz jerzyjamroz merged commit 7f59d47 into epics-modules:master Dec 14, 2023
11 checks passed
@jerzyjamroz jerzyjamroz deleted the utag-rc branch December 14, 2023 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants