Skip to content

Commit

Permalink
Code style fixes
Browse files Browse the repository at this point in the history
***NO_CI***
  • Loading branch information
josesimoes committed May 31, 2023
1 parent 744c341 commit fd62d99
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion nanoFirmwareFlasher.Library/CC13x26x2Firmware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public CC13x26x2Firmware(
internal new System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
{
// perform download and extract
return base.DownloadAndExtractAsync();
return base.DownloadAndExtractAsync();
}
}
}
10 changes: 5 additions & 5 deletions nanoFirmwareFlasher.Library/Esp32DeviceInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ internal string GetFlashSizeAsString()

public static string GetFlashSizeAsString(int flashSize)
{
return flashSize >= 0x10000 ? $"{ flashSize / 0x100000 }MB" : $"{ flashSize / 0x400 }kB";
return flashSize >= 0x10000 ? $"{flashSize / 0x100000}MB" : $"{flashSize / 0x400}kB";
}

/// <inheritdoc/>
Expand All @@ -123,8 +123,8 @@ public override string ToString()
deviceInfo.AppendLine();
}

deviceInfo.AppendLine($"Features { Features }");
deviceInfo.AppendLine($"Flash size { GetFlashSizeAsString() } { GetFlashDeviceId() } from { GetFlashManufacturer() } (manufacturer 0x{ FlashManufacturerId } device 0x{ FlashDeviceId })");
deviceInfo.AppendLine($"Features {Features}");
deviceInfo.AppendLine($"Flash size {GetFlashSizeAsString()} {GetFlashDeviceId()} from {GetFlashManufacturer()} (manufacturer 0x{FlashManufacturerId} device 0x{FlashDeviceId})");

switch (PSRamAvailable)
{
Expand All @@ -141,8 +141,8 @@ public override string ToString()
break;
}

deviceInfo.AppendLine($"Crystal { Crystal }");
deviceInfo.AppendLine($"MAC { MacAddress }");
deviceInfo.AppendLine($"Crystal {Crystal}");
deviceInfo.AppendLine($"MAC {MacAddress}");

return deviceInfo.ToString();
}
Expand Down
2 changes: 1 addition & 1 deletion nanoFirmwareFlasher.Library/EspTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ private bool RunEspTool(
if (!espTool.Start())
{
throw new EspToolExecutionException("Error starting esptool!");
}
}

var messageBuilder = new StringBuilder();

Expand Down
2 changes: 1 addition & 1 deletion nanoFirmwareFlasher.Library/Stm32Firmware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Stm32Firmware(NanoDeviceBase nanoDevice) : base(nanoDevice)
internal new System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
{
// perform download and extract
return base.DownloadAndExtractAsync();
return base.DownloadAndExtractAsync();
}
}
}
4 changes: 2 additions & 2 deletions nanoFirmwareFlasher.Library/StmDfuDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ public override string ToString()

if (!string.IsNullOrEmpty(DeviceName))
{
deviceInfo.AppendLine($"Device: { DeviceName }");
deviceInfo.AppendLine($"Device: {DeviceName}");
}

deviceInfo.AppendLine($"CPU: { DeviceCPU }");
deviceInfo.AppendLine($"CPU: {DeviceCPU}");

return deviceInfo.ToString();
}
Expand Down
8 changes: 4 additions & 4 deletions nanoFirmwareFlasher.Library/StmJtagDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,16 @@ public override string ToString()

if (!string.IsNullOrEmpty(DeviceName))
{
deviceInfo.AppendLine($"Device: { DeviceName }");
deviceInfo.AppendLine($"Device: {DeviceName}");
}

if (!string.IsNullOrEmpty(BoardName))
{
deviceInfo.AppendLine($"Board: { BoardName }");
deviceInfo.AppendLine($"Board: {BoardName}");
}

deviceInfo.AppendLine($"CPU: { DeviceCPU }");
deviceInfo.AppendLine($"Device ID: { DeviceId }");
deviceInfo.AppendLine($"CPU: {DeviceCPU}");
deviceInfo.AppendLine($"Device ID: {DeviceId}");

return deviceInfo.ToString();
}
Expand Down
4 changes: 2 additions & 2 deletions nanoFirmwareFlasher.Tool/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
{
// easiest one: ESP32
if (o.TargetName.StartsWith("ESP")
|| o.TargetName.StartsWith("M5")
|| o.TargetName.StartsWith("M5")
|| o.TargetName.StartsWith("FEATHER")
|| o.TargetName.StartsWith("ESPKALUGA"))
{
Expand Down Expand Up @@ -511,7 +511,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
!string.IsNullOrEmpty(o.DfuDeviceId))
{
o.Platform = SupportedPlatform.stm32;
}
}
// GG11 related
else if (o.ListJLinkDevices)
{
Expand Down

0 comments on commit fd62d99

Please sign in to comment.