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

Merge "Fix identification response"

Browse Source
This commit is contained in:
Enrico Faulhaber
2022-12-06 18:00:10 +01:00
committed by Gerrit Code Review
parent a14c282993 8d99a8c536
commit 929e41ffff
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frappy/client/__init__.py
View File

@ -18,10 +18,12 @@
# Module authors: # Module authors:
# Enrico Faulhaber <enrico.faulhaber@frm2.tum.de> # Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
# Markus Zolliker <markus.zolliker@psi.ch> # Markus Zolliker <markus.zolliker@psi.ch>
# Alexander Zaft <a.zaft@fz-juelich.de>
# #
# ***************************************************************************** # *****************************************************************************
"""general SECoP client""" """general SECoP client"""
import re
import json import json
import queue import queue
import time import time
@ -42,6 +44,7 @@ from frappy.protocol.messages import COMMANDREQUEST, \
# replies to be handled for cache # replies to be handled for cache
UPDATE_MESSAGES = {EVENTREPLY, READREPLY, WRITEREPLY, ERRORPREFIX + READREQUEST, ERRORPREFIX + EVENTREPLY} UPDATE_MESSAGES = {EVENTREPLY, READREPLY, WRITEREPLY, ERRORPREFIX + READREQUEST, ERRORPREFIX + EVENTREPLY}
VERSIONFMT= re.compile(r'^[^,]*?ISSE[^,]*,SECoP,')
class UNREGISTER: class UNREGISTER:
"""a magic value, used a returned value in a callback """a magic value, used a returned value in a callback
@ -243,9 +246,16 @@ class SecopClient(ProxyClient):
self.secop_version = reply.decode('utf-8') self.secop_version = reply.decode('utf-8')
else: else:
raise self.error_map('HardwareError')('no answer to %s' % IDENTREQUEST) raise self.error_map('HardwareError')('no answer to %s' % IDENTREQUEST)
if not self.secop_version.startswith(IDENTPREFIX):
if not VERSIONFMT.match(self.secop_version):
raise self.error_map('HardwareError')('bad answer to %s: %r' % raise self.error_map('HardwareError')('bad answer to %s: %r' %
(IDENTREQUEST, self.secop_version)) (IDENTREQUEST, self.secop_version))
# inform that the other party still uses a legacy identifier
# see e.g. Frappy Bug #4659 (https://forge.frm2.tum.de/redmine/issues/4659)
if not self.secop_version.startswith(IDENTPREFIX):
self.log.warning('SEC-Node replied with legacy identify reply: %s'
% self.secop_version)
# now its safe to do secop stuff # now its safe to do secop stuff
self._running = True self._running = True
self._rxthread = mkthread(self.__rxthread) self._rxthread = mkthread(self.__rxthread)
@ -393,7 +403,7 @@ class SecopClient(ProxyClient):
if time.time() > self.disconnect_time + self.reconnect_timeout: if time.time() > self.disconnect_time + self.reconnect_timeout:
if self.online: # was recently connected if self.online: # was recently connected
self.disconnect_time = 0 self.disconnect_time = 0
self.log.warning('can not reconnect to %s (%r)' % (self.nodename, e)) self.log.warning('can not reconnect to %s (%r)', self.nodename, e)
self.log.info('continue trying to reconnect') self.log.info('continue trying to reconnect')
# self.log.warning(formatExtendedTraceback()) # self.log.warning(formatExtendedTraceback())
self._set_state(False) self._set_state(False)

2
frappy/protocol/messages.py
View File

@ -25,7 +25,7 @@
IDENTREQUEST = '*IDN?' # literal IDENTREQUEST = '*IDN?' # literal
# literal! first part is fixed! # literal! first part is fixed!
IDENTPREFIX = 'SINE2020&ISSE,SECoP,' IDENTPREFIX = 'ISSE&SINE2020,SECoP,'
IDENTREPLY = IDENTPREFIX + 'V2019-08-20,v1.0 RC2' IDENTREPLY = IDENTPREFIX + 'V2019-08-20,v1.0 RC2'
DESCRIPTIONREQUEST = 'describe' # literal DESCRIPTIONREQUEST = 'describe' # literal