Elron_dev/mik32-uploader
7
0
Fork 0
mirror of https://github.com/MikronMIK32/mik32-uploader.git synced 2026-01-01 21:37:05 +03:00
Code Issues Actions Packages Projects Releases 2 Wiki Activity

fix adapter speed configuration

Browse Source
This commit is contained in:
Sergey Shchelkanov 2023-09-01 15:31:58 +03:00
parent 8c84f3a68c
commit c274798f6d
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mik32_upload.py
View File

@ -219,15 +219,25 @@ class OpenOCDStartupException(Exception):
return f"OpenOCD Startup Exception: {self.msg}" return f"OpenOCD Startup Exception: {self.msg}"
adapter_speed_not_supported = [
"altera-usb-blaster",
]
def run_openocd( def run_openocd(
openocd_exec=openocd_exec_path, openocd_exec=openocd_exec_path,
openocd_scripts=openocd_scripts_path, openocd_scripts=openocd_scripts_path,
openocd_interface=openocd_interface_path, openocd_interface=openocd_interface_path,
openocd_target=openocd_target_path, openocd_target=openocd_target_path,
adapter_speed=adapter_default_speed,
is_open_console=False is_open_console=False
) -> subprocess.Popen: ) -> subprocess.Popen:
cmd = [openocd_exec, "-s", openocd_scripts, cmd = [openocd_exec, "-s", openocd_scripts, "-f", openocd_interface]
"-f", openocd_interface, "-f", openocd_target]
if (all(openocd_interface.find(i) == -1 for i in adapter_speed_not_supported)):
cmd.extend(["-c", f"adapter speed {adapter_speed}"])
cmd.extend(["-f", openocd_target])
creation_flags = subprocess.SW_HIDE creation_flags = subprocess.SW_HIDE
if is_open_console: if is_open_console:
@ -272,11 +282,6 @@ def form_pages(segments: List[Segment], boot_mode=BootMode.UNDEFINED) -> Pages:
return Pages(pages_eeprom, pages_spifi) return Pages(pages_eeprom, pages_spifi)
adapter_speed_not_supported = [
"altera-usb-blaster",
]
def upload_file( def upload_file(
filename: str, filename: str,
host: str = '127.0.0.1', host: str = '127.0.0.1',
@ -315,8 +320,8 @@ def upload_file(
try: try:
logging.debug("OpenOCD try start!") logging.debug("OpenOCD try start!")
proc = run_openocd(openocd_exec, openocd_scripts, proc = run_openocd(openocd_exec, openocd_scripts, openocd_interface,
openocd_interface, openocd_target, is_open_console) openocd_target, adapter_speed, is_open_console)
logging.debug("OpenOCD started!") logging.debug("OpenOCD started!")
@ -324,8 +329,6 @@ def upload_file(
raise OpenOCDStartupException(e) raise OpenOCDStartupException(e)
try: try:
with OpenOcdTclRpc(host, port) as openocd: with OpenOcdTclRpc(host, port) as openocd:
if (all(openocd_interface.find(i) == -1 for i in adapter_speed_not_supported)):
openocd.run(f"adapter speed {adapter_speed}")
openocd.run(f"log_output \"{log_path}\"") openocd.run(f"log_output \"{log_path}\"")
openocd.run(f"debug_level 1") openocd.run(f"debug_level 1")

1
openocd-scripts/target/mik32.cfg
View File

@ -2,7 +2,6 @@
proc init_targets {} { proc init_targets {} {
adapter speed 500
reset_config trst_and_srst reset_config trst_and_srst
set _CHIPNAME riscv set _CHIPNAME riscv