From 7490faf39b5dddc2431d170f15f1a38a9018c2a2 Mon Sep 17 00:00:00 2001 From: dherrada Date: Fri, 5 Nov 2021 03:11:27 -0400 Subject: [PATCH] Linted --- adafruit_avrprog.py | 140 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/adafruit_avrprog.py b/adafruit_avrprog.py index ccd6e12..ab8dae2 100644 --- a/adafruit_avrprog.py +++ b/adafruit_avrprog.py @@ -125,53 +125,53 @@ def program_file(self, chip, file_name, verbose=False, verify=True): # create a file state dictionary file_state = {"line": 0, "ext_addr": 0, "eof": False} - file_state["f"] = open(file_name, "r") + with open(file_name, "r") as file_state[ # pylint: disable=unspecified-encoding + "f" + ]: + page_size = chip["page_size"] - page_size = chip["page_size"] - - for page_addr in range(0, chip["flash_size"], page_size): - if verbose: - print("Programming page $%04X..." % page_addr, end="") - page_buffer = bytearray(page_size) - for b in range(page_size): - page_buffer[b] = 0xFF # make an empty page - - read_hex_page(file_state, page_addr, page_size, page_buffer) - - if all(v == 255 for v in page_buffer): + for page_addr in range(0, chip["flash_size"], page_size): if verbose: - print("skipping") - continue + print("Programming page $%04X..." % page_addr, end="") + page_buffer = bytearray(page_size) + for b in range(page_size): + page_buffer[b] = 0xFF # make an empty page - # print("From HEX file: ", page_buffer) - self._flash_page(bytearray(page_buffer), page_addr, page_size) + read_hex_page(file_state, page_addr, page_size, page_buffer) - if not verify: - if verbose: - print("done!") - continue + if all(v == 255 for v in page_buffer): + if verbose: + print("skipping") + continue - if verbose: - print("Verifying page @ $%04X" % page_addr) - read_buffer = bytearray(page_size) - self.read(page_addr, read_buffer) - # print("From memory: ", read_buffer) + # print("From HEX file: ", page_buffer) + self._flash_page(bytearray(page_buffer), page_addr, page_size) - if page_buffer != read_buffer: - if verbose: - # pylint: disable=line-too-long - print( - "Verify fail at address %04X\nPage should be: %s\nBut contains: %s" - % (page_addr, page_buffer, read_buffer) - ) - # pylint: enable=line-too-long - self.end() - return False + if not verify: + if verbose: + print("done!") + continue - if file_state["eof"]: - break # we're done, bail! + if verbose: + print("Verifying page @ $%04X" % page_addr) + read_buffer = bytearray(page_size) + self.read(page_addr, read_buffer) + # print("From memory: ", read_buffer) + + if page_buffer != read_buffer: + if verbose: + # pylint: disable=line-too-long + print( + "Verify fail at address %04X\nPage should be: %s\nBut contains: %s" + % (page_addr, page_buffer, read_buffer) + ) + # pylint: enable=line-too-long + self.end() + return False + + if file_state["eof"]: + break # we're done, bail! - file_state["f"].close() self.end() return True @@ -185,40 +185,40 @@ def verify_file(self, chip, file_name, verbose=False): # create a file state dictionary file_state = {"line": 0, "ext_addr": 0, "eof": False} - file_state["f"] = open(file_name, "r") + with open(file_name, "r") as file_name[ # pylint: disable=unspecified-encoding + "f" + ]: + page_size = chip["page_size"] + clock_speed = getattr(chip, "clock_speed", _FAST_CLOCK) + self.begin(clock=clock_speed) + for page_addr in range(0x0, chip["flash_size"], page_size): + page_buffer = bytearray(page_size) + for b in range(page_size): + page_buffer[b] = 0xFF # make an empty page + + read_hex_page(file_state, page_addr, page_size, page_buffer) - page_size = chip["page_size"] - clock_speed = getattr(chip, "clock_speed", _FAST_CLOCK) - self.begin(clock=clock_speed) - for page_addr in range(0x0, chip["flash_size"], page_size): - page_buffer = bytearray(page_size) - for b in range(page_size): - page_buffer[b] = 0xFF # make an empty page - - read_hex_page(file_state, page_addr, page_size, page_buffer) - - if verbose: - print("Verifying page @ $%04X" % page_addr) - read_buffer = bytearray(page_size) - self.read(page_addr, read_buffer) - # print("From memory: ", read_buffer) - # print("From file : ", page_buffer) - - if page_buffer != read_buffer: if verbose: - # pylint: disable=line-too-long - print( - "Verify fail at address %04X\nPage should be: %s\nBut contains: %s" - % (page_addr, page_buffer, read_buffer) - ) - # pylint: enable=line-too-long - self.end() - return False - - if file_state["eof"]: - break # we're done, bail! + print("Verifying page @ $%04X" % page_addr) + read_buffer = bytearray(page_size) + self.read(page_addr, read_buffer) + # print("From memory: ", read_buffer) + # print("From file : ", page_buffer) + + if page_buffer != read_buffer: + if verbose: + # pylint: disable=line-too-long + print( + "Verify fail at address %04X\nPage should be: %s\nBut contains: %s" + % (page_addr, page_buffer, read_buffer) + ) + # pylint: enable=line-too-long + self.end() + return False + + if file_state["eof"]: + break # we're done, bail! - file_state["f"].close() self.end() return True