Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pyocd/flash/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,12 +644,12 @@ def program(self, progress_cb=None, smart_flash=True, fast_verify=False, keep_un
total_time = self.perf.erase_time + self.perf.program_time
kbps = (self.program_byte_count / 1024) / total_time if total_time > 0 else 0
if self.last_erase_was_chip:
LOG.info("Erased chip, programmed %d bytes (%s), skipped %d bytes (%s) at %.02f kB/s",
LOG.info("Erased chip, programmed %d bytes (%s), identical %d bytes (%s) at %.02f kB/s",
actual_program_byte_count, get_page_count(actual_program_page_count),
skipped_byte_count, get_page_count(skipped_page_count),
kbps)
else:
LOG.info("Erased %d bytes (%s), programmed %d bytes (%s), skipped %d bytes (%s) at %.02f kB/s",
LOG.info("Erased %d bytes (%s), programmed %d bytes (%s), identical %d bytes (%s) at %.02f kB/s",
erase_byte_count, get_sector_count(erase_sector_count),
actual_program_byte_count, get_page_count(actual_program_page_count),
skipped_byte_count, get_page_count(skipped_page_count),
Expand Down
4 changes: 2 additions & 2 deletions pyocd/flash/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,15 @@ def _log_performance(self, perf_list):
kbps = (program_byte_count/1024) / totalTime

if any(perf.program_type == FlashBuilder.FLASH_CHIP_ERASE for perf in perf_list):
LOG.info("Erased chip, programmed %d bytes (%s), skipped %d bytes (%s) at %.02f kB/s",
LOG.info("Erased chip, programmed %d bytes (%s), identical %d bytes (%s) at %.02f kB/s",
actual_program_byte_count, get_page_count(actual_program_page_count),
skipped_byte_count, get_page_count(skipped_page_count),
kbps)
else:
erase_byte_count = sum(perf.erase_byte_count for perf in perf_list)
erase_sector_count = sum(perf.erase_sector_count for perf in perf_list)

LOG.info("Erased %d bytes (%s), programmed %d bytes (%s), skipped %d bytes (%s) at %.02f kB/s",
LOG.info("Erased %d bytes (%s), programmed %d bytes (%s), identical %d bytes (%s) at %.02f kB/s",
erase_byte_count, get_sector_count(erase_sector_count),
actual_program_byte_count, get_page_count(actual_program_page_count),
skipped_byte_count, get_page_count(skipped_page_count),
Expand Down
Loading