From 5815fcdbb962a8f4973c146ec6f9b64d26c3acdf Mon Sep 17 00:00:00 2001 From: dmg210 Date: Wed, 18 Dec 2024 17:05:46 +0000 Subject: [PATCH 1/3] absolute path for base --- bsl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsl.py b/bsl.py index cdffad3..7a562f7 100644 --- a/bsl.py +++ b/bsl.py @@ -31,7 +31,7 @@ def set_gui_log_handler(gui_callback): def resource_path(relative_path): """ Get absolute path to resource, works for dev and for PyInstaller """ - base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__))) + base_path = (os.path.dirname(os.path.abspath(__file__))) return os.path.join(base_path, relative_path) def ResetAdapter(ser): From 4c2c78bef91d20314adaeb5d2cdce327243001c3 Mon Sep 17 00:00:00 2001 From: dmg210 Date: Wed, 18 Dec 2024 17:23:49 +0000 Subject: [PATCH 2/3] bump gkbus version to '0.2.8' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0878a18..fa732cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ alive_progress==3.1.5 crcmod==1.7 -gkbus==0.2.7 +gkbus==0.2.8 pyqt5==5.15.10 PyYAML==6.0.1 From a9f47febc42f3e1a9265647d8637f0febf342ff3 Mon Sep 17 00:00:00 2001 From: dmg210 Date: Wed, 18 Dec 2024 18:21:27 +0000 Subject: [PATCH 3/3] add multi-comm support --- bsl.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bsl.py b/bsl.py index 7a562f7..8fdbf28 100644 --- a/bsl.py +++ b/bsl.py @@ -11,8 +11,8 @@ logger = logging.getLogger("bsl") logger.setLevel(logging.DEBUG) -# GUI log handler for directing logs to the GUI class GuiLogHandler(logging.Handler): + """Log handler for directing logs to the GUI""" def __init__(self, gui_callback): super().__init__() self.gui_callback = gui_callback @@ -21,14 +21,13 @@ def emit(self, record): message = self.format(record) self.gui_callback(message) -# Function to add the GUI log handler dynamically def set_gui_log_handler(gui_callback): + """ Add the GUI log handler dynamically""" gui_handler = GuiLogHandler(gui_callback) gui_handler.setLevel(logging.DEBUG) gui_handler.setFormatter(logging.Formatter("%(message)s")) logger.addHandler(gui_handler) - def resource_path(relative_path): """ Get absolute path to resource, works for dev and for PyInstaller """ base_path = (os.path.dirname(os.path.abspath(__file__))) @@ -313,9 +312,8 @@ def CallAtAddress(ser, addr, register): # 8 register words on r8-r15 def RunFunc(exit, ser, file, job, size, eetype, portAddr4, directionPortAddress4, pinnum, progress_callback=None, log_callback2=None): ResetAdapter(ser) SetAdapterKKL(ser) - + ser.reset_input_buffer() - char = b'' SYSCON_Addr = 0x00ff12 SYSCON_Data_ext = 0xe204 # from 15 -0: 3b stksz, 1b ROMS1, 1b SGTDIS, 1b ROMEN, 1b BYTDIS, 1b CLKEN, 1b WRCFG, 1b CSCFG, 1b reserved, @@ -904,7 +902,7 @@ def run_bsl_loop(progress_callback=None, log_callback2=None): while comcounter < len(ports): logger.info(f"num: {comcounter} : {ports[comcounter]}") comcounter += 1 - num = input("Type COM to use (pos number): ") + num = input("Select COM Port (position number): ") try: comcounter = int(num) if comcounter >= len(ports) or comcounter < 0: