Fix FEATHER_S2 update (#92)

nanoframework · Nov 4, 2021 · f3263fb · f3263fb
1 parent a7ccb9d
commit f3263fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/nanoFirmwareFlasher/Esp32Operations.cs b/nanoFirmwareFlasher/Esp32Operations.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 
 namespace nanoFramework.Tools.FirmwareFlasher
 {

diff --git a/nanoFirmwareFlasher/EspTool.cs b/nanoFirmwareFlasher/EspTool.cs
@@ -60,12 +60,10 @@ internal partial class EspTool
         /// </summary>
         private int _flashSize = -1;
 
-        /// <summary>
-        /// true if the stub program is already active and we can use the --before no_reset_no_sync parameter 
-        /// </summary>
-        private bool _isStubActive = false;
         private bool connectPatternFound;
+
         private DateTime connectTimeStamp;
+
         private bool connectPromptShown;
 
         /// <summary>
@@ -531,7 +529,7 @@ private bool RunEspTool(
             string noStubParameter = null;
             string baudRateParameter = null;
             string beforeParameter = null;
-            string afterParameter = hardResetAfterCommand ? "hard_reset" : "no_reset";
+            string afterParameter = hardResetAfterCommand ? "hard_reset" : "no_reset_stub";
 
             if (noStub)
             {
@@ -673,9 +671,6 @@ private bool RunEspTool(
             // save output messages
             _esptoolMessage = messages;
 
-            // if the stub program was used then we don't need to transfer ist again
-            _isStubActive = !noStub;
-
             if(espTool.ExitCode == 0)
             {
                 // exit code was 0 (success), all good

diff --git a/nanoFirmwareFlasher/FirmwarePackage.cs b/nanoFirmwareFlasher/FirmwarePackage.cs
@@ -73,7 +73,7 @@ public static List<CloudSmithPackageDetail> GetBoardList(bool communityTargets,
             if (verbosity >= VerbosityLevel.Normal)
             {
                 Console.ForegroundColor = ConsoleColor.White;
-                Console.Write($"Trying to find list of boards in {(preview ? "developement" : "stable")} repository");
+                Console.Write($"Trying to find list of boards in {(preview ? "development" : "stable")} repository");
                 if( string.IsNullOrEmpty(filter))
                 {
                     Console.Write(" without filter");
@@ -196,7 +196,7 @@ protected async System.Threading.Tasks.Task<ExitCodes> DownloadAndExtractAsync()
                     if (Verbosity >= VerbosityLevel.Normal)
                     {
                         Console.ForegroundColor = ConsoleColor.White;
-                        Console.Write($"Trying to find {_targetName} in {(_preview ? "developement" : "stable")} repository...");
+                        Console.Write($"Trying to find {_targetName} in {(_preview ? "development" : "stable")} repository...");
                     }
 
                     HttpResponseMessage response = await _cloudsmithClient.GetAsync(requestUri);