Skip to content

Fix discovery of booter and CLR path #152

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

Merged
merged 1 commit into from
Aug 22, 2022
Merged

Fix discovery of booter and CLR path #152

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
16 changes: 14 additions & 2 deletions nanoFirmwareFlasher.Library/FirmwarePackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public abstract class FirmwarePackage : IDisposable
private readonly bool _preview;

private const string _readmeContent = "This folder contains nanoFramework firmware files. Can safely be removed.";

/// <summary>
/// Path with the base location for firmware packages.
/// </summary>
Expand Down Expand Up @@ -681,7 +681,13 @@ private void FindBooterStartAddress()
{
uint address;

// find out what's the CLR block start
if (string.IsNullOrEmpty(NanoClrFile))
{
// nothing to do here
return;
}

// find out what's the booter block start

// do this by reading the HEX format file...
var textLines = File.ReadAllLines(NanoBooterFile);
Expand Down Expand Up @@ -730,6 +736,12 @@ private void FindClrStartAddress()
{
uint address;

if (string.IsNullOrEmpty(NanoClrFile))
{
// nothing to do here
return;
}

// find out what's the CLR block start

// do this by reading the HEX format file...
Expand Down