Merge pull request #467 from WildernessLabs/improve_firmware_write

Improve firmware write behavior
WildernessLabs · Feb 13, 2024 · 8448c56 · 8448c56
2 parents 010eaf2 + 3c38835
commit 8448c56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 209 deletions.
diff --git a/Source/v2/Meadow.CLI/Meadow.CLI.csproj b/Source/v2/Meadow.CLI/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
 	  <Authors>Wilderness Labs, Inc</Authors>
 	  <Company>Wilderness Labs, Inc</Company>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageVersion>2.0.3</PackageVersion>
+	  <PackageVersion>2.0.4</PackageVersion>
 	  <Platforms>AnyCPU</Platforms>
 	  <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
 	  <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

diff --git a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareWriteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareWriteCommand.cs
@@ -121,7 +121,6 @@ protected override async ValueTask ExecuteCommand()
 
         if (package == null)
         {
-            Logger?.LogError($"Firmware write failed - No package selected");
             return;
         }
 
@@ -241,6 +240,8 @@ protected override async ValueTask ExecuteCommand()
              || Path.GetFileName(IndividualFile) == F7FirmwarePackageCollection.F7FirmwareFiles.CoprocApplicationFile
              || Path.GetFileName(IndividualFile) == F7FirmwarePackageCollection.F7FirmwareFiles.CoprocBootloaderFile)
         {
+            await connection.RuntimeDisable();
+
             await WriteEspFiles(connection, deviceInfo, package);
         }
 
@@ -291,11 +292,9 @@ protected override async ValueTask ExecuteCommand()
 
     private async Task WriteEspFiles(IMeadowConnection? connection, DeviceInfo? deviceInfo, FirmwarePackage package)
     {
-        if (connection == null)
-        {
-            connection = await GetConnectionAndDisableRuntime();
-            if (connection == null) return; // couldn't find a connected device
-        }
+        connection ??= await GetConnectionAndDisableRuntime();
+
+        if (connection == null) { return; } // couldn't find a connected device
 
         Logger?.LogInformation($"{Environment.NewLine}Writing Coprocessor files...");
 
@@ -372,7 +371,7 @@ private async Task WriteEspFiles(IMeadowConnection? connection, DeviceInfo? devi
 
             if (existing == null)
             {
-                Logger?.LogError($"Requested version '{Version}' not found");
+                Logger?.LogError($"Requested firmware version '{Version}' not found");
                 return null;
             }
             package = existing;

diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
@@ -6,6 +6,6 @@ namespace Meadow.CLI
 {
     public static class Constants
     {
-        public const string CLI_VERSION = "2.0.3.0";
+        public const string CLI_VERSION = "2.0.4.0";
     }
 }
diff --git a/Source/v2/Meadow.Hcom/Firmware/DownloadManager.cs b/Source/v2/Meadow.Hcom/Firmware/DownloadManager.cs