diff --git a/CHANGES.rst b/CHANGES.rst index c4fe0b7de..4d1c01682 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 ****** diff --git a/apstools/synApps/_common.py b/apstools/synApps/_common.py index 9a458a43b..ef82d6db0 100644 --- a/apstools/synApps/_common.py +++ b/apstools/synApps/_common.py @@ -9,6 +9,7 @@ ~EpicsRecordDeviceCommonAll ~EpicsRecordInputFields ~EpicsRecordOutputFields + ~EpicsRecordAnalogOutputFields ~EpicsRecordFloatFields ~EpicsSynAppsRecordEnableMixin @@ -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") @@ -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.