Revert changes with esptool (#164)

nanoframework · Sep 5, 2022 · fdc326a · fdc326a
1 parent 27cda01
commit fdc326a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/lib/esptool/esptoolLinux/esptool b/lib/esptool/esptoolLinux/esptool
diff --git a/lib/esptool/esptoolMac/esptool b/lib/esptool/esptoolMac/esptool
diff --git a/lib/esptool/esptoolWin/esptool.exe b/lib/esptool/esptoolWin/esptool.exe
diff --git a/nanoFirmwareFlasher.Library/EspTool.cs b/nanoFirmwareFlasher.Library/EspTool.cs
@@ -466,7 +466,6 @@ internal ExitCodes WriteFlash(
             var regexPattern = new StringBuilder();
             int counter = 1;
             var regexGroupNames = new List<string>();
-            string flashFreqParam;
 
             foreach (var part in partsToWrite)
             {
@@ -486,22 +485,9 @@ internal ExitCodes WriteFlash(
                 _ => "detect",
             };
 
-            // process flash frequency
-            if (_flashFrequency == -1)
-            {
-                // no flash frequency was requested on the CLI options
-                // defaulting to 'keep' to make this work with image files with checksum
-                flashFreqParam = "keep";
-            }
-            else
-            {
-                // compose option for flash freq para
-                flashFreqParam = $"{_flashFrequency}m";
-            }
-
             // execute write_flash command and parse the result; progress message can be found be searching for linefeed
             if (!RunEspTool(
-                $"write_flash --flash_mode {_flashMode} --flash_freq {flashFreqParam} --flash_size {flashSize} {partsArguments.ToString().Trim()}",
+                $"write_flash --flash_mode {_flashMode} --flash_freq {_flashFrequency}m --flash_size {flashSize} {partsArguments.ToString().Trim()}",
                 false,
                 useStandardBaudrate,
                 true,
@@ -637,7 +623,7 @@ private bool RunEspTool(
             if (!espTool.Start())
             {
                 throw new EspToolExecutionException("Error starting esptool!");
-            }
+            }           
 
             var messageBuilder = new StringBuilder();
 

diff --git a/nanoFirmwareFlasher.Tool/Options.cs b/nanoFirmwareFlasher.Tool/Options.cs
@@ -108,14 +108,14 @@ public class Options
         [Option(
             "flashmode",
             Required = false,
-            Default = "keep",
+            Default = "dio",
             HelpText = "Flash mode to use.")]
         public string Esp32FlashMode { get; set; }
 
         [Option(
             "flashfreq",
             Required = false,
-            Default = -1,
+            Default = 40,
             HelpText = "Flash frequency to use [MHz].")]
         public int Esp32FlashFrequency { get; set; }