7u83/stcgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: 7u83:master
Branches Tags
7u83:master
7u83:stc8h2k08u
7u83:fix-stc15f104w
7u83:github-actions
7u83:coveralls
7u83:fix-ci
7u83:better-docs
7u83:stc8
7u83:debian-fixes
7u83:delay-calculation
7u83:advanced-tests
7u83:ci-test
7u83:osx-fix
7u83:stc15-baudswitch
7u83:no_verification
7u83:stc12b
7u83:usbisp
7u83:fix-ch340
7u83:packaging
7u83:v1.10
7u83:v1.9
7u83:v1.8
7u83:v1.7
7u83:v1.6
7u83:v1.5
7u83:v1.4
7u83:v1.3
7u83:v1.2
7u83:v1.1
7u83:v1.0
...
pull from: 7u83:delay-calculation
Branches Tags
7u83:stc8h2k08u
7u83:master
7u83:fix-stc15f104w
7u83:github-actions
7u83:coveralls
7u83:fix-ci
7u83:better-docs
7u83:stc8
7u83:debian-fixes
7u83:delay-calculation
7u83:advanced-tests
7u83:ci-test
7u83:osx-fix
7u83:stc15-baudswitch
7u83:no_verification
7u83:stc12b
7u83:usbisp
7u83:fix-ch340
7u83:packaging
7u83:v1.10
7u83:v1.9
7u83:v1.8
7u83:v1.7
7u83:v1.6
7u83:v1.5
7u83:v1.4
7u83:v1.3
7u83:v1.2
7u83:v1.1
7u83:v1.0

2 Commits
master ... delay-calc

Author SHA1 Message Date
Andrew 'ncrmnt' Andrianov
a414bfb864 protocols.py: Increase clock_safety_factor to 2.5 
This fixes cp2102 and ch341a baudswitch on mac sierra

Signed-off-by: Andrew 'ncrmnt' Andrianov <andrew@ncrmnt.org>
 2017-10-14 21:08:26 +03:00
Grigori Goronzy
68d19f7b88 Use calculated delays 
Some serial drivers don't handle draining the transmit buffer
correctly. This has been handled with a long delay so far, which might
be problematic. There's a race condition with some protocol versions.

Until STC15, the baud rate switch is initiated with a command sent by
stcgal, which is replied to by the MCU with the new baud rate. So the
switch of the baud rate has to be done after the command has finished
transmission, but before the MCU has started to transmit the response.

This change calculates the minimum delay needed (with some tolerance
added) so that it's unlikely that the baud rate switch will happen
too late.
 2017-10-10 22:11:07 +02:00
1 changed files with 21 additions and 9 deletions
Show Stats Expand all files Collapse all files

30
stcgal/protocols.py
View File

@ -238,6 +238,20 @@ class StcBaseProtocol:
return iap_wait
def delay_safely_written(self, length):
"""
Delay until data has been safely written and sent to device.
Some buggy serial drivers don't implement tcdrain/flush correctly.
That is, they wait until all data has been written to USB, but they
do not wait until the data has actually finished transmission.
Add additional delay to work around.
"""
bit_time = 1.0 / self.ser.baudrate
byte_time = bit_time * 11.0 # start, 8 data bits, stop, parity
clock_safety_factor = 2.5 # additional delay in case clock is slow
time.sleep(byte_time * length * clock_safety_factor)
def set_option(self, name, value):
self.options.set_option(name, value)
@ -448,7 +462,7 @@ class Stc89Protocol(StcBaseProtocol):
packet += struct.pack(">H", brt)
packet += bytes([0xff - (brt >> 8), brt_csum, delay, iap])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
self.ser.baudrate = self.baud_handshake
@ -462,7 +476,7 @@ class Stc89Protocol(StcBaseProtocol):
packet += struct.pack(">H", brt)
packet += bytes([0xff - (brt >> 8), brt_csum, delay])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
if response[0] != 0x8e:
@ -638,7 +652,7 @@ class Stc12AProtocol(Stc12AOptionsMixIn, Stc89Protocol):
sys.stdout.flush()
packet = bytes([0x8f, 0xc0, brt, 0x3f, brt_csum, delay, iap])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
self.ser.baudrate = self.baud_handshake
@ -650,7 +664,7 @@ class Stc12AProtocol(Stc12AOptionsMixIn, Stc89Protocol):
sys.stdout.flush()
packet = bytes([0x8e, 0xc0, brt, 0x3f, brt_csum, delay])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
if response[0] != 0x8e:
@ -835,7 +849,7 @@ class Stc12BaseProtocol(StcBaseProtocol):
sys.stdout.flush()
packet = bytes([0x8f, 0xc0, brt, 0x3f, brt_csum, delay, iap])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
self.ser.baudrate = self.baud_handshake
@ -847,7 +861,7 @@ class Stc12BaseProtocol(StcBaseProtocol):
sys.stdout.flush()
packet = bytes([0x8e, 0xc0, brt, 0x3f, brt_csum, delay])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
if response[0] != 0x84:
@ -1121,7 +1135,7 @@ class Stc15AProtocol(Stc12Protocol):
packet += struct.pack(">B", 230400 // self.baud_transfer)
packet += bytes([0xa1, 0x64, 0xb8, 0x00, iap_wait, 0x20, 0xff, 0x00])
self.write_packet(packet)
time.sleep(0.2)
self.delay_safely_written(len(packet))
self.ser.baudrate = self.baud_transfer
response = self.read_packet()
if response[0] != 0x84:
@ -1307,7 +1321,6 @@ class Stc15Protocol(Stc15AProtocol):
response = self.read_packet()
if response[0] != 0x01:
raise StcProtocolException("incorrect magic in handshake packet")
time.sleep(0.2)
self.ser.baudrate = self.baud_transfer
def switch_baud_ext(self):
@ -1324,7 +1337,6 @@ class Stc15Protocol(Stc15AProtocol):
response = self.read_packet()
if response[0] != 0x01:
raise StcProtocolException("incorrect magic in handshake packet")
time.sleep(0.2)
self.ser.baudrate = self.baud_transfer
# for switching back to RC, program factory values