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

move pages forming to function

Browse Source
This commit is contained in:
Sergey Shchelkanov 2023-06-22 12:29:29 +03:00
parent 8c3f203dcc
commit 18a90599d4
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mik32_upload.py
View File

@ -196,6 +196,21 @@ def run_openocd(
return proc return proc
class Pages(NamedTuple):
pages_eeprom: Dict[int, List[int]]
pages_spifi: Dict[int, List[int]]
def form_pages(segments: List[Segment]) -> Pages:
pages_eeprom = segments_to_pages(list(filter(
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.EEPROM), segments)
), 128)
pages_spifi = segments_to_pages(list(filter(
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.SPIFI), segments)
), 256)
return Pages(pages_eeprom, pages_spifi)
def upload_file( def upload_file(
filename: str, filename: str,
host: str = '127.0.0.1', host: str = '127.0.0.1',
@ -225,7 +240,7 @@ def upload_file(
file = FirmwareFile(filename) file = FirmwareFile(filename)
segments: List[Segment] = file.get_segments() segments: List[Segment] = file.get_segments()
# print(segments) pages: Pages = form_pages(segments)
proc: Union[subprocess.Popen, None] = None proc: Union[subprocess.Popen, None] = None
if is_run_openocd: if is_run_openocd:
@ -237,19 +252,12 @@ def upload_file(
openocd.run(f"log_output stdout") openocd.run(f"log_output stdout")
openocd.run(f"debug_level 1") openocd.run(f"debug_level 1")
pages_eeprom = segments_to_pages(list(filter( if (pages.pages_eeprom.__len__() > 0):
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.EEPROM), segments)
), 128)
pages_spifi = segments_to_pages(list(filter(
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.SPIFI), segments)
), 256)
if (pages_eeprom.__len__() > 0):
result |= mik32_eeprom.write_pages( result |= mik32_eeprom.write_pages(
pages_eeprom, openocd, is_resume) pages.pages_eeprom, openocd, is_resume)
if (pages_spifi.__len__() > 0): if (pages.pages_spifi.__len__() > 0):
result |= mik32_spifi.write_pages( result |= mik32_spifi.write_pages(
pages_spifi, openocd, is_resume=is_resume, use_quad_spi=use_quad_spi) pages.pages_spifi, openocd, is_resume=is_resume, use_quad_spi=use_quad_spi)
segments_ram = list(filter( segments_ram = list(filter(
lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.RAM), segments)) lambda segment: (segment.memory is not None) and (segment.memory.type == MemoryType.RAM), segments))