Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pymycobot/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1199,6 +1199,9 @@ def read(self, genre, method=None, command=None, _class=None, timeout=None, real
break
elif len(datas) == 2:
data_len = struct.unpack("b", data)[0]
if data_len < 0 or data_len > 30:
data_len = -1
continue
datas += data
elif len(datas) > 2 and data_len > 0:
datas += data
Expand Down
12 changes: 9 additions & 3 deletions pymycobot/mycobot280.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,18 @@ def _res(self, real_command, has_reply, genre):
data = self._read(genre)
else:
try_count = 0
expected_genre = genre
while try_count < 3:
self._serial_port.reset_input_buffer()
self._write(self._flatten(real_command))
data = self._read(genre)
if data is not None and data != b'':
break
try_count += 1
if not data or len(data) < 4:
try_count += 1
continue
if data[3] != expected_genre:
try_count += 1
continue
break
else:
return -1
if genre == ProtocolCode.SET_SSID_PWD:
Expand Down
11 changes: 8 additions & 3 deletions pymycobot/mycobot280socket.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,17 @@ def _res(self, real_command, has_reply, genre):
data = self._read(genre, method='socket')
else:
try_count = 0
expected_genre = genre
while try_count < 3:
self._write(self._flatten(real_command), "socket")
data = self._read(genre, method='socket')
if data is not None and data != b'':
break
try_count += 1
if not data or len(data) < 4:
try_count += 1
continue
if data[3] != expected_genre:
try_count += 1
continue
break
else:
return -1
if genre == ProtocolCode.SET_SSID_PWD:
Expand Down