gemian-fixes/codi-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to only call in_waiting once, improves reliability of quick flash mode

Browse source
This commit is contained in:
Adam Boardman 2020-12-20 10:14:50 +00:00
parent d9ef3757a3
commit da0f989e3d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
codi-app/xmodem/__init__.py
View file

@ -250,11 +250,12 @@ class YMODEM(object):
while True: while True:
char = self.ser.read(1) char = self.ser.read(1)
if char == CRC or char == CRC2 or char == CRC3: if char == CRC or char == CRC2 or char == CRC3:
if self.ser.in_waiting == 0: in_waiting = self.ser.in_waiting
if in_waiting == 0:
self.log.debug('header re-send: block %d, pks: %d', sequence, packet_size) self.log.debug('header re-send: block %d, pks: %d', sequence, packet_size)
self.ser.write(header + data + checksum) self.ser.write(header + data + checksum)
elif self.ser.in_waiting > 1: elif in_waiting > 1:
rubbish = self.ser.read(self.ser.in_waiting-1) rubbish = self.ser.read(in_waiting-1)
self.log.info('header got rubbish %r for block %d', rubbish, sequence) self.log.info('header got rubbish %r for block %d', rubbish, sequence)
continue continue
if char == ACK or char == ACK2: if char == ACK or char == ACK2:
@ -302,14 +303,15 @@ class YMODEM(object):
while True: while True:
char = self.ser.read(1) char = self.ser.read(1)
if char == CRC or char == CRC2 or char == CRC3: if char == CRC or char == CRC2 or char == CRC3:
in_waiting = self.ser.in_waiting
if slow_mode: if slow_mode:
self.log.debug('send: block %d, pks: %d', sequence, packet_size) self.log.debug('send: block %d, pks: %d', sequence, packet_size)
self.ser.write(header + data + checksum) self.ser.write(header + data + checksum)
elif self.ser.in_waiting == 0: elif in_waiting == 0:
self.log.debug('re-send: block %d, pks: %d', sequence, packet_size) self.log.debug('re-send: block %d, pks: %d', sequence, packet_size)
self.ser.write(header + data + checksum) self.ser.write(header + data + checksum)
elif self.ser.in_waiting > 1: elif in_waiting > 1:
rubbish = self.ser.read(self.ser.in_waiting-1) rubbish = self.ser.read(in_waiting-1)
self.log.info('got rubbish %r for block %d', rubbish, sequence) self.log.info('got rubbish %r for block %d', rubbish, sequence)
continue continue
if char == ACK or char == ACK2 or (char == NAK and not slow_mode): if char == ACK or char == ACK2 or (char == NAK and not slow_mode):