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

stc8: finish up frequency calibration

Browse Source 
This is a collection of various changes:

* Also try divider of 5 (it's used by STC-ISP)
* Use the correct IAP delay for the 24 MHz programming frequency
* Also try a trim adjust value of 0x03 and adjust trim ranges
* Fix display of calibrated frequency
This commit is contained in:
Grigori Goronzy 2018-08-20 23:47:42 +02:00
parent 85e815366c
commit 0ffcbd197b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stcgal/protocols.py
View File

@ -1552,6 +1552,7 @@ class Stc8Protocol(Stc15Protocol):
def __init__(self, port, handshake, baud, trim): def __init__(self, port, handshake, baud, trim):
Stc15Protocol.__init__(self, port, handshake, baud, trim) Stc15Protocol.__init__(self, port, handshake, baud, trim)
self.trim_divider = None
def program_options(self): def program_options(self):
# XXX: not yet implemented # XXX: not yet implemented
@ -1610,9 +1611,10 @@ class Stc8Protocol(Stc15Protocol):
raise StcProtocolException("incorrect magic in handshake packet") raise StcProtocolException("incorrect magic in handshake packet")
# select ranges and trim values # select ranges and trim values
for divider in (1, 2, 4): for divider in (1, 2, 3, 4, 5):
user_trim = self.choose_range(packet, response, target_user_count * divider) user_trim = self.choose_range(packet, response, target_user_count * divider)
if user_trim is not None: if user_trim is not None:
self.trim_divider = divider
break break
if user_trim is None: if user_trim is None:
raise StcProtocolException("frequency trimming unsuccessful") raise StcProtocolException("frequency trimming unsuccessful")
@ -1620,12 +1622,14 @@ class Stc8Protocol(Stc15Protocol):
# calibration, round 2 # calibration, round 2
packet = bytes([0x00]) packet = bytes([0x00])
packet += struct.pack(">B", 12) packet += struct.pack(">B", 12)
for i in range(user_trim[0] - 2, user_trim[0] + 2): for i in range(user_trim[0] - 1, user_trim[0] + 2):
packet += bytes([i & 0xff, 0x00]) packet += bytes([i & 0xff, 0x00])
for i in range(user_trim[0] - 2, user_trim[0] + 2): for i in range(user_trim[0] - 1, user_trim[0] + 2):
packet += bytes([i & 0xff, 0x01]) packet += bytes([i & 0xff, 0x01])
for i in range(user_trim[0] - 2, user_trim[0] + 2): for i in range(user_trim[0] - 1, user_trim[0] + 2):
packet += bytes([i & 0xff, 0x02]) packet += bytes([i & 0xff, 0x02])
for i in range(user_trim[0] - 1, user_trim[0] + 2):
packet += bytes([i & 0xff, 0x03])
self.write_packet(packet) self.write_packet(packet)
self.pulse(b"\xfe", timeout=1.0) self.pulse(b"\xfe", timeout=1.0)
response = self.read_packet() response = self.read_packet()
@ -1635,7 +1639,7 @@ class Stc8Protocol(Stc15Protocol):
# select final values # select final values
user_trim, user_count = self.choose_trim(packet, response, target_user_count) user_trim, user_count = self.choose_trim(packet, response, target_user_count)
self.trim_value = user_trim self.trim_value = user_trim
self.trim_frequency = round(user_count * (self.baud_handshake / 2)) self.trim_frequency = round(user_count * (self.baud_handshake / 2) / self.trim_divider)
print("%.03f MHz" % (self.trim_frequency / 1E6)) print("%.03f MHz" % (self.trim_frequency / 1E6))
# switch to programming frequency # switch to programming frequency
@ -1645,7 +1649,7 @@ class Stc8Protocol(Stc15Protocol):
bauds = self.baud_transfer * 4 bauds = self.baud_transfer * 4
packet += struct.pack(">H", int(65535 - 24E6 / bauds)) packet += struct.pack(">H", int(65535 - 24E6 / bauds))
packet += bytes([user_trim[1], user_trim[0]]) packet += bytes([user_trim[1], user_trim[0]])
iap_wait = self.get_iap_delay(user_speed) iap_wait = self.get_iap_delay(24E6)
packet += bytes([iap_wait]) packet += bytes([iap_wait])
self.write_packet(packet) self.write_packet(packet)
response = self.read_packet() response = self.read_packet()