Skip to content

Commit

Permalink
MNT #632 most kind="config" now
Browse files Browse the repository at this point in the history
  • Loading branch information
prjemian committed Jan 25, 2022
1 parent 4bb1fc6 commit 961ddb2
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 18 deletions.
8 changes: 4 additions & 4 deletions apstools/synApps/calcout.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ class CalcoutRecordChannel(Device):
~reset
"""

input_value = FC(EpicsSignal, "{self.prefix}.{self._ch_letter}")
last_value = FC(EpicsSignalRO, "{self.prefix}.L{self._ch_letter}")
input_pv = FC(EpicsSignal, "{self.prefix}.INP{self._ch_letter}")
input_pv_valid = FC(EpicsSignalRO, "{self.prefix}.IN{self._ch_letter}V")
input_value = FC(EpicsSignal, "{self.prefix}.{self._ch_letter}", kind="config")
last_value = FC(EpicsSignalRO, "{self.prefix}.L{self._ch_letter}", kind="config")
input_pv = FC(EpicsSignal, "{self.prefix}.INP{self._ch_letter}", kind="config")
input_pv_valid = FC(EpicsSignalRO, "{self.prefix}.IN{self._ch_letter}V", kind="config")

read_attrs = [
"input_value",
Expand Down
12 changes: 6 additions & 6 deletions apstools/synApps/luascript.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class _LuascriptRecordInputBase(Device):

# Components must be defined in subclass

read_attrs = [
"input_value",
]
hints = {"fields": read_attrs}
# read_attrs = [
# "input_value",
# ]
# hints = {"fields": read_attrs}

def __init__(self, prefix, letter, **kwargs):
self._ch = letter
Expand All @@ -61,7 +61,7 @@ class LuascriptRecordNumberInput(_LuascriptRecordInputBase):
"""

pv_link = FC(EpicsSignal, "{prefix}.INP{_ch}", kind="config", string=True)
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="hinted")
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="config")
description = FC(EpicsSignal, "{prefix}.{_ch}DSC", kind="config", string=True)

def reset(self):
Expand All @@ -79,7 +79,7 @@ class LuascriptRecordStringInput(_LuascriptRecordInputBase):
"""

pv_link = FC(EpicsSignal, "{prefix}.IN{_ch}", kind="config", string=True)
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="hinted", string=True)
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="config", string=True)
description = FC(EpicsSignal, "{prefix}.{_ch}DN", kind="config", string=True)

def reset(self):
Expand Down
8 changes: 3 additions & 5 deletions apstools/synApps/scalcout.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ScalcoutRecordNumberChannel(Device):
~reset
"""

input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="hinted")
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="config")
input_pv = FC(EpicsSignal, "{prefix}.INP{_ch}", kind="config")

def __init__(self, prefix, letter, **kwargs):
Expand All @@ -65,7 +65,7 @@ class ScalcoutRecordStringChannel(Device):
~reset
"""

input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="hinted")
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="config")
input_pv = FC(EpicsSignal, "{prefix}.IN{_ch}", kind="config")

def __init__(self, prefix, letter, **kwargs):
Expand Down Expand Up @@ -100,8 +100,6 @@ class ScalcoutRecord(EpicsRecordFloatFields, EpicsRecordDeviceCommonAll):
:see: http://htmlpreview.github.io/?https://github.com/epics-modules/calc/blob/R3-6-1/documentation/calcDocs.html
"""
enable = Cpt(EpicsSignal, "Enable", kind="omitted")

units = Cpt(EpicsSignal, ".EGU", kind="config")
precision = Cpt(EpicsSignal, ".PREC", kind="config")

Expand All @@ -110,7 +108,7 @@ class ScalcoutRecord(EpicsRecordFloatFields, EpicsRecordDeviceCommonAll):
calculated_value_string = Cpt(EpicsSignal, ".SVAL", kind="normal")

output_calculation = Cpt(EpicsSignal, ".OCAL", kind="config", string=True)
output_value = Cpt(EpicsSignal, ".OVAL", kind="hinted")
output_value = Cpt(EpicsSignal, ".OVAL", kind="config")
output_value_string = Cpt(EpicsSignal, ".OSV", kind="hinted", string=True)
output_pv = Cpt(EpicsSignal, ".OUT", kind="config")
output_execute_option = Cpt(EpicsSignal, ".OOPT", kind="config")
Expand Down
1 change: 0 additions & 1 deletion apstools/synApps/sseq.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class SseqRecord(EpicsRecordDeviceCommonAll):
:see: https://htmlpreview.github.io/?https://raw.githubusercontent.com/epics-modules/calc/R3-6-1/documentation/sseqRecord.html
"""

enable = Cpt(EpicsSignal, "Enable", kind="config")
precision = Cpt(EpicsSignal, ".PREC", kind="config")
busy = Cpt(EpicsSignalRO, ".PREC", kind="config")
_abort = Cpt(EpicsSignal, ".ABORT", kind="omitted")
Expand Down
2 changes: 1 addition & 1 deletion apstools/synApps/sub.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SubRecordChannel(Device):
~reset
"""

input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="hinted")
input_value = FC(EpicsSignal, "{prefix}.{_ch}", kind="config")
input_pv = FC(EpicsSignal, "{prefix}.INP{_ch}", kind="config", string=True)

def __init__(self, prefix, letter, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion apstools/synApps/swait.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class SwaitRecordChannel(Device):
.. index:: Ophyd Device; synApps SwaitRecordChannel
"""

input_value = FC(EpicsSignal, "{self.prefix}.{self._ch_letter}", kind="normal")
input_value = FC(EpicsSignal, "{self.prefix}.{self._ch_letter}", kind="config")
input_pv = FC(EpicsSignal, "{self.prefix}.IN{self._ch_letter}N", kind="config")
input_trigger = FC(EpicsSignal, "{self.prefix}.IN{self._ch_letter}P", kind="config")
read_attrs = [
Expand Down

0 comments on commit 961ddb2

Please sign in to comment.