From d38cf25b7b5a2faaaf9a8b6ed522f79267d03f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 6 Jan 2025 11:48:24 +0000 Subject: [PATCH] Fix platform names (#310) --- README.md | 2 +- nanoFirmwareFlasher.Library/SupportedPlatform.cs | 10 ++++++++-- nanoFirmwareFlasher.Tool/Options.cs | 2 +- nanoFirmwareFlasher.Tool/Program.cs | 10 +++++----- nanoFirmwareFlasher.Tool/SilabsManager.cs | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c7880d12..339adbb0 100644 --- a/README.md +++ b/README.md @@ -285,7 +285,7 @@ To update the firmware of a Silabs target with a local firmware file (for exampl This file has to be a binary file with a valid Booter and CLR from a build. No checks or validations are performed on the file(s) content. ```console -nanoff --update --platform gg11 --binfile "C:\nf-interpreter\build\nanobooter-nanoclr.bin" --address 0x0 +nanoff --update --platform efm32 --binfile "C:\nf-interpreter\build\nanobooter-nanoclr.bin" --address 0x0 ``` ### Deploy a managed application to a SL_STK3701A target diff --git a/nanoFirmwareFlasher.Library/SupportedPlatform.cs b/nanoFirmwareFlasher.Library/SupportedPlatform.cs index 17d25537..0b59a049 100644 --- a/nanoFirmwareFlasher.Library/SupportedPlatform.cs +++ b/nanoFirmwareFlasher.Library/SupportedPlatform.cs @@ -22,9 +22,15 @@ public enum SupportedPlatform /// TI Simplelink. /// ti_simplelink = 2, + + /// + /// Silabs EFM32 Gecko. + /// + efm32, + /// - /// Silabs GG11. + /// NXP. /// - gg11 + nxp } } diff --git a/nanoFirmwareFlasher.Tool/Options.cs b/nanoFirmwareFlasher.Tool/Options.cs index 97fd6a63..665ed8f9 100644 --- a/nanoFirmwareFlasher.Tool/Options.cs +++ b/nanoFirmwareFlasher.Tool/Options.cs @@ -216,7 +216,7 @@ public class Options "platform", Required = false, Default = null, - HelpText = "Target platform. Acceptable values are: esp32, stm32, cc13x2, gg11.")] + HelpText = "Target platform. Acceptable values are: esp32, stm32, cc13x2, efm32.")] public SupportedPlatform? Platform { get; set; } /// diff --git a/nanoFirmwareFlasher.Tool/Program.cs b/nanoFirmwareFlasher.Tool/Program.cs index e45b0f2c..20b1028e 100644 --- a/nanoFirmwareFlasher.Tool/Program.cs +++ b/nanoFirmwareFlasher.Tool/Program.cs @@ -487,8 +487,8 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o) } else if (o.TargetName.StartsWith("SL")) { - // candidates for Silabs GG11 - o.Platform = SupportedPlatform.gg11; + // candidates for Silabs EFM32 Gecko + o.Platform = SupportedPlatform.efm32; } else { @@ -522,10 +522,10 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o) { o.Platform = SupportedPlatform.stm32; } - // GG11 related + // EFM32 related else if (o.ListJLinkDevices) { - o.Platform = SupportedPlatform.gg11; + o.Platform = SupportedPlatform.efm32; } // drivers install else if (o.TIInstallXdsDrivers) @@ -708,7 +708,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o) #region Silabs Giant Gecko S1 platform options - if (o.Platform == SupportedPlatform.gg11) + if (o.Platform == SupportedPlatform.efm32) { var manager = new SilabsManager(o, _verbosityLevel); diff --git a/nanoFirmwareFlasher.Tool/SilabsManager.cs b/nanoFirmwareFlasher.Tool/SilabsManager.cs index 2b908cf6..36d0faf3 100644 --- a/nanoFirmwareFlasher.Tool/SilabsManager.cs +++ b/nanoFirmwareFlasher.Tool/SilabsManager.cs @@ -22,7 +22,7 @@ public SilabsManager(Options options, VerbosityLevel verbosityLevel) throw new ArgumentNullException(nameof(options)); } - if (options.Platform != SupportedPlatform.gg11) + if (options.Platform != SupportedPlatform.efm32) { throw new NotSupportedException($"{nameof(options)} - {options.Platform}"); } @@ -38,7 +38,7 @@ public async Task ProcessAsync() { OutputWriter.ForegroundColor = ConsoleColor.Red; OutputWriter.WriteLine(); - OutputWriter.WriteLine($"Cannot determine the best matching target for a {SupportedPlatform.gg11} device."); + OutputWriter.WriteLine($"Cannot determine the best matching target for a {SupportedPlatform.efm32} device."); OutputWriter.WriteLine(); OutputWriter.ForegroundColor = ConsoleColor.White; return ExitCodes.OK;