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

HasIodev bug fix

Browse Source 
Change-Id: I2be3b477f7d6ca74f2fefb5efc1bd134ac8d047e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23124
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2020-05-20 16:49:49 +02:00
parent c14671204c
commit c16adf38cd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secop/stringio.py
View File

@ -208,7 +208,7 @@ class HasIodev(Module):
iodevDict = {} iodevDict = {}
def __init__(self, name, logger, opts, srv): def __init__(self, name, logger, opts, srv):
iodev = opts.pop('iodev', None) iodev = opts.get('iodev')
super().__init__(name, logger, opts, srv) super().__init__(name, logger, opts, srv)
if self.uri: if self.uri:
opts = {'uri': self.uri, 'description': 'communication device for %s' % name, opts = {'uri': self.uri, 'description': 'communication device for %s' % name,

1
secop_psi/ppms.py
View File

@ -446,7 +446,6 @@ class Temp(PpmsMixin, Drivable):
15: (Status.ERROR, 'general failure'), 15: (Status.ERROR, 'general failure'),
} }
properties = { properties = {
'iodev': Attached(),
'general_stop': Property('respect general stop', datatype=BoolType(), 'general_stop': Property('respect general stop', datatype=BoolType(),
export=True, default=True) export=True, default=True)
} }