Couple correction on the fakeserver

This commit is contained in:
Maximilien Rigaut 2021-10-11 21:44:51 +02:00
parent 8d89527458
commit a257c6c3d7
2 changed files with 4 additions and 5 deletions

View File

@ -408,7 +408,6 @@ class analogController(object):
iprint('Connecting to server, {self.ip}:{self.port}'.format(self=self)) iprint('Connecting to server, {self.ip}:{self.port}'.format(self=self))
self.sck.connect((self.ip,self.port)) self.sck.connect((self.ip,self.port))
self._connectedLock.release() self._connectedLock.release()
self.genericSEND("CONNECT","*")
self.genericSEND("CONNECT","*\r\n") self.genericSEND("CONNECT","*\r\n")
def getDevice(self): def getDevice(self):
@ -582,7 +581,7 @@ class analogController(object):
self.connect() self.connect()
self.getDevice() self.getDevice()
self.getVersion() self.getVersion()
# self.getStatus(3) self.getStatus(3)
######################################### #########################################

View File

@ -10,10 +10,10 @@ def sequenceAnswers(s,addr,seq,delay=_DELAY):
# s.sendall("*\r\n".encode) # s.sendall("*\r\n".encode)
recv=b"" recv=b""
for elt,resps in seq: for elt,resps in seq:
elt=(elt+'\r\n').encode() elt=(elt).encode()
resps=[(i+'\r\n').encode() for i in resps] resps=[(i+"\r\n").encode() for i in resps]
print("[{}] Waiting for {}".format(name,elt)) print("[{}] Waiting for {}".format(name,elt))
while recv!=elt: while recv not in elt:
recv=s.recv(4095) recv=s.recv(4095)
print("[{}] Received : {}".format(name,recv)) print("[{}] Received : {}".format(name,recv))
for r in resps: for r in resps: