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

support original_id

Browse Source
This commit is contained in:
zolliker
2025-01-16 10:46:37 +01:00
parent 3266d2ab61
commit fc679cee21
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nicoscache.py
View File

@ -168,4 +168,4 @@ class NicosStream(Stream):
value = None value = None
error = 'error' error = 'error'
cnt += 1 cnt += 1
yield key, value, error, ts yield key, value, error, ts, self.tags

9
secop.py
View File

@ -48,7 +48,13 @@ class SecopStream(Stream):
self.tags['device'] = self.device self.tags['device'] = self.device
self.modules = self.descr['modules'] self.modules = self.descr['modules']
self.convert = {} self.convert = {}
self.original_id = {}
for mod, moddesc in self.modules.items(): for mod, moddesc in self.modules.items():
for key in ('_original_id', 'original_id'):
value = moddesc.get(key)
if value:
self.original_id[mod] = value
break
for param, desc in moddesc['accessibles'].items(): for param, desc in moddesc['accessibles'].items():
dt = desc['datainfo'] dt = desc['datainfo']
if dt['type'] in ('double', 'int', 'enum'): if dt['type'] in ('double', 'int', 'enum'):
@ -79,7 +85,8 @@ class SecopStream(Stream):
ts = data[1].get('t', time.time()) ts = data[1].get('t', time.time())
value = cvt(data[0]) value = cvt(data[0])
cnt += 1 cnt += 1
yield key, value, error, ts yield key, value, error, ts, dict(
self.tags, device=self.original_id.get(key[0], self.device))
elif msg == 'active': elif msg == 'active':
# from now on, no more waiting # from now on, no more waiting
self.notimeout() self.notimeout()