From ccc976984dbfe9583a1a51d7219217ca93d32497 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Thu, 24 Oct 2024 14:03:14 +0200 Subject: [PATCH] frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem revert some of change 34813 SeaClient is based on ProxyClient, not SecopClient -> updateItem is not defined there Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873 Reviewed-by: Markus Zolliker Tested-by: Jenkins Automated Tests --- frappy_psi/sea.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frappy_psi/sea.py b/frappy_psi/sea.py index a63ad4b2..67c5a1b6 100644 --- a/frappy_psi/sea.py +++ b/frappy_psi/sea.py @@ -161,7 +161,7 @@ class SeaClient(ProxyClient, Module): self.objects.add(obj) for k, v in module.path2param.items(): self.path2param.setdefault(k, []).extend(v) - self.register_callback(module.name, module.updateItem) + self.register_callback(module.name, module.updateEvent) def _connect(self): try: @@ -652,12 +652,12 @@ class SeaModule(Module): result = Module.__new__(newcls) return result - def updateItem(self, module, parameter, item): + def updateEvent(self, module, parameter, value, timestamp, readerror): upd = getattr(self, 'update_' + parameter, None) if upd: - upd(*item) + upd(value, timestamp, readerror) return - self.announceUpdate(parameter, *item) + self.announceUpdate(parameter, value, readerror, timestamp) def initModule(self): self.io.register_obj(self, self.sea_object) @@ -741,10 +741,10 @@ class SeaDrivable(SeaReadable, Drivable): return BUSY, 'driving' return status - def update_target(self, module, parameter, item): + def update_target(self, module, parameter, value, timestamp, readerror): # TODO: check if this is needed - if item.value is not None: - self.target = item.value + if value is not None: + self.target = value @Command() def stop(self):