Hard reset added for several ESP32 options missing it (#308)

Author: frobijn

nanoFirmwareFlasher.Library/Esp32Operations.cs

@@ -20,13 +20,15 @@ public class Esp32Operations
         /// <param name="backupPath">Path to store backup image.</param>
         /// <param name="fileName">Name of backup file.</param>
         /// <param name="verbosity">Set verbosity level of progress and error messages.</param>
+        /// <param name="hardResetAfterCommand">if true the chip will execute a hard reset via DTR signal</param>
         /// <returns>The <see cref="ExitCodes"/> with the operation result.</returns>
         public static ExitCodes BackupFlash(
             EspTool tool,
             Esp32DeviceInfo device,
             string backupPath,
             string fileName,
-            VerbosityLevel verbosity)
+            VerbosityLevel verbosity,
+            bool hardResetAfterCommand = false)
         {
             // check for backup file without backup path
             if (!string.IsNullOrEmpty(fileName) &&
@@ -77,7 +79,7 @@ public static ExitCodes BackupFlash(
                 OutputWriter.ForegroundColor = ConsoleColor.White;
             }
 
-            tool.BackupFlash(backupFilePath, device.FlashSize);
+            tool.BackupFlash(backupFilePath, device.FlashSize, hardResetAfterCommand);
 
             if (verbosity > VerbosityLevel.Quiet)
             {

nanoFirmwareFlasher.Library/EspTool.cs

@@ -1,7 +1,5 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
 using System.Collections.Generic;
@@ -146,7 +144,8 @@ public EspTool(
         public Esp32DeviceInfo GetDeviceDetails(
             string targetName,
             bool requireFlashSize = true,
-            bool forcePsRamCheck = false)
+            bool forcePsRamCheck = false,
+            bool hardResetAfterCommand = false)
         {
             string messages;
 
@@ -161,7 +160,7 @@ public Esp32DeviceInfo GetDeviceDetails(
                 "flash_id",
                 false,
                 true,
-                false,
+                hardResetAfterCommand && !requireFlashSize,
                 null,
                 out messages))
             {
@@ -182,14 +181,15 @@ public Esp32DeviceInfo GetDeviceDetails(
 
             // check if we got flash size (in case we need it)
             if (requireFlashSize
-                && messages.Contains("Detected flash size: Unknown"))
+                && (messages.Contains("Detected flash size: Unknown") || hardResetAfterCommand))
             {
                 // try again now without the stub
+                // Also run this for the hardResetAfterCommand, as there is no way to use the tool for a reset only (esptool issue 910).
                 if (!RunEspTool(
                     "flash_id",
                     true,
                     true,
-                    false,
+                    hardResetAfterCommand,
                     null,
                     out messages))
                 {
@@ -328,13 +328,13 @@ private PSRamAvailability FindPSRamAvailable(
                     var bootloaderPartition = new Dictionary<int, string>
                     {
                         // bootloader goes to 0x1000, except for ESP32_S3, which goes to 0x0
-				        { _chipType == "esp32s3" ? 0x0 : 0x1000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") },
+                        { _chipType == "esp32s3" ? 0x0 : 0x1000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") },
 
-				        // nanoCLR goes to 0x10000
-				        { 0x10000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "test_startup.bin") },
+                        // nanoCLR goes to 0x10000
+                        { 0x10000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "test_startup.bin") },
 
                         // partition table goes to 0x8000; there are partition tables for 2MB, 4MB, 8MB and 16MB flash sizes
-				        { 0x8000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", $"partitions_{Esp32DeviceInfo.GetFlashSizeAsString(flashSize).ToLowerInvariant()}.bin") }
+                        { 0x8000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", $"partitions_{Esp32DeviceInfo.GetFlashSizeAsString(flashSize).ToLowerInvariant()}.bin") }
                     };
 
                     // need to use standard baud rate here because of boards put in download mode
@@ -439,16 +439,18 @@ private PSRamAvailability FindPSRamAvailable(
         /// </summary>
         /// <param name="backupFilename">Backup file including full path</param>
         /// <param name="flashSize">Flash size in bytes</param>
+        /// <param name="hardResetAfterCommand">if true the chip will execute a hard reset via DTR signal</param>
         /// <returns>true if successful</returns>
         internal void BackupFlash(string backupFilename,
-            int flashSize)
+            int flashSize,
+            bool hardResetAfterCommand = false)
         {
             // execute read_flash command and parse the result; progress message can be found be searching for backspaces (ASCII code 8)
             if (!RunEspTool(
                 $"read_flash 0 0x{flashSize:X} \"{backupFilename}\"",
                 true,
                 false,
-                false,
+                hardResetAfterCommand,
                 (char)8,
                 out string messages))
             {

nanoFirmwareFlasher.Tool/Esp32Manager.cs

@@ -78,6 +78,9 @@ private async Task<ExitCodes> DoProcessAsync()
                 return ExitCodes.E4005;
             }
 
+            bool backupFlash = !string.IsNullOrEmpty(_options.BackupPath) ||
+               !string.IsNullOrEmpty(_options.BackupFile);
+
             Esp32DeviceInfo esp32Device;
 
             if (espTool.ComPortAvailable)
@@ -86,7 +89,9 @@ private async Task<ExitCodes> DoProcessAsync()
                     _options.TargetName,
                     // if partition table size is specified, no need to get flash size
                     _options.Esp32PartitionTableSize == null,
-                    _options.CheckPsRam);
+                    _options.CheckPsRam,
+                    (_options.DeviceDetails || _options.IdentifyFirmware) && !backupFlash
+                    );
             }
             else
             {
@@ -131,11 +136,16 @@ private async Task<ExitCodes> DoProcessAsync()
             // backup requested
             // Should backup be an unique operation => exit whatever success or not ?
             // In this case, should find how manage a NoOperationPerformedException info
-            if (!string.IsNullOrEmpty(_options.BackupPath) ||
-               !string.IsNullOrEmpty(_options.BackupFile))
+            if (backupFlash)
             {
                 // backup path specified, backup deployment
-                var exitCode = Esp32Operations.BackupFlash(espTool, esp32Device, _options.BackupPath, _options.BackupFile, _verbosityLevel);
+                var exitCode = Esp32Operations.BackupFlash(
+                    espTool,
+                    esp32Device,
+                    _options.BackupPath,
+                    _options.BackupFile,
+                    _verbosityLevel,
+                    _options.DeviceDetails || _options.IdentifyFirmware);
 
                 if (exitCode != ExitCodes.OK)
                 {