From d0d15eef6709a9308ea198fc226b8977124a9143 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 12 Mar 2025 09:46:02 +0100 Subject: [PATCH 1/2] toolkit: Fix imports. Signed-off-by: iabdalkader --- toolkit/isp/recovery.py | 8 ++++---- toolkit/maintenance.py | 21 +++++++++++---------- toolkit/updateSystemPackage.py | 10 +++++----- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/toolkit/isp/recovery.py b/toolkit/isp/recovery.py index e7491c4..b91d21b 100644 --- a/toolkit/isp/recovery.py +++ b/toolkit/isp/recovery.py @@ -18,13 +18,13 @@ # pylint: disable=unused-argument, invalid-name, bare-except import sys -from isp_protocol import * -from isp_core import * -from isp_util import * +from isp.isp_protocol import * +from isp.isp_core import * +from isp.isp_util import * import utils.config from utils.config import * from utils.user_validations import validateArgList -import device_probe +from isp import device_probe import time # Probe error codes diff --git a/toolkit/maintenance.py b/toolkit/maintenance.py index 3b7a3e2..62d8b92 100755 --- a/toolkit/maintenance.py +++ b/toolkit/maintenance.py @@ -16,21 +16,22 @@ import sys import argparse -from serialport import serialPort # ISP Serial support -from serialport import COM_TIMEOUT_RX_DEFAULT -from isp_protocol import * # ISP protocol constants -from isp_core import * -from isp_util import * -from isp_print import * -import device_probe +from isp.serialport import serialPort # ISP Serial support +from isp.serialport import COM_TIMEOUT_RX_DEFAULT +from isp.isp_protocol import * # ISP protocol constants +from isp.isp_core import * +from isp.isp_util import * +from isp.isp_print import * +from isp import device_probe # from isp_print import isp_print_color, isp_print_cursor_enable # from isp_print import isp_print_cursor_disable,isp_print_terminal_reset -from toc_decode import * # ISP TOC support -from power_decode import * # ISP POWER support +from isp.toc_decode import * # ISP TOC support +from isp.power_decode import * # ISP POWER support from utils.config import * from utils.user_validations import validateArgList -from recovery import recovery_action, recovery_action_no_reset +from isp.recovery import recovery_action, recovery_action_no_reset +import utils # Define Version constant for each separate tool diff --git a/toolkit/updateSystemPackage.py b/toolkit/updateSystemPackage.py index d8c81cd..98c71d1 100755 --- a/toolkit/updateSystemPackage.py +++ b/toolkit/updateSystemPackage.py @@ -12,13 +12,13 @@ import sys import argparse -from serialport import serialPort -from serialport import COM_BAUD_RATE_MAXIMUM +from isp.serialport import serialPort +from isp.serialport import COM_BAUD_RATE_MAXIMUM # import ispcommands -from isp_core import * -from isp_util import * -import device_probe +from isp.isp_core import * +from isp.isp_util import * +from isp import device_probe import utils.config from utils.config import * From 0cd381a782aa3eeaefbbf667b6f8ab0332859392 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 12 Mar 2025 09:46:33 +0100 Subject: [PATCH 2/2] toolkit: Add serial port arg for most tools. Add `--port` arg to `maintenance.py`, `updateSystemPackage.py` and `app-write-mram.py` Signed-off-by: iabdalkader --- toolkit/app-write-mram.py | 6 ++++-- toolkit/maintenance.py | 5 ++++- toolkit/updateSystemPackage.py | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/toolkit/app-write-mram.py b/toolkit/app-write-mram.py index 423e455..461455b 100755 --- a/toolkit/app-write-mram.py +++ b/toolkit/app-write-mram.py @@ -139,7 +139,9 @@ def main(): parser = argparse.ArgumentParser( description="NVM Burner for Application TOC Package" ) - parser.add_argument("-d", "--device", type=str, help="serial port device") + parser.add_argument( + "--port", type=str, help="Serial port device", default="/dev/ttyACM0" + ) parser.add_argument("-b", "--baudrate", help="serial port baud rate", type=int) parser.add_argument( "-e", @@ -366,7 +368,7 @@ def main(): isp.discoverSerialPorts() """ - errorCode = isp.openSerial(args.device) + errorCode = isp.openSerial(args.port) if errorCode is False: print("[ERROR] isp openSerial failed for %s" % isp.getPort()) sys.exit(EXIT_WITH_ERROR) diff --git a/toolkit/maintenance.py b/toolkit/maintenance.py index 62d8b92..21526ef 100755 --- a/toolkit/maintenance.py +++ b/toolkit/maintenance.py @@ -725,6 +725,9 @@ def main(): # Deal with Command Line parser = argparse.ArgumentParser(description="FUSION Maintenance Tool") + parser.add_argument( + "--port", type=str, help="Serial port device", default="/dev/ttyACM0" + ) parser.add_argument("-b", "--baudrate", help="serial port baud rate", type=int) parser.add_argument( "-d", @@ -776,7 +779,7 @@ def main(): print("Discover") isp.discoverSerialPorts() - errorCode = isp.openSerial() + errorCode = isp.openSerial(args.port) if errorCode is False: print("[ERROR] isp openSerial failed for %s" % isp.getPort()) sys.exit(EXIT_WITH_ERROR) diff --git a/toolkit/updateSystemPackage.py b/toolkit/updateSystemPackage.py index 98c71d1..76fbb39 100755 --- a/toolkit/updateSystemPackage.py +++ b/toolkit/updateSystemPackage.py @@ -83,6 +83,9 @@ def main(): default=False, help="COM port discovery for ISP", ) + parser.add_argument( + "--port", type=str, help="Serial port device", default="/dev/ttyACM0" + ) parser.add_argument( "-b", "--baudrate", help="(isp) serial port baud rate", type=int ) @@ -147,7 +150,7 @@ def main(): if args.discover: # discover the COM ports if requested isp.discoverSerialPorts() - errorCode = isp.openSerial() + errorCode = isp.openSerial(args.port) if errorCode is False: print("[ERROR] isp openSerial failed for %s" % isp.getPort()) sys.exit(EXIT_WITH_ERROR)