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

adopt sea amd cfg changes from wip

Browse Source 
Change-Id: I83b82ece53e0cb3394551c122561a042499527d8
This commit is contained in:
zolliker
2024-01-29 10:32:24 +01:00
parent 1e56f2f39e
commit 614a49f3e3
59 changed files with 355 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
frappy_psi/sea.py
View File

@ -39,7 +39,6 @@ from os.path import expanduser, join, exists
from frappy.client import ProxyClient
from frappy.datatypes import ArrayOf, BoolType, \
EnumType, FloatRange, IntRange, StringType
from frappy.core import IDLE, BUSY, ERROR
from frappy.errors import ConfigError, HardwareError, secop_error, CommunicationFailedError
from frappy.lib import generalConfig, mkthread
from frappy.lib.asynconn import AsynConn, ConnectionClosed
@ -278,6 +277,9 @@ class SeaClient(ProxyClient, Module):
continue
else:
continue
# path from sea may contain double slash //
# this should be fixed, however in the meantime fix it here
path = path.replace('//', '/')
data = {'%s.geterror' % path: readerror.replace('ERROR: ', '')}
obj = None
flag = 'hdbevent'
@ -642,10 +644,6 @@ class SeaModule(Module):
if upd:
upd(value, timestamp, readerror)
return
self.announceUpdate(parameter, value, readerror, timestamp)
# self._update(module, parameter, value, timestamp, readerror)
def _update(self, module, parameter, value, timestamp, readerror):
try:
pobj = self.parameters[parameter]
except KeyError:
@ -672,36 +670,20 @@ class SeaModule(Module):
class SeaReadable(SeaModule, Readable):
_readerror = None
_status = IDLE, ''
def update_value(self, value, timestamp, readerror):
# make sure status is always ERROR when reading value fails
self._readerror = readerror
if readerror:
self.read_status()
self.announceUpdate('value', value, readerror, timestamp)
# self._update(self.name, 'value', value, timestamp, readerror)
else: # order is important
self.value = value
self.read_status()
def update_status(self, value, timestamp, readerror):
if readerror:
value = repr(readerror)
if value == '':
self._status = IDLE, ''
self.status = (self.Status.IDLE, '')
else:
self._status = ERROR, value
self.read_status()
self.status = (self.Status.ERROR, value)
def read_status(self):
if self._readerror:
return ERROR, repr(self._readerror)
return self._status
return self.status
class SeaWritable(SeaReadable, Writable):
class SeaWritable(SeaModule, Writable):
def read_value(self):
return self.target
@ -711,13 +693,20 @@ class SeaWritable(SeaReadable, Writable):
self.value = value
class SeaDrivable(SeaReadable, Drivable):
class SeaDrivable(SeaModule, Drivable):
_sea_status = ''
_is_running = 0
def earlyInit(self):
super().earlyInit()
self._run_event = threading.Event()
def read_status(self):
return self.status
# def read_target(self):
# return self.target
def write_target(self, value):
self._run_event.clear()
self.io.query(f'run {self.sea_object} {value}')
@ -725,20 +714,25 @@ class SeaDrivable(SeaReadable, Drivable):
self.log.warn('target changed but is_running stays 0')
return value
def update_status(self, value, timestamp, readerror):
if not readerror:
self._sea_status = value
self.updateStatus()
def update_is_running(self, value, timestamp, readerror):
if not readerror:
self._is_running = value
self.read_status()
self.updateStatus()
if value:
self._run_event.set()
def read_status(self):
status = super().read_status()
if self._is_running:
if status[0] >= ERROR:
return ERROR, 'BUSY + ' + status[1]
return BUSY, 'driving'
return status
def updateStatus(self):
if self._sea_status:
self.status = (self.Status.ERROR, self._sea_status)
elif self._is_running:
self.status = (self.Status.BUSY, 'driving')
else:
self.status = (self.Status.IDLE, '')
def updateTarget(self, module, parameter, value, timestamp, readerror):
if value is not None: