Skip to content

Commit 6687b7c

Browse files
committed
merge mercury branch; release v3.8.0
2 parents 9829d17 + 6cfa158 commit 6687b7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+6401
-744
lines changed

demo/Server_A1.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def __init__(self, host, port, serial_num="/dev/ttyAMA1", baud=115200):
6363
self.serial_num = serial_num
6464
self.baud = baud
6565
self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
66+
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
6667
self.s.bind((host, port))
6768
print("Binding succeeded!")
6869
self.s.listen(1)
@@ -98,13 +99,15 @@ def connect(self):
9899
"return datas: {}".format([hex(v) for v in res]))
99100

100101
conn.sendall(res)
102+
except ConnectionResetError:
103+
print("close disconnect!")
104+
time.sleep(0.1)
101105
except Exception as e:
102106
self.logger.error(traceback.format_exc())
103-
conn.sendall(str.encode(traceback.format_exc()))
104107
break
105108
except Exception as e:
106109
self.logger.error(traceback.format_exc())
107-
conn.close()
110+
self.conn.close()
108111
self.mc.close()
109112

110113
def _encode_int16(self, data):

0 commit comments

Comments
 (0)