Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: Fix imports and add serial port arg for maintenance and updateSystemPakcage. #4

Merged
merged 2 commits into from
Mar 13, 2025
Merged

tools: Fix imports and add serial port arg for maintenance and updateSystemPakcage. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0d15ee
toolkit: Fix imports.
iabdalkader Mar 12, 2025
0cd381a
toolkit: Add serial port arg for most tools.
iabdalkader Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions toolkit/app-write-mram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions toolkit/isp/recovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 15 additions & 11 deletions toolkit/maintenance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -724,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",
Expand Down Expand Up @@ -775,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)
Expand Down
15 changes: 9 additions & 6 deletions toolkit/updateSystemPackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *

Expand Down Expand Up @@ -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
)
Expand Down Expand Up @@ -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)
Expand Down