sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts: bootprog.py: use bytes literals

This commit is contained in:
Nicolas Schodet 2022-04-15 20:39:14 +02:00 committed by Piotr Esden-Tempski
parent 6b465d6a77
commit 6c700f7b6c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/bootprog.py
View File

@ -35,10 +35,11 @@ class stm32_boot:
def _sync(self): def _sync(self):
# Send sync byte # Send sync byte
#print("sending sync byte") #print("sending sync byte")
self.serial.write(bytes((0x7F,))) self.serial.write(b"\x7f")
self._checkack() self._checkack()
def _sendcmd(self, cmd): def _sendcmd(self, cmd):
cmd = ord(cmd)
cmd = bytes((cmd, cmd ^ 0xff)) cmd = bytes((cmd, cmd ^ 0xff))
#print("sendcmd:", repr(cmd)) #print("sendcmd:", repr(cmd))
self.serial.write(cmd) self.serial.write(cmd)
@ -51,7 +52,7 @@ class stm32_boot:
self.serial.write(data) self.serial.write(data)
def _checkack(self): def _checkack(self):
ACK = bytes((0x79,)) ACK = b"\x79"
b = self.serial.read(1) b = self.serial.read(1)
if b != ACK: raise Exception("Invalid ack: %r" % b) if b != ACK: raise Exception("Invalid ack: %r" % b)
#print("got ack!") #print("got ack!")
@ -59,7 +60,7 @@ class stm32_boot:
def get(self): def get(self):
self._sendcmd(0x00) self._sendcmd(b"\x00")
self._checkack() self._checkack()
num = self.serial.read(1)[0] num = self.serial.read(1)[0]
data = self.serial.read(num+1) data = self.serial.read(num+1)
@ -68,27 +69,27 @@ class stm32_boot:
def eraseall(self): def eraseall(self):
# Send erase cmd # Send erase cmd
self._sendcmd(0x43) self._sendcmd(b"\x43")
self._checkack() self._checkack()
# Global erase # Global erase
self._sendcmd(0xff) self._sendcmd(b"\xff")
self._checkack() self._checkack()
def read(self, addr, len): def read(self, addr, len):
# Send read cmd # Send read cmd
self._sendcmd(0x11) self._sendcmd(b"\x11")
self._checkack() self._checkack()
# Send address # Send address
self._send(struct.pack(">L", addr)) self._send(struct.pack(">L", addr))
self._checkack() self._checkack()
# Send length # Send length
self._sendcmd(len-1) self._sendcmd(bytes((len-1,)))
self._checkack() self._checkack()
return self.serial.read(len) return self.serial.read(len)
def write(self, addr, data): def write(self, addr, data):
# Send write cmd # Send write cmd
self._sendcmd(0x31) self._sendcmd(b"\x31")
self._checkack() self._checkack()
# Send address # Send address
self._send(struct.pack(">L", addr)) self._send(struct.pack(">L", addr))
@ -99,7 +100,7 @@ class stm32_boot:
def write_protect(self, sectors): def write_protect(self, sectors):
# Send WP cmd # Send WP cmd
self._sendcmd(0x63) self._sendcmd(b"\x63")
self._checkack() self._checkack()
# Send sector list # Send sector list
self._send(bytes((len(sectors)-1,)) + bytes(sectors)) self._send(bytes((len(sectors)-1,)) + bytes(sectors))
@ -108,19 +109,19 @@ class stm32_boot:
self._sync() self._sync()
def write_unprotect(self): def write_unprotect(self):
self._sendcmd(0x73) self._sendcmd(b"\x73")
self._checkack() self._checkack()
self._checkack() self._checkack()
self._sync() self._sync()
def read_protect(self): def read_protect(self):
self._sendcmd(0x82) self._sendcmd(b"\x82")
self._checkack() self._checkack()
self._checkack() self._checkack()
self._sync() self._sync()
def read_unprotect(self): def read_unprotect(self):
self._sendcmd(0x92) self._sendcmd(b"\x92")
self._checkack() self._checkack()
self._checkack() self._checkack()
self._sync() self._sync()