From 9c184971ca0188df6ecaddf7ec313da6243e365a Mon Sep 17 00:00:00 2001 From: Sergey Shchelkanov Date: Mon, 29 May 2023 17:34:29 +0300 Subject: [PATCH] wip --- config.py | 1 + mik32_spifi.py | 7 ++++--- mik32_upload.py | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 config.py diff --git a/config.py b/config.py new file mode 100644 index 0000000..031e011 --- /dev/null +++ b/config.py @@ -0,0 +1 @@ +is_verbose = False \ No newline at end of file diff --git a/mik32_spifi.py b/mik32_spifi.py index fb7660d..c3911d6 100644 --- a/mik32_spifi.py +++ b/mik32_spifi.py @@ -3,6 +3,7 @@ from typing import Dict, List import time from tclrpc import TclException from tclrpc import OpenOcdTclRpc +import config # -------------------------- # PM register offset @@ -319,13 +320,13 @@ def spifi_read_data(openocd: OpenOcdTclRpc, address: int, byte_count: int, bin_d for i in range(byte_count): data8 = openocd.read_memory(SPIFI_CONFIG_DATA32, 8, 1)[0] read_data.append(data8) - if is_verbose: + if config.is_verbose: print(f"DATA[{i+address}] = {read_data[i]:#0x}") for i in range(byte_count): if read_data[i] != bin_data[i]: - print(f"DATA[{i+address}] = {read_data[i]:#0x} - ошибка") - return 1 + print(f"DATA[{(i+address):#0x}] = {read_data[i]:#0x}, expected {bin_data[i]:#0x}") + # return 1 return 0 diff --git a/mik32_upload.py b/mik32_upload.py index a46a761..7c485c1 100644 --- a/mik32_upload.py +++ b/mik32_upload.py @@ -9,6 +9,7 @@ import mik32_eeprom import mik32_spifi import mik32_ram from mik32_parsers import * +import config # class bcolors(Enum): @@ -245,7 +246,7 @@ def createParser(): default=OpenOcdTclRpc.DEFAULT_PORT) parser.add_argument('--keep-halt', dest='keep_halt', action='store_true', default=False) - parser.add_argument('--verbose', dest='is_verbose', + parser.add_argument('-v', '--verbose', dest='is_verbose', action='store_true', default=False) # parser.add_argument('-b', '--boot-mode', default='undefined') @@ -255,7 +256,7 @@ def createParser(): if __name__ == '__main__': parser = createParser() namespace = parser.parse_args() - is_verbose = namespace.is_verbose + config.is_verbose = namespace.is_verbose if namespace.filepath: upload_file(