diff --git a/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs
index a3b0c621..e10f0d9c 100644
--- a/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs
+++ b/Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs
@@ -119,7 +119,7 @@ private void OnFileWriteProgress(object? sender, (string fileName, long complete
if (!double.IsNaN(p))
{
// Console instead of Logger due to line breaking for progress bar
- Console?.Output.Write($"Writing {e.fileName}: {p:0}% \r");
+ Console?.Output.Write($"Writing '{e.fileName}': {p:0}% \r");
}
}
}
\ No newline at end of file
diff --git a/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs
index 356ff0c0..72f4e9ca 100644
--- a/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs
+++ b/Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs
@@ -130,7 +130,7 @@ private void OnFileWriteProgress(object? sender, (string fileName, long complete
if (!double.IsNaN(p))
{ // Console instead of Logger due to line breaking for progress bar
- Console?.Output.Write($"Writing {e.fileName}: {p:0}% \r");
+ Console?.Output.Write($"Writing '{e.fileName}': {p:0}% \r");
}
}
diff --git a/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs
index fdfc941f..6c36588f 100644
--- a/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs
+++ b/Source/v2/Meadow.Cli/Commands/Current/File/FileDeleteCommand.cs
@@ -27,7 +27,14 @@ protected override async ValueTask ExecuteCommand()
await device.RuntimeDisable(CancellationToken);
}
- Logger?.LogInformation($"Looking for file {MeadowFile}...");
+ if (MeadowFile == "all")
+ {
+ Logger?.LogInformation($"Looking for files...");
+ }
+ else
+ {
+ Logger?.LogInformation($"Looking for file {MeadowFile}...");
+ }
var folder = AppTools.SanitizeMeadowFolderName(Path.GetDirectoryName(MeadowFile)!);
@@ -60,7 +67,7 @@ protected override async ValueTask ExecuteCommand()
}
else
{
- Logger?.LogInformation($"Deleting file '{file}' from device...");
+ Logger?.LogInformation($"Deleting '{file}'");
await device.DeleteFile(file, CancellationToken);
}
}
diff --git a/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs
index 196bd2c0..cb6c7872 100644
--- a/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs
+++ b/Source/v2/Meadow.Cli/Commands/Current/File/FileWriteCommand.cs
@@ -51,7 +51,7 @@ protected override async ValueTask ExecuteCommand()
if (!double.IsNaN(p))
{
// Console instead of Logger due to line breaking for progress bar
- Console?.Output.Write($"Writing {e.fileName}: {p:0}% \r");
+ Console?.Output.Write($"Writing '{e.fileName}': {p:0}% \r");
}
};
diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
index 8a9e0a82..def539a4 100644
--- a/Source/v2/Meadow.Cli/Meadow.CLI.csproj
+++ b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
Wilderness Labs, Inc
Wilderness Labs, Inc
true
- 2.0.48.0
+ 2.0.49.0
AnyCPU
http://developer.wildernesslabs.co/Meadow/Meadow.CLI/
https://github.com/WildernessLabs/Meadow.CLI
diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
index 570d2eef..5976fd02 100644
--- a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
+++ b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@ namespace Meadow.CLI;
public static class Constants
{
- public const string CLI_VERSION = "2.0.48.0";
+ public const string CLI_VERSION = "2.0.49.0";
}
\ No newline at end of file
diff --git a/Source/v2/Meadow.Dfu/DfuUtils.cs b/Source/v2/Meadow.Dfu/DfuUtils.cs
index c87566db..19f363ff 100644
--- a/Source/v2/Meadow.Dfu/DfuUtils.cs
+++ b/Source/v2/Meadow.Dfu/DfuUtils.cs
@@ -86,7 +86,7 @@ public static async Task FlashFile(string fileName, string? dfuSerialNumbe
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
- logger.LogError("dfu-util not found - to install, run: `meadow install dfu-util` (may require administrator mode)");
+ logger.LogError("dfu-util not found - to install, run: `meadow dfu install` (may require administrator mode)");
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
index 76730f6f..20a3345f 100755
--- a/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
+++ b/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
@@ -1036,8 +1036,6 @@ void OnFileRetry(object? sender, EventArgs e)
FileException += OnFileError;
FileWriteFailed += OnFileRetry;
- Debug.WriteLine($"Sending '{localFileName}'");
-
EnqueueRequest(command);
// this will wait for a "file write accepted" from the target
diff --git a/Source/v2/Meadow.Tooling.Core/App/AppManager.cs b/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
index d8cf0e79..a08b74b0 100644
--- a/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
+++ b/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
@@ -168,7 +168,7 @@ public static async Task DeployApplication(
}
}
- logger?.LogInformation($"Sending '{Path.GetFileName(localFile.Key)}'");
+ logger?.LogInformation($"Sending '{Path.GetFileName(localFile.Key)}'".PadRight(80));
send_file:
if (!await connection.WriteFile(localFile.Key, meadowFilename, cancellationToken))