remove 'maxage' argument for read_* methods
'maxage' is not really used at any place. remove it, as this makes the code cleaner Change-Id: I6f10b4ab91fc57640336db1832716ca9012eb241 Reviewed-on: https://forge.frm2.tum.de/review/20347 Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de> Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
@ -127,7 +127,7 @@ class SequencerMixin(object):
|
||||
"""Can be called to check if a sequence is currently running."""
|
||||
return self._seq_thread and self._seq_thread.isAlive()
|
||||
|
||||
def read_status(self, maxage=0):
|
||||
def read_status(self):
|
||||
if self.seq_is_alive():
|
||||
return self.Status.BUSY, u'moving: ' + self._seq_phase
|
||||
elif self._seq_error:
|
||||
@ -139,7 +139,7 @@ class SequencerMixin(object):
|
||||
return self.Status.ERROR, self._seq_stopped
|
||||
return self.Status.WARN, self._seq_stopped
|
||||
if hasattr(self, u'read_hw_status'):
|
||||
return self.read_hw_status(maxage)
|
||||
return self.read_hw_status()
|
||||
return self.Status.IDLE, u''
|
||||
|
||||
def do_stop(self):
|
||||
|
@ -140,11 +140,11 @@ class ModuleMeta(type):
|
||||
break
|
||||
rfunc = getattr(base, 'read_' + pname, None)
|
||||
|
||||
def wrapped_rfunc(self, maxage=0, pname=pname, rfunc=rfunc):
|
||||
def wrapped_rfunc(self, pname=pname, rfunc=rfunc):
|
||||
if rfunc:
|
||||
self.log.debug("rfunc(%s): call %r" % (pname, rfunc))
|
||||
try:
|
||||
value = rfunc(self, maxage)
|
||||
value = rfunc(self)
|
||||
except Exception as e:
|
||||
pobj = self.accessibles[pname]
|
||||
self.DISPATCHER.announce_update_error(self, pname, pobj, e)
|
||||
|
@ -352,7 +352,7 @@ class Drivable(Writable):
|
||||
# improved polling: may poll faster if module is BUSY
|
||||
def pollParams(self, nr=0):
|
||||
# poll status first
|
||||
self.read_status(0)
|
||||
self.read_status()
|
||||
fastpoll = self.isBusy()
|
||||
for pname, pobj in self.parameters.items():
|
||||
if not pobj.poll:
|
||||
|
@ -47,7 +47,7 @@ class SimBase(object):
|
||||
self.accessibles[k] = Parameter('extra_param: %s' % k.strip(),
|
||||
datatype=FloatRange(),
|
||||
default=0.0)
|
||||
def reader(maxage=0, pname=k):
|
||||
def reader(pname=k):
|
||||
self.log.debug('simulated reading %s' % pname)
|
||||
return self.accessibles[pname].value
|
||||
setattr(self, 'read_' + k, reader)
|
||||
@ -71,7 +71,7 @@ class SimBase(object):
|
||||
def sim(self):
|
||||
return True
|
||||
|
||||
def read_value(self, maxage=0):
|
||||
def read_value(self):
|
||||
if 'jitter' in self.accessibles:
|
||||
return self._value + self.jitter*(0.5-random.random())
|
||||
return self._value
|
||||
@ -95,7 +95,7 @@ class SimWritable(SimBase, Writable):
|
||||
SimBase.__init__(self, cfgdict)
|
||||
Writable.__init__(self, devname, logger, cfgdict, dispatcher)
|
||||
self._value = self.accessibles['value'].default
|
||||
def read_value(self, maxage=0):
|
||||
def read_value(self):
|
||||
return self.target
|
||||
def write_target(self, value):
|
||||
self.value = value
|
||||
|
Reference in New Issue
Block a user