Code style fixes

josesimoes · josesimoes · commit 07219e23c46b · 2022-03-08T12:56:59.000Z
***NO_CI***
diff --git a/nanoFirmwareFlasher/CC13x26x2Device.cs b/nanoFirmwareFlasher/CC13x26x2Device.cs
@@ -133,7 +133,7 @@ public ExitCodes FlashBinFiles(IList<string> files, IList<string> addresses)
             // check address(es)
 
             // need to match files count
-            if(files.Count != addresses.Count)
+            if (files.Count != addresses.Count)
             {
                 return ExitCodes.E5009;
             }
@@ -279,7 +279,7 @@ private static string RunUniflashCli(string arguments)
                 // collect output messages
                 return uniflashCli.StandardOutput.ReadToEnd();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 throw new UniflashCliExecutionException(ex.Message);
             }
diff --git a/nanoFirmwareFlasher/CC13x26x2Firmware.cs b/nanoFirmwareFlasher/CC13x26x2Firmware.cs
@@ -19,7 +19,7 @@ public CC13x26x2Firmware(
             string targetName,
             string fwVersion,
             bool preview)
-            :base(
+            : base(
                  targetName,
                  fwVersion,
                  preview)
diff --git a/nanoFirmwareFlasher/CC13x26x2Operations.cs b/nanoFirmwareFlasher/CC13x26x2Operations.cs
@@ -84,8 +84,8 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
 
             // find Uniflash configuration file
             string configFile;
-            
-            if(targetName.Contains("CC1352R"))
+
+            if (targetName.Contains("CC1352R"))
             {
                 configFile = Path.Combine(Program.ExecutingPath, "uniflash", "CC1352R1F3.ccxml");
             }
@@ -99,21 +99,21 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
                 return ExitCodes.E7000;
             }
 
-            var ccDevice = new CC13x26x2Device(configFile) {Verbosity = verbosity};
+            var ccDevice = new CC13x26x2Device(configFile) { Verbosity = verbosity };
 
             // set verbosity
 
             ExitCodes programResult = ExitCodes.OK;
             // write HEX files to flash
-            if ( filesToFlash.Any(f => f.EndsWith(".hex")) ) 
+            if (filesToFlash.Any(f => f.EndsWith(".hex")))
             {
                 programResult = ccDevice.FlashHexFiles(filesToFlash);
             }
 
             if (programResult == ExitCodes.OK && isApplicationBinFile)
             {
                 // now program the application file
-                programResult = ccDevice.FlashBinFiles(new [] { applicationPath }, new [] { deploymentAddress });
+                programResult = ccDevice.FlashBinFiles(new[] { applicationPath }, new[] { deploymentAddress });
             }
 
             if (updateFw)
diff --git a/nanoFirmwareFlasher/CloudsmithPackageInfo.cs b/nanoFirmwareFlasher/CloudsmithPackageInfo.cs
@@ -13,7 +13,7 @@ internal class CloudsmithPackageInfo
     {
         [JsonProperty("version")]
         public string Version { get; set; }
-        
+
         [JsonProperty("cdn_url")]
         public string DownloadUrl { get; set; }
 
diff --git a/nanoFirmwareFlasher/Esp32DeviceInfo.cs b/nanoFirmwareFlasher/Esp32DeviceInfo.cs
@@ -27,7 +27,7 @@ internal class Esp32DeviceInfo
         /// ESP32 chip features
         /// </summary>
         internal string Features { get; }
-            
+
         /// <summary>
         /// Crystal fitted in ESP32.
         /// </summary>
@@ -76,12 +76,12 @@ internal class Esp32DeviceInfo
         /// <param name="flashSize">The size of the flash in bytes</param>
         internal Esp32DeviceInfo(
             string chipType,
-            string chipName, 
+            string chipName,
             string features,
             string crystal,
             string macAddress,
-            byte flashManufacturerId, 
-            short flashDeviceModelId, 
+            byte flashManufacturerId,
+            short flashDeviceModelId,
             int flashSize,
             PSRamAvailability psramAvailability)
         {
@@ -126,7 +126,7 @@ public override string ToString()
             deviceInfo.AppendLine($"Features { Features }");
             deviceInfo.AppendLine($"Flash size { GetFlashSizeAsString() } { GetFlashDeviceId() } from { GetFlashManufacturer() } (manufacturer 0x{ FlashManufacturerId } device 0x{ FlashDeviceId })");
 
-            switch(PSRamAvailable)
+            switch (PSRamAvailable)
             {
                 case PSRamAvailability.Undetermined:
                     deviceInfo.AppendLine($"PSRAM: undetermined");
diff --git a/nanoFirmwareFlasher/Esp32Firmware.cs b/nanoFirmwareFlasher/Esp32Firmware.cs
@@ -42,7 +42,7 @@ public Esp32Firmware(
             string fwVersion,
             bool stable,
             PartitionTableSize? partitionTableSize)
-            :base(
+            : base(
                  targetName,
                  fwVersion,
                  stable)
@@ -76,7 +76,7 @@ internal async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync(in
             if (executionResult == ExitCodes.OK)
             {
                 BootloaderPath = "bootloader.bin";
-                
+
                 // get ESP32 partitions
                 FlashPartitions = new Dictionary<int, string>
                 {
diff --git a/nanoFirmwareFlasher/Esp32Operations.cs b/nanoFirmwareFlasher/Esp32Operations.cs
@@ -14,7 +14,7 @@ namespace nanoFramework.Tools.FirmwareFlasher
     internal class Esp32Operations
     {
         public static ExitCodes BackupFlash(
-            EspTool tool, 
+            EspTool tool,
             Esp32DeviceInfo device,
             string backupPath,
             string fileName,
@@ -42,7 +42,7 @@ public static ExitCodes BackupFlash(
             }
 
             // file name specified
-            if(string.IsNullOrEmpty(fileName))
+            if (string.IsNullOrEmpty(fileName))
             {
                 fileName = $"{device.ChipName}_0x{device.MacAddress}_{DateTime.UtcNow.ToShortDateString()}.bin";
             }
@@ -62,7 +62,7 @@ public static ExitCodes BackupFlash(
                 }
             }
 
-            if(verbosity >= VerbosityLevel.Normal)
+            if (verbosity >= VerbosityLevel.Normal)
             {
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine($"Backing up the firmware to \r\n{backupFilePath}...");
@@ -81,12 +81,12 @@ public static ExitCodes BackupFlash(
         }
 
         internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
-            EspTool espTool, 
-            Esp32DeviceInfo esp32Device, 
+            EspTool espTool,
+            Esp32DeviceInfo esp32Device,
             string targetName,
             bool updateFw,
-            string fwVersion, 
-            bool preview, 
+            string fwVersion,
+            bool preview,
             string applicationPath,
             string deploymentAddress,
             string clrFile,
@@ -197,8 +197,8 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
             }
 
             Esp32Firmware firmware = new Esp32Firmware(
-                targetName, 
-                fwVersion, 
+                targetName,
+                fwVersion,
                 preview,
                 partitionTableSize)
             {
@@ -227,7 +227,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
             if (updateFw)
             {
                 operationResult = await firmware.DownloadAndExtractAsync(esp32Device.FlashSize);
-                
+
                 if (operationResult != ExitCodes.OK)
                 {
                     return operationResult;
@@ -236,7 +236,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
             }
 
             // if updating with a CRL file, need to have a new fw package
-            if(updateCLRfile)
+            if (updateCLRfile)
             {
                 // remove the CLR file from the image
                 firmware.FlashPartitions.Remove(Esp32Firmware.CLRAddress);
@@ -307,7 +307,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
 
             if (operationResult == ExitCodes.OK)
             {
-                 Console.ForegroundColor = ConsoleColor.White;
+                Console.ForegroundColor = ConsoleColor.White;
 
                 if (verbosity >= VerbosityLevel.Normal)
                 {
diff --git a/nanoFirmwareFlasher/EspTool.cs b/nanoFirmwareFlasher/EspTool.cs
@@ -114,12 +114,12 @@ internal EspTool(
                     test.Open();
                     test.Close();
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     if (Verbosity >= VerbosityLevel.Detailed)
                     {
                         Console.ForegroundColor = ConsoleColor.DarkRed;
-                            
+
                         Console.WriteLine("");
                         Console.WriteLine("******************** EXCEPTION ******************");
                         Console.WriteLine($"Exception occurred while trying to open <{serialPort}>:");
@@ -310,7 +310,7 @@ private PSRamAvailability FindPSRamAvailable()
             if (WriteFlash(bootloaderPartition, true) == ExitCodes.OK)
             {
                 // check if the
-                if(_esptoolMessage.Contains("esptool.py can not exit the download mode over USB"))
+                if (_esptoolMessage.Contains("esptool.py can not exit the download mode over USB"))
                 {
                     // this board was put on download mode manually, can't run the test app...
 
@@ -686,16 +686,16 @@ private bool RunEspTool(
             // save output messages
             _esptoolMessage = messages;
 
-            if(espTool.ExitCode == 0)
+            if (espTool.ExitCode == 0)
             {
                 // exit code was 0 (success), all good
                 return true;
             }
             else
             {
                 // need to look for specific error messages to do a safe guess if execution is as expected
-                if(messages.Contains("esptool.py can not exit the download mode over USB") ||
-                   messages.Contains("Staying in bootloader.") )
+                if (messages.Contains("esptool.py can not exit the download mode over USB") ||
+                   messages.Contains("Staying in bootloader."))
                 {
                     // we are probably good with this as we can't do much about it...
                     return true;
diff --git a/nanoFirmwareFlasher/FirmwarePackage.cs b/nanoFirmwareFlasher/FirmwarePackage.cs
@@ -98,7 +98,7 @@ public static List<CloudSmithPackageDetail> GetTargetList(
             // NOTE: the query seems to be the oposite, it should be LESS THAN.
             // this has been reported to Cloudsmith and it's being checked. Maybe need to revisit this if changes are made in their API.
             string requestUri = $"{repoName}/?page_size=500&q=uploaded:'>1 month ago' AND tag:{platform}";
-            
+
             List<CloudSmithPackageDetail> targetPackages = new();
 
             if (verbosity > VerbosityLevel.Normal)
diff --git a/nanoFirmwareFlasher/Stm32Firmware.cs b/nanoFirmwareFlasher/Stm32Firmware.cs
@@ -28,7 +28,7 @@ public Stm32Firmware(
             string targetName,
             string fwVersion,
             bool preview)
-            :base(
+            : base(
                  targetName,
                  fwVersion,
                  preview)
diff --git a/nanoFirmwareFlasher/Stm32Operations.cs b/nanoFirmwareFlasher/Stm32Operations.cs
@@ -473,7 +473,7 @@ internal static ExitCodes InstallJtagDrivers(VerbosityLevel verbosityLevel)
                 Console.WriteLine("No driver installation needed on MacOS");
                 return ExitCodes.OK;
             }
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine("Driver installation for JTAG no supported on Linux. Please refer to the STM32 website to get the specific drivers.");
diff --git a/nanoFirmwareFlasher/StmJtagDevice.cs b/nanoFirmwareFlasher/StmJtagDevice.cs
@@ -56,7 +56,7 @@ public StmJtagDevice(string jtagId = null)
                 // no JTAG id supplied, list available
                 var jtagDevices = ListDevices();
 
-                if(jtagDevices.Count > 0)
+                if (jtagDevices.Count > 0)
                 {
                     // take the 1st one
                     JtagId = jtagDevices[0];

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public ExitCodes FlashBinFiles(IList<string> files, IList<string> addresses)`
`133`	`133`	`// check address(es)`
`134`	`134`
`135`	`135`	`// need to match files count`
`136`		`- if(files.Count != addresses.Count)`
	`136`	`+ if (files.Count != addresses.Count)`
`137`	`137`	`{`
`138`	`138`	`return ExitCodes.E5009;`
`139`	`139`	`}`
`@@ -279,7 +279,7 @@ private static string RunUniflashCli(string arguments)`
`279`	`279`	`// collect output messages`
`280`	`280`	`return uniflashCli.StandardOutput.ReadToEnd();`
`281`	`281`	`}`
`282`		`- catch(Exception ex)`
	`282`	`+ catch (Exception ex)`
`283`	`283`	`{`
`284`	`284`	`throw new UniflashCliExecutionException(ex.Message);`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`84`	`84`
`85`	`85`	`// find Uniflash configuration file`
`86`	`86`	`string configFile;`
`87`		`-`
`88`		`- if(targetName.Contains("CC1352R"))`
	`87`	`+`
	`88`	`+ if (targetName.Contains("CC1352R"))`
`89`	`89`	`{`
`90`	`90`	`configFile = Path.Combine(Program.ExecutingPath, "uniflash", "CC1352R1F3.ccxml");`
`91`	`91`	`}`
`@@ -99,21 +99,21 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`99`	`99`	`return ExitCodes.E7000;`
`100`	`100`	`}`
`101`	`101`
`102`		`- var ccDevice = new CC13x26x2Device(configFile) {Verbosity = verbosity};`
	`102`	`+ var ccDevice = new CC13x26x2Device(configFile) { Verbosity = verbosity };`
`103`	`103`
`104`	`104`	`// set verbosity`
`105`	`105`
`106`	`106`	`ExitCodes programResult = ExitCodes.OK;`
`107`	`107`	`// write HEX files to flash`
`108`		`- if ( filesToFlash.Any(f => f.EndsWith(".hex")) )`
	`108`	`+ if (filesToFlash.Any(f => f.EndsWith(".hex")))`
`109`	`109`	`{`
`110`	`110`	`programResult = ccDevice.FlashHexFiles(filesToFlash);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (programResult == ExitCodes.OK && isApplicationBinFile)`
`114`	`114`	`{`
`115`	`115`	`// now program the application file`
`116`		`- programResult = ccDevice.FlashBinFiles(new [] { applicationPath }, new [] { deploymentAddress });`
	`116`	`+ programResult = ccDevice.FlashBinFiles(new[] { applicationPath }, new[] { deploymentAddress });`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if (updateFw)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ internal class CloudsmithPackageInfo`
`13`	`13`	`{`
`14`	`14`	`[JsonProperty("version")]`
`15`	`15`	`public string Version { get; set; }`
`16`		`-`
	`16`	`+`
`17`	`17`	`[JsonProperty("cdn_url")]`
`18`	`18`	`public string DownloadUrl { get; set; }`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace nanoFramework.Tools.FirmwareFlasher`
`14`	`14`	`internal class Esp32Operations`
`15`	`15`	`{`
`16`	`16`	`public static ExitCodes BackupFlash(`
`17`		`- EspTool tool,`
	`17`	`+ EspTool tool,`
`18`	`18`	`Esp32DeviceInfo device,`
`19`	`19`	`string backupPath,`
`20`	`20`	`string fileName,`
`@@ -42,7 +42,7 @@ public static ExitCodes BackupFlash(`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// file name specified`
`45`		`- if(string.IsNullOrEmpty(fileName))`
	`45`	`+ if (string.IsNullOrEmpty(fileName))`
`46`	`46`	`{`
`47`	`47`	`fileName = $"{device.ChipName}_0x{device.MacAddress}_{DateTime.UtcNow.ToShortDateString()}.bin";`
`48`	`48`	`}`
`@@ -62,7 +62,7 @@ public static ExitCodes BackupFlash(`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- if(verbosity >= VerbosityLevel.Normal)`
	`65`	`+ if (verbosity >= VerbosityLevel.Normal)`
`66`	`66`	`{`
`67`	`67`	`Console.ForegroundColor = ConsoleColor.Yellow;`
`68`	`68`	`Console.WriteLine($"Backing up the firmware to \r\n{backupFilePath}...");`
`@@ -81,12 +81,12 @@ public static ExitCodes BackupFlash(`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(`
`84`		`- EspTool espTool,`
`85`		`- Esp32DeviceInfo esp32Device,`
	`84`	`+ EspTool espTool,`
	`85`	`+ Esp32DeviceInfo esp32Device,`
`86`	`86`	`string targetName,`
`87`	`87`	`bool updateFw,`
`88`		`- string fwVersion,`
`89`		`- bool preview,`
	`88`	`+ string fwVersion,`
	`89`	`+ bool preview,`
`90`	`90`	`string applicationPath,`
`91`	`91`	`string deploymentAddress,`
`92`	`92`	`string clrFile,`
`@@ -197,8 +197,8 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`Esp32Firmware firmware = new Esp32Firmware(`
`200`		`- targetName,`
`201`		`- fwVersion,`
	`200`	`+ targetName,`
	`201`	`+ fwVersion,`
`202`	`202`	`preview,`
`203`	`203`	`partitionTableSize)`
`204`	`204`	`{`
`@@ -227,7 +227,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`227`	`227`	`if (updateFw)`
`228`	`228`	`{`
`229`	`229`	`operationResult = await firmware.DownloadAndExtractAsync(esp32Device.FlashSize);`
`230`		`-`
	`230`	`+`
`231`	`231`	`if (operationResult != ExitCodes.OK)`
`232`	`232`	`{`
`233`	`233`	`return operationResult;`
`@@ -236,7 +236,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`// if updating with a CRL file, need to have a new fw package`
`239`		`- if(updateCLRfile)`
	`239`	`+ if (updateCLRfile)`
`240`	`240`	`{`
`241`	`241`	`// remove the CLR file from the image`
`242`	`242`	`firmware.FlashPartitions.Remove(Esp32Firmware.CLRAddress);`
`@@ -307,7 +307,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync`
`307`	`307`
`308`	`308`	`if (operationResult == ExitCodes.OK)`
`309`	`309`	`{`
`310`		`- Console.ForegroundColor = ConsoleColor.White;`
	`310`	`+ Console.ForegroundColor = ConsoleColor.White;`
`311`	`311`
`312`	`312`	`if (verbosity >= VerbosityLevel.Normal)`
`313`	`313`	`{`
Original file line number	Diff line number	Diff line change
`@@ -114,12 +114,12 @@ internal EspTool(`
`114`	`114`	`test.Open();`
`115`	`115`	`test.Close();`
`116`	`116`	`}`
`117`		`- catch(Exception ex)`
	`117`	`+ catch (Exception ex)`
`118`	`118`	`{`
`119`	`119`	`if (Verbosity >= VerbosityLevel.Detailed)`
`120`	`120`	`{`
`121`	`121`	`Console.ForegroundColor = ConsoleColor.DarkRed;`
`122`		`-`
	`122`	`+`
`123`	`123`	`Console.WriteLine("");`
`124`	`124`	`Console.WriteLine("****************** EXCEPTION ****************");`
`125`	`125`	`Console.WriteLine($"Exception occurred while trying to open <{serialPort}>:");`
`@@ -310,7 +310,7 @@ private PSRamAvailability FindPSRamAvailable()`
`310`	`310`	`if (WriteFlash(bootloaderPartition, true) == ExitCodes.OK)`
`311`	`311`	`{`
`312`	`312`	`// check if the`
`313`		`- if(_esptoolMessage.Contains("esptool.py can not exit the download mode over USB"))`
	`313`	`+ if (_esptoolMessage.Contains("esptool.py can not exit the download mode over USB"))`
`314`	`314`	`{`
`315`	`315`	`// this board was put on download mode manually, can't run the test app...`
`316`	`316`
`@@ -686,16 +686,16 @@ private bool RunEspTool(`
`686`	`686`	`// save output messages`
`687`	`687`	`_esptoolMessage = messages;`
`688`	`688`
`689`		`- if(espTool.ExitCode == 0)`
	`689`	`+ if (espTool.ExitCode == 0)`
`690`	`690`	`{`
`691`	`691`	`// exit code was 0 (success), all good`
`692`	`692`	`return true;`
`693`	`693`	`}`
`694`	`694`	`else`
`695`	`695`	`{`
`696`	`696`	`// need to look for specific error messages to do a safe guess if execution is as expected`
`697`		`- if(messages.Contains("esptool.py can not exit the download mode over USB") \|\|`
`698`		`- messages.Contains("Staying in bootloader.") )`
	`697`	`+ if (messages.Contains("esptool.py can not exit the download mode over USB") \|\|`
	`698`	`+ messages.Contains("Staying in bootloader."))`
`699`	`699`	`{`
`700`	`700`	`// we are probably good with this as we can't do much about it...`
`701`	`701`	`return true;`