Skip to content

Improvements on ESP32 flash operations #1

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
Jul 24, 2019
Merged

Improvements on ESP32 flash operations #1

Show file tree
Hide file tree
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: 8 additions & 8 deletions source/nanoFirmwareFlasher/Esp32Firmware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace nanoFramework.Tools.FirmwareFlasher
internal class Esp32Firmware : FirmwarePackage
{
/// <summary>
/// ESP32 nanoCLR is only available for 2MB and 4MB flash sizes
/// ESP32 nanoCLR is available for 2MB, 4MB, 8MB and 16MB flash sizes
/// </summary>
internal List<int> SupportedFlashSizes => new List<int> { 0x200000, 0x400000 };
internal List<int> SupportedFlashSizes => new List<int> { 0x200000, 0x400000, 0x800000, 0x1000000 };

internal Dictionary<int, string> FlashPartitions;

Expand All @@ -36,13 +36,13 @@ public Esp32Firmware(string targetName, string fwVersion, bool stable)

internal async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync(int flashSize)
{
if (!SupportedFlashSizes.Contains(flashSize))
{
string humanReadable = flashSize >= 0x10000 ? $"{ flashSize / 0x10000 }MB" : $"{ flashSize / 0x400 }kB";
string humanReadable = flashSize >= 0x10000 ? $"{ flashSize / 0x100000 }MB" : $"{ flashSize / 0x400 }kB";

if (!SupportedFlashSizes.Contains(flashSize))
{
if (Verbosity >= VerbosityLevel.Detailed)
{
Console.WriteLine($"There is no firmware available for ESP32 with {humanReadable} flash size!{Environment.NewLine}Only the following flash sizes are supported: {string.Join(", ", SupportedFlashSizes.Select(size => size >= 0x10000 ? $"{ size / 0x10000 }MB" : $"{ size / 0x400 }kB."))}");
Console.WriteLine($"There is no firmware available for ESP32 with {humanReadable} flash size!{Environment.NewLine}Only the following flash sizes are supported: {string.Join(", ", SupportedFlashSizes.Select(size => size >= 0x10000 ? $"{ size / 0x100000 }MB" : $"{ size / 0x400 }kB."))}");
}

return ExitCodes.E4001;
Expand All @@ -62,8 +62,8 @@ internal async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync(in
// nanoCLR goes to 0x10000
{ 0x10000, Path.Combine(LocationPath, "nanoCLR.bin") },

// partition table goes to 0x8000; there is on partition table for 2MB flash and one for 4MB flash
{ 0x8000, Path.Combine(LocationPath, flashSize == 0x200000 ? "partitions_2mb.bin" : "partitions_4mb.bin") }
// partition table goes to 0x8000; there are partition tables for 2MB, 4MB, 8MB and 16MB flash sizes
{ 0x8000, Path.Combine(LocationPath, $"partitions_{humanReadable.ToLowerInvariant()}.bin") }
};
}

Expand Down
17 changes: 11 additions & 6 deletions source/nanoFirmwareFlasher/Esp32Operations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,25 +123,30 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
}
}

if (verbosity >= VerbosityLevel.Detailed)
if (verbosity >= VerbosityLevel.Normal)
{
Console.WriteLine($"Erasing flash...");
Console.Write($"Erasing flash...");
}

// erase flash
espTool.EraseFlash();

if (verbosity >= VerbosityLevel.Detailed)
if (verbosity >= VerbosityLevel.Normal)
{
Console.WriteLine($"Flashing firmware...");
Console.WriteLine("OK");
}

if (verbosity >= VerbosityLevel.Normal)
{
Console.Write($"Flashing firmware...");
}

// write to flash
espTool.WriteFlash(firmware.FlashPartitions);

if (verbosity >= VerbosityLevel.Detailed)
if (verbosity >= VerbosityLevel.Normal)
{
Console.WriteLine("ESP32 successfully flashed!");
Console.WriteLine("OK");
}
}

Expand Down
5 changes: 4 additions & 1 deletion source/nanoFirmwareFlasher/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
{
Console.WriteLine($"Connected to ESP32 { esp32Device.ChipName } with MAC address { esp32Device.MacAddress }");
Console.WriteLine($"features { esp32Device.Features }");
Console.WriteLine($"Flash information: manufacturer 0x{ esp32Device.FlashManufacturerId } device 0x{ esp32Device.FlashDeviceModelId } size { esp32Device.FlashSize }");

string flashSize = esp32Device.FlashSize >= 0x10000 ? $"{ esp32Device.FlashSize / 0x100000 }MB" : $"{ esp32Device.FlashSize / 0x400 }kB";

Console.WriteLine($"Flash information: manufacturer 0x{ esp32Device.FlashManufacturerId } device 0x{ esp32Device.FlashDeviceModelId } size { flashSize }");
}

// set verbosity
Expand Down
2 changes: 1 addition & 1 deletion source/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.0.5-preview.{height}",
"version": "1.0.6-preview.{height}",
"release": {
"branchName" : "release-v{version}",
"versionIncrement" : "minor",
Expand Down