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

refactor, impl adapter speed, hide tcl reply

Browse Source
This commit is contained in:
Sergey Shchelkanov 2023-06-19 12:27:16 +03:00
parent 7b405a5ba8
commit 082f6b798c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mik32_upload.py
View File

@ -25,7 +25,7 @@ openocd_scripts_path = os.path.join("openocd", "share", "openocd", "scripts")
openocd_interface_path = os.path.join("interface", "ftdi", "m-link.cfg") openocd_interface_path = os.path.join("interface", "ftdi", "m-link.cfg")
openocd_target_path = os.path.join("target", "mik32.cfg") openocd_target_path = os.path.join("target", "mik32.cfg")
openocd_default_speed = 500 adapter_default_speed = 500
supported_text_formats = [".hex"] supported_text_formats = [".hex"]
@ -71,10 +71,10 @@ class Segment:
self.data = data self.data = data
for section in mik32v0_sections: for section in mik32v0_sections:
if self.belongs_memory_section(section, offset): if self._belongs_memory_section(section, offset):
self.memory = section self.memory = section
def belongs_memory_section(self, memory_section: MemorySection, offset: int) -> bool: def _belongs_memory_section(self, memory_section: MemorySection, offset: int) -> bool:
if offset < memory_section.offset: if offset < memory_section.offset:
return False return False
if offset >= (memory_section.offset + memory_section.length): if offset >= (memory_section.offset + memory_section.length):
@ -100,7 +100,7 @@ class FirmwareFile:
else: else:
raise Exception(f"Unsupported file format: {self.file_extension}") raise Exception(f"Unsupported file format: {self.file_extension}")
def parse_text(self) -> List[Segment]: def _parse_text(self) -> List[Segment]:
segments: List[Segment] = [] segments: List[Segment] = []
lba: int = 0 # Linear Base Address lba: int = 0 # Linear Base Address
@ -129,7 +129,7 @@ class FirmwareFile:
def get_segments(self) -> List[Segment]: def get_segments(self) -> List[Segment]:
if self.file_extension in supported_text_formats: if self.file_extension in supported_text_formats:
return self.parse_text() return self._parse_text()
elif self.file_extension == ".bin": elif self.file_extension == ".bin":
return [Segment(offset=0, data=self.file_content)] return [Segment(offset=0, data=self.file_content)]
@ -171,7 +171,7 @@ def upload_file(
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,
openocd_speed=openocd_default_speed, adapter_speed=adapter_default_speed,
) -> int: ) -> int:
""" """
Write ihex or binary file into MIK32 EEPROM or external flash memory Write ihex or binary file into MIK32 EEPROM or external flash memory
@ -208,12 +208,16 @@ def upload_file(
f"{openocd_exec} -s {openocd_scripts} " f"{openocd_exec} -s {openocd_scripts} "
f"-f {openocd_interface} -f {openocd_target}", posix=False f"-f {openocd_interface} -f {openocd_target}", posix=False
) )
proc = subprocess.Popen(
cmd, creationflags=subprocess.CREATE_NEW_CONSOLE | subprocess.SW_HIDE)
# proc = subprocess.Popen( # proc = subprocess.Popen(
# cmd, creationflags= subprocess.SW_HIDE) # cmd, creationflags=subprocess.CREATE_NEW_CONSOLE | subprocess.SW_HIDE)
proc = subprocess.Popen(
cmd, creationflags= subprocess.SW_HIDE)
with OpenOcdTclRpc(host, port) as openocd: with OpenOcdTclRpc(host, port) as openocd:
openocd.run(f"adapter speed {adapter_speed}")
openocd.run(f"log_output stdout")
openocd.run(f"debug_level 1")
pages_eeprom = segments_to_pages(list(filter( pages_eeprom = segments_to_pages(list(filter(
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.EEPROM), segments)), 128) lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.EEPROM), segments)), 128)
pages_spifi = segments_to_pages(list(filter( pages_spifi = segments_to_pages(list(filter(
@ -248,8 +252,8 @@ def createParser():
'--openocd-host', dest='openocd_host', default='127.0.0.1') '--openocd-host', dest='openocd_host', default='127.0.0.1')
parser.add_argument('--openocd-port', dest='openocd_port', parser.add_argument('--openocd-port', dest='openocd_port',
default=OpenOcdTclRpc.DEFAULT_PORT) default=OpenOcdTclRpc.DEFAULT_PORT)
parser.add_argument('--openocd-speed', dest='openocd_speed', parser.add_argument('--adapter-speed', dest='adapter_speed',
default=openocd_default_speed) default=adapter_default_speed)
parser.add_argument('--keep-halt', dest='keep_halt', parser.add_argument('--keep-halt', dest='keep_halt',
action='store_true', default=False) action='store_true', default=False)
parser.add_argument( parser.add_argument(
@ -281,7 +285,7 @@ if __name__ == '__main__':
openocd_scripts=namespace.openocd_scripts, openocd_scripts=namespace.openocd_scripts,
openocd_interface=namespace.openocd_interface, openocd_interface=namespace.openocd_interface,
openocd_target=namespace.openocd_target, openocd_target=namespace.openocd_target,
openocd_speed=namespace.openocd_speed, adapter_speed=namespace.adapter_speed,
) )
else: else:
print("Nothing to upload") print("Nothing to upload")