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

stc15a,stc15: properly set IAP wait states

Browse Source 
Refactor the old code from stc12a/stc12 and use it in stc15a/stc15
to set the IAP wait states. Verified by timing the erase time.
This commit is contained in:
Grigori Goronzy 2015-11-24 23:08:11 +01:00
parent d0a9b61482
commit 0ed9ac9229
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
stcgal/protocols.py
View File

@ -692,6 +692,20 @@ class StcBaseProtocol:
raise StcProtocolException("incorrect magic in status packet") raise StcProtocolException("incorrect magic in status packet")
return status_packet return status_packet
def get_iap_delay(self, clock_hz):
"""IAP wait states for STC12A+ (according to datasheet(s))"""
iap_wait = 0x80
if clock_hz < 1E6: iap_wait = 0x87
elif clock_hz < 2E6: iap_wait = 0x86
elif clock_hz < 3E6: iap_wait = 0x85
elif clock_hz < 6E6: iap_wait = 0x84
elif clock_hz < 12E6: iap_wait = 0x83
elif clock_hz < 20E6: iap_wait = 0x82
elif clock_hz < 24E6: iap_wait = 0x81
return iap_wait
def set_option(self, name, value): def set_option(self, name, value):
self.options.set_option(name, value) self.options.set_option(name, value)
@ -1033,15 +1047,8 @@ class Stc12AProtocol(Stc89Protocol):
print("WARNING: baudrate error is %.2f%%. You may need to set a slower rate." % print("WARNING: baudrate error is %.2f%%. You may need to set a slower rate." %
baud_error, file=sys.stderr) baud_error, file=sys.stderr)
# IAP wait states (according to datasheet(s)) # IAP wait states
iap_wait = 0x80 iap_wait = self.get_iap_delay(self.mcu_clock_hz)
if self.mcu_clock_hz < 1E6: iap_wait = 0x87
elif self.mcu_clock_hz < 2E6: iap_wait = 0x86
elif self.mcu_clock_hz < 3E6: iap_wait = 0x85
elif self.mcu_clock_hz < 6E6: iap_wait = 0x84
elif self.mcu_clock_hz < 12E6: iap_wait = 0x83
elif self.mcu_clock_hz < 20E6: iap_wait = 0x82
elif self.mcu_clock_hz < 24E6: iap_wait = 0x81
# MCU delay after switching baud rates # MCU delay after switching baud rates
delay = 0x80 delay = 0x80
@ -1251,15 +1258,8 @@ class Stc12Protocol(StcBaseProtocol):
print("WARNING: baudrate error is %.2f%%. You may need to set a slower rate." % print("WARNING: baudrate error is %.2f%%. You may need to set a slower rate." %
baud_error, file=sys.stderr) baud_error, file=sys.stderr)
# IAP wait states (according to datasheet(s)) # IAP wait states
iap_wait = 0x80 iap_wait = self.get_iap_delay(self.mcu_clock_hz)
if self.mcu_clock_hz < 1E6: iap_wait = 0x87
elif self.mcu_clock_hz < 2E6: iap_wait = 0x86
elif self.mcu_clock_hz < 3E6: iap_wait = 0x85
elif self.mcu_clock_hz < 6E6: iap_wait = 0x84
elif self.mcu_clock_hz < 12E6: iap_wait = 0x83
elif self.mcu_clock_hz < 20E6: iap_wait = 0x82
elif self.mcu_clock_hz < 24E6: iap_wait = 0x81
# MCU delay after switching baud rates # MCU delay after switching baud rates
delay = 0x80 delay = 0x80
@ -1586,10 +1586,11 @@ class Stc15AProtocol(Stc12Protocol):
# finally, switch baudrate # finally, switch baudrate
print("Switching to %d baud: " % self.baud_transfer, end="") print("Switching to %d baud: " % self.baud_transfer, end="")
sys.stdout.flush() sys.stdout.flush()
iap_wait = self.get_iap_delay(program_speed)
packet = bytes([0x8e]) packet = bytes([0x8e])
packet += struct.pack(">H", program_trim) packet += struct.pack(">H", program_trim)
packet += struct.pack(">B", 230400 // self.baud_transfer) packet += struct.pack(">B", 230400 // self.baud_transfer)
packet += bytes([0xa1, 0x64, 0xb8, 0x00, 0x81, 0x20, 0xff, 0x00]) packet += bytes([0xa1, 0x64, 0xb8, 0x00, iap_wait, 0x20, 0xff, 0x00])
self.write_packet(packet) self.write_packet(packet)
time.sleep(0.2) time.sleep(0.2)
self.ser.baudrate = self.baud_transfer self.ser.baudrate = self.baud_transfer
@ -1775,7 +1776,8 @@ class Stc15Protocol(Stc15AProtocol):
bauds = self.baud_transfer if (self.mcu_magic >> 8) == 0xf2 else self.baud_transfer * 4 bauds = self.baud_transfer if (self.mcu_magic >> 8) == 0xf2 else self.baud_transfer * 4
packet += struct.pack(">H", int(65535 - program_speed / bauds)) packet += struct.pack(">H", int(65535 - program_speed / bauds))
packet += struct.pack(">H", int(65535 - (program_speed / bauds) * 1.5)) packet += struct.pack(">H", int(65535 - (program_speed / bauds) * 1.5))
packet += bytes([0x83]) iap_wait = self.get_iap_delay(program_speed)
packet += bytes([iap_wait])
self.write_packet(packet) self.write_packet(packet)
response = self.read_packet() response = self.read_packet()
if response[0] != 0x01: if response[0] != 0x01:
@ -1791,7 +1793,8 @@ class Stc15Protocol(Stc15AProtocol):
packet = bytes([0x01]) packet = bytes([0x01])
packet += bytes([self.freq_count_24, 0x40]) packet += bytes([self.freq_count_24, 0x40])
packet += struct.pack(">H", int(65535 - self.mcu_clock_hz / self.baud_transfer / 4)) packet += struct.pack(">H", int(65535 - self.mcu_clock_hz / self.baud_transfer / 4))
packet += bytes([0x00, 0x00, 0x83]) iap_wait = self.get_iap_delay(self.mcu_clock_hz)
packet += bytes([0x00, 0x00, iap_wait])
self.write_packet(packet) self.write_packet(packet)
response = self.read_packet() response = self.read_packet()
if response[0] != 0x01: if response[0] != 0x01: