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

Исправлена передача выходного значения и некорректный вывод при ошибках

Browse Source
This commit is contained in:
sh-sergey 2024-11-05 14:58:08 +03:00
parent 36c61379d7
commit bb0b86d37b
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mik32_upload.py
View File

@ -277,8 +277,9 @@ def upload_file(
) * memory_page_size[MemoryType.EEPROM] ) * memory_page_size[MemoryType.EEPROM]
t = time.localtime() t = time.localtime()
current_time = time.strftime("%H:%M:%S", t) current_time = time.strftime("%H:%M:%S", t)
print( if result == 0:
f"[{current_time}] Wrote {write_size} bytes in {write_time:.2f} seconds (effective {(write_size/(write_time*1024)):.1f} kbyte/s)") print(
f"[{current_time}] Wrote {write_size} bytes in {write_time:.2f} seconds (effective {(write_size/(write_time*1024)):.1f} kbyte/s)")
if (pages.pages_spifi.__len__() > 0): if (pages.pages_spifi.__len__() > 0):
gpio_init(openocd, mik_version) gpio_init(openocd, mik_version)
start_time = time.perf_counter() start_time = time.perf_counter()
@ -300,8 +301,9 @@ def upload_file(
) * memory_page_size[MemoryType.SPIFI] ) * memory_page_size[MemoryType.SPIFI]
t = time.localtime() t = time.localtime()
current_time = time.strftime("%H:%M:%S", t) current_time = time.strftime("%H:%M:%S", t)
print( if result == 0:
f"[{current_time}] Wrote {write_size} bytes in {write_time:.2f} seconds (effective {(write_size/(write_time*1024)):.1f} kbyte/s)") print(
f"[{current_time}] Wrote {write_size} bytes in {write_time:.2f} seconds (effective {(write_size/(write_time*1024)):.1f} kbyte/s)")
gpio_deinit(openocd, mik_version) gpio_deinit(openocd, mik_version)
segments_ram = list(filter( segments_ram = list(filter(
@ -442,22 +444,24 @@ if __name__ == '__main__':
print(program_name) print(program_name)
if namespace.filepath: if namespace.filepath:
upload_file( exit(
namespace.filepath, upload_file(
host=namespace.openocd_host, namespace.filepath,
port=namespace.openocd_port, host=namespace.openocd_host,
is_run_openocd=namespace.run_openocd, port=namespace.openocd_port,
use_quad_spi=namespace.use_quad_spi, is_run_openocd=namespace.run_openocd,
openocd_exec=namespace.openocd_exec, use_quad_spi=namespace.use_quad_spi,
openocd_scripts=namespace.openocd_scripts, openocd_exec=namespace.openocd_exec,
openocd_interface=namespace.openocd_interface, openocd_scripts=namespace.openocd_scripts,
openocd_target=namespace.openocd_target, openocd_interface=namespace.openocd_interface,
adapter_speed=namespace.adapter_speed, openocd_target=namespace.openocd_target,
is_open_console=namespace.open_console, adapter_speed=namespace.adapter_speed,
boot_mode=namespace.boot_mode, is_open_console=namespace.open_console,
log_path=namespace.log_path, boot_mode=namespace.boot_mode,
post_action=namespace.post_action, log_path=namespace.log_path,
mik_version=namespace.mcu_type post_action=namespace.post_action,
mik_version=namespace.mcu_type
)
) )
else: else:
print("Nothing to upload") print("Nothing to upload")