Skip to content

Commit

Permalink
Merge pull request #557 from WildernessLabs/dfu_output_fix
Browse files Browse the repository at this point in the history
Restore console output for CLI only when writing firmware via DFU
  • Loading branch information
adrianstevens authored May 1, 2024
2 parents 39ce3f7 + e235887 commit 94e4132
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Meadow.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Wilderness Labs, Inc</Authors>
<Company>Wilderness Labs, Inc</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>2.0.37.0</PackageVersion>
<PackageVersion>2.0.38.0</PackageVersion>
<Platforms>AnyCPU</Platforms>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ namespace Meadow.CLI;

public static class Constants
{
public const string CLI_VERSION = "2.0.37.0";
public const string CLI_VERSION = "2.0.38.0";
}
4 changes: 1 addition & 3 deletions Source/v2/Meadow.Dfu/DfuUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ private static void FormatDfuOutput(string logLine, ILogger? logger, DfuFlashFor
}
else //Console out
{
logger?.LogInformation(logLine);

Debug.WriteLine(logLine);

Console.Write(logLine);

Console.Write(logLine.Contains("%") ? "\r" : "\r\n");
}
}
Expand Down

0 comments on commit 94e4132

Please sign in to comment.