Skip to content

Fix verification bug: only verify modified pages #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sijk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix verification bug: only verify modified pages #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 25 additions & 10 deletions Source/ArduinoUploader/BootloaderProgrammers/BootloaderProgrammer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,32 @@ public virtual void VerifyProgram(MemoryBlock memoryBlock, IProgress<double> pro
for (offset = 0; offset < sizeToVerify; offset += pageSize)
{
progress?.Report((double) (sizeToVerify + offset) / (sizeToVerify * 2));
Logger?.Debug($"Executing verification of bytes @ address {offset} (page size {pageSize})...");
var bytesToVerify = memoryBlock.Cells.Skip(offset).Take(pageSize).Select(x => x.Value).ToArray();
LoadAddress(flashMem, offset);
var bytesPresent = ExecuteReadPage(flashMem);
var succeeded = bytesToVerify.SequenceEqual(bytesPresent);
if (succeeded) continue;

Logger?.Info(
$"Expected: {BitConverter.ToString(bytesToVerify)}."
+ $"{Environment.NewLine}Read after write: {BitConverter.ToString(bytesPresent)}");
throw new ArduinoUploaderException("Difference encountered during verification!");
var needsVerify = false;
for (var i = offset; i < offset + pageSize; i++)
{
if (!memoryBlock.Cells[i].Modified) continue;
needsVerify = true;
break;
}
if (needsVerify)
{
Logger?.Debug($"Executing verification of bytes @ address {offset} (page size {pageSize})...");
var bytesToVerify = memoryBlock.Cells.Skip(offset).Take(pageSize).Select(x => x.Value).ToArray();
LoadAddress(flashMem, offset);
var bytesPresent = ExecuteReadPage(flashMem);
var succeeded = bytesToVerify.SequenceEqual(bytesPresent);
if (succeeded) continue;

Logger?.Info(
$"Expected: {BitConverter.ToString(bytesToVerify)}."
+ $"{Environment.NewLine}Read after write: {BitConverter.ToString(bytesPresent)}");
throw new ArduinoUploaderException("Difference encountered during verification!");
}
else
{
Logger?.Trace("Skip verifying page...");
}
}
Logger?.Info($"{sizeToVerify} bytes verified!");
}
Expand Down