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

fix simulation

Browse Source 
got broken during change of signatures of modules

Change-Id: Id423ac52fb1523ef207b08758fb941f0507eeec5
Reviewed-on: https://forge.frm2.tum.de/review/19535
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber 2018-12-04 14:02:18 +01:00
parent 381495fe38
commit 8c85a775a1
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
secop/server.py
View File

@ -168,8 +168,7 @@ class Server(object):
try:
opts[k] = ast.literal_eval(v)
except Exception:
pass
opts[k] = v
opts[k] = v
# try to import the class, raise if this fails
self.log.debug(u'Creating %s %s ...' % (kind.title(), name))

16
secop/simulation.py
View File

@ -78,22 +78,22 @@ class SimBase(object):
class SimModule(SimBase, Module):
def __init__(self, logger, cfgdict, devname, dispatcher):
def __init__(self, devname, logger, cfgdict, dispatcher):
SimBase.__init__(self, cfgdict)
Module.__init__(self, logger, cfgdict, devname, dispatcher)
Module.__init__(self, devname, logger, cfgdict, dispatcher)
class SimReadable(SimBase, Readable):
def __init__(self, logger, cfgdict, devname, dispatcher):
def __init__(self, devname, logger, cfgdict, dispatcher):
SimBase.__init__(self, cfgdict)
Readable.__init__(self, logger, cfgdict, devname, dispatcher)
Readable.__init__(self, devname, logger, cfgdict, dispatcher)
self._value = self.accessibles['value'].default
class SimWritable(SimBase, Writable):
def __init__(self, logger, cfgdict, devname, dispatcher):
def __init__(self, devname, logger, cfgdict, dispatcher):
SimBase.__init__(self, cfgdict)
Writable.__init__(self, logger, cfgdict, devname, dispatcher)
Writable.__init__(self, devname, logger, cfgdict, dispatcher)
self._value = self.accessibles['value'].default
def read_value(self, maxage=0):
return self.target
@ -104,9 +104,9 @@ class SimWritable(SimBase, Writable):
pass
class SimDrivable(SimBase, Drivable):
def __init__(self, logger, cfgdict, devname, dispatcher):
def __init__(self, devname, logger, cfgdict, dispatcher):
SimBase.__init__(self, cfgdict)
Drivable.__init__(self, logger, cfgdict, devname, dispatcher)
Drivable.__init__(self, devname, logger, cfgdict, dispatcher)
self._value = self.accessibles['value'].default
def sim(self):