linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mlz: avoid error on import due to consistency check

Browse Source 
Change-Id: I43751a93b16a0cd9a64ae79da7045fd4e879b065
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29529
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
Georg Brandl 2022-10-19 17:04:35 +02:00 committed by Georg Brandl
parent 1fc805a5a2
commit 4ef0b0c01d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
secop_mlz/entangle.py
View File

@ -152,7 +152,7 @@ def describe_dev_error(exc):
return fulldesc return fulldesc
class PyTangoDevice(Module): class BasePyTangoDevice:
""" """
Basic PyTango device. Basic PyTango device.
@ -356,6 +356,15 @@ class PyTangoDevice(Module):
self.log.debug('PyTango error: %s', fulldesc) self.log.debug('PyTango error: %s', fulldesc)
raise exclass(self, fulldesc) raise exclass(self, fulldesc)
@Command(argument=None, result=None)
def reset(self):
"""Tango reset command"""
self._dev.Reset()
class PyTangoDevice(BasePyTangoDevice):
"""Base for "normal" devices with status."""
def read_status(self): def read_status(self):
# Query status code and string # Query status code and string
tangoState = self._dev.State() tangoState = self._dev.State()
@ -366,11 +375,6 @@ class PyTangoDevice(Module):
return (myState, tangoStatus) return (myState, tangoStatus)
@Command(argument=None, result=None)
def reset(self):
"""Tango reset command"""
self._dev.Reset()
class AnalogInput(PyTangoDevice, Readable): class AnalogInput(PyTangoDevice, Readable):
""" """
@ -943,7 +947,7 @@ class PartialDigitalOutput(NamedDigitalOutput):
return self.read_target() return self.read_target()
class StringIO(PyTangoDevice, Module): class StringIO(BasePyTangoDevice, Module):
"""StringIO abstracts communication over a hardware bus that sends and """StringIO abstracts communication over a hardware bus that sends and
receives strings. receives strings.
""" """