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

Move .OVAL field to separate class; ao and bo records differ by this field #891

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
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: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ New Features
* Add subnet check for APSU beamlines.
* New lineup2() plan can be used in console, notebooks, and queueserver.

Maintenance
-----------

* Move ``.OVAL`` field from ``EpicsRecordOutputFields to new ``EpicsRecordAnalogOutputFields``

1.6.17
******

Expand Down
10 changes: 9 additions & 1 deletion apstools/synApps/_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
~EpicsRecordDeviceCommonAll
~EpicsRecordInputFields
~EpicsRecordOutputFields
~EpicsRecordAnalogOutputFields
~EpicsRecordFloatFields
~EpicsSynAppsRecordEnableMixin

Expand Down Expand Up @@ -71,7 +72,6 @@ class EpicsRecordOutputFields(Device):

output_link = Component(EpicsSignal, ".OUT", kind="config")
raw_value = Component(EpicsSignal, ".RVAL", kind="config")
output_value = Component(EpicsSignal, ".OVAL", kind="normal")
readback_value = Component(EpicsSignalRO, ".RBV", kind="hinted")
desired_output_location = Component(EpicsSignal, ".DOL", kind="config")
output_mode_select = Component(EpicsSignal, ".OMSL", kind="config")
Expand All @@ -84,6 +84,14 @@ def value(self):
return self.desired_value.get()


class EpicsRecordAnalogOutputFields(EpicsRecordOutputFields):
"""
Some fields common to EPICS analog output records, such as ``ao``.
"""

output_value = Component(EpicsSignal, ".OVAL", kind="config")


class EpicsRecordFloatFields(Device):
"""
Some fields common to EPICS records supporting floating point values.
Expand Down