Merge pull request #558 from WildernessLabs/hide_corupt_firmware_message

Filter bad dfu messages and ignore mpak folder when deploying
WildernessLabs · May 3, 2024 · e8501b1 · e8501b1
2 parents c74b69f + b533f40
commit e8501b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 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.38.0</PackageVersion>
+    <PackageVersion>2.0.39.0</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,5 +6,5 @@ namespace Meadow.CLI;
 
 public static class Constants
 {
-    public const string CLI_VERSION = "2.0.38.0";
+    public const string CLI_VERSION = "2.0.39.0";
 }
diff --git a/Source/v2/Meadow.Dfu/DfuUtils.cs b/Source/v2/Meadow.Dfu/DfuUtils.cs
@@ -58,10 +58,12 @@ private static void FormatDfuOutput(string logLine, ILogger? logger, DfuFlashFor
         }
         else //Console out
         {
-            Debug.WriteLine(logLine);
-            Console.Write(logLine);
-
-            Console.Write(logLine.Contains("%") ? "\r" : "\r\n");
+            if (!logLine.Contains("Device's firmware is corrupt") &&
+                !logLine.Contains("null"))
+            {
+                Console.Write(logLine);
+                Console.Write(logLine.Contains("%") ? "\r" : "\r\n");
+            }
         }
     }
 

diff --git a/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs b/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs
@@ -262,7 +262,9 @@ void FindApp(string directory, List<FileInfo> fileList)
             {
                 var shortname = Path.GetFileName(dir);
 
-                if (shortname == PostLinkDirectoryName || shortname == PreLinkDirectoryName)
+                if (shortname == PostLinkDirectoryName ||
+                    shortname == PreLinkDirectoryName ||
+                    shortname == PackageOutputDirectoryName)
                 {
                     continue;
                 }