Pad chunks to alignment (fix #25)

bessman · Nov 1, 2023 · a668b9d · a668b9d
1 parent e08993b
commit a668b9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [7.0.6] - 2023-11-01
+
+### Changed
+
+- Reformat changelog per Common Changelog style
+
+### Fixed
+
+- Actually use bincopy for alignment ([#25](https://github.com/bessman/mcbootflash/issues/25))
+
 ## [7.0.5] - 2023-10-31
 
 _Maintanence release._

diff --git a/src/mcbootflash/connection.py b/src/mcbootflash/connection.py
@@ -107,10 +107,11 @@ def flash(
         chunk_size -= chunk_size % self._write_size
         chunk_size //= hexdata.word_size_bytes
         total_bytes = len(hexdata) * hexdata.word_size_bytes
+        total_bytes += (self._write_size - total_bytes) % self._write_size
         written_bytes = 0
         align = self._write_size // hexdata.word_size_bytes
 
-        for chunk in hexdata.segments.chunks(chunk_size, align):
+        for chunk in hexdata.segments.chunks(chunk_size, align, b"\x00\x00"):
             self._write_flash(chunk)
             written_bytes += len(chunk.data)
             _logger.debug(