Merge pull request #477 from WildernessLabs/marks_build

Marks build
WildernessLabs · Feb 15, 2024 · 11fbe4e · 11fbe4e
2 parents d1c2d14 + e7fcbee
commit 11fbe4e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareListCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareListCommand.cs
@@ -22,6 +22,9 @@ protected override async ValueTask ExecuteCommand()
     {
         await FileManager.Refresh();
 
+        //show the firmware path
+        Logger?.LogInformation($"Firmware location: {F7FirmwarePackageCollection.DefaultF7FirmwareStoreRoot}");
+
         if (Verbose)
         {
             await DisplayVerboseResults(FileManager);

diff --git a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareWriteCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareWriteCommand.cs
@@ -223,7 +223,14 @@ protected override async ValueTask ExecuteCommand()
 
         if (FirmwareFileTypes.Contains(FirmwareType.Runtime) || Path.GetFileName(IndividualFile) == F7FirmwarePackageCollection.F7FirmwareFiles.RuntimeFile)
         {
-            connection = await WriteFirmware(connection, deviceInfo, package);
+            if (string.IsNullOrEmpty(IndividualFile))
+            {
+                connection = await WriteRuntime(connection, deviceInfo, package);
+            }
+            else
+            {
+                connection = await WriteRuntime(connection, deviceInfo, IndividualFile, Path.GetFileName(IndividualFile));
+            }
 
             if (connection == null)
             {
@@ -252,7 +259,17 @@ protected override async ValueTask ExecuteCommand()
         }
     }
 
-    private async Task<IMeadowConnection?> WriteFirmware(IMeadowConnection? connection, DeviceInfo? deviceInfo, FirmwarePackage package)
+    private async Task<IMeadowConnection?> WriteRuntime(IMeadowConnection? connection, DeviceInfo? deviceInfo, FirmwarePackage package)
+    {
+        Logger?.LogInformation($"{Environment.NewLine}Getting runtime for {package.Version}...");
+
+        // get the path to the runtime file
+        var rtpath = package.GetFullyQualifiedPath(package.Runtime);
+
+        return await WriteRuntime(connection, deviceInfo, rtpath, package.Runtime);
+    }
+
+    private async Task<IMeadowConnection?> WriteRuntime(IMeadowConnection? connection, DeviceInfo? deviceInfo, string runtimePath, string destinationFilename)
     {
         if (connection == null)
         {
@@ -261,21 +278,15 @@ protected override async ValueTask ExecuteCommand()
             if (connection == null) { return null; } // couldn't find a connected device
         }
 
-        Logger?.LogInformation($"{Environment.NewLine}Writing Runtime {package.Version}...");
-
-        // get the path to the runtime file
-        var rtpath = package.GetFullyQualifiedPath(package.Runtime);
+        Logger?.LogInformation($"{Environment.NewLine}Writing Runtime ...");
 
-        if (deviceInfo == null)
-        {
-            deviceInfo = await connection.GetDeviceInfo(CancellationToken);
-        }
+        deviceInfo ??= await connection.GetDeviceInfo(CancellationToken);
 
         if (UseDfu || RequiresDfuForRuntimeUpdates(deviceInfo))
         {
 
         write_runtime:
-            if (!await connection.Device!.WriteRuntime(rtpath, CancellationToken))
+            if (!await connection.Device!.WriteRuntime(runtimePath, CancellationToken))
             {
                 // TODO: implement a retry timeout
                 Logger?.LogInformation($"Error writing runtime - retrying");
@@ -284,7 +295,7 @@ protected override async ValueTask ExecuteCommand()
         }
         else
         {
-            await connection.Device!.WriteFile(rtpath, $"/meadow0/update/os/{package.Runtime}");
+            await connection.Device!.WriteFile(runtimePath, $"/meadow0/update/os/{destinationFilename}");
         }
 
         return connection;

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.5</PackageVersion>
+	  <PackageVersion>2.0.6</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/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.5.0";
+        public const string CLI_VERSION = "2.0.6.0";
     }
 }
diff --git a/Source/v2/Meadow.SoftwareManager/F7FirmwareDownloadManager.cs b/Source/v2/Meadow.SoftwareManager/F7FirmwareDownloadManager.cs
@@ -72,6 +72,7 @@ public async Task<bool> DownloadRelease(string destinationRoot, string version,
         }
         catch
         {
+            Directory.Delete(local_path, true);
             throw new Exception($"Unable to download OS files for {version}");
         }
 
@@ -81,6 +82,7 @@ public async Task<bool> DownloadRelease(string destinationRoot, string version,
         }
         catch
         {
+            Directory.Delete(local_path, true);
             throw new Exception($"Unable to download Coprocessor files for {version}");
         }