Fix execution of STM32 mass erase as standalone operation (#66)

***NO_CI***

Author: josesimoes

nanoFirmwareFlasher/Program.cs

@@ -781,13 +781,28 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                                         o.JtagDeviceId,
                                         _verbosityLevel);
 
-                        if (_exitCode != ExitCodes.OK)
-                        {
-                            // done here
-                            return;
-                        }
+                        // done here
+                        return;
                     }
                 }
+                else if(o.MassErase)
+                {
+                    _exitCode = Stm32Operations.MassErase(
+                                    o.JtagDeviceId,
+                                    _verbosityLevel);
+
+                    // done here
+                    return;
+                }
+                else if (o.ResetMcu)
+                {
+                    _exitCode = Stm32Operations.ResetMcu(
+                                    o.JtagDeviceId,
+                                    _verbosityLevel);
+
+                    // done here
+                    return;
+                }
             }
 
 #endregion

nanoFirmwareFlasher/Stm32Operations.cs

@@ -247,6 +247,33 @@ internal static ExitCodes ResetMcu(
             return jtagDevice.ResetMcu();
         }
 
+        internal static ExitCodes MassErase(
+            string jtagId,
+            VerbosityLevel verbosity)
+        {
+            // JATG device
+            StmJtagDevice jtagDevice = new StmJtagDevice(jtagId);
+
+            if (!jtagDevice.DevicePresent)
+            {
+                // no JTAG device found
+
+                // done here, this command has no further processing
+                return ExitCodes.E5001;
+            }
+
+            if (verbosity >= VerbosityLevel.Normal)
+            {
+                Console.WriteLine($"Connected to JTAG device with ID { jtagDevice.DeviceId }");
+            }
+
+            // set verbosity
+            jtagDevice.Verbosity = verbosity;
+
+            // perform erase operation
+            return jtagDevice.MassErase();
+        }
+
         internal static ExitCodes InstallDfuDrivers(VerbosityLevel verbosityLevel)
         {
             try

nanoFirmwareFlasher/StmJtagDevice.cs

@@ -96,31 +96,13 @@ public ExitCodes FlashHexFiles(IList<string> files)
             // erase flash
             if (DoMassErase)
             {
-                if (Verbosity >= VerbosityLevel.Normal)
-                {
-                    Console.ForegroundColor = ConsoleColor.White;
-                    Console.Write("Mass erase device...");
-                }
+                var eraseResult = MassErase();
 
-                cliOutput = RunSTM32ProgrammerCLI($"-c port=SWD sn={DeviceId} mode=UR -e all");
-
-                if (!cliOutput.Contains("Flash memory erased."))
+                if (eraseResult != ExitCodes.OK)
                 {
-                    return ExitCodes.E5005;
+                    return eraseResult;
                 }
 
-                if (Verbosity >= VerbosityLevel.Normal)
-                {
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine(" OK");
-                }
-                else
-                {
-                    Console.ForegroundColor = ConsoleColor.White;
-                    Console.WriteLine("");
-                }
-                Console.ForegroundColor = ConsoleColor.White;
-
                 // toggle mass erase so it's only performed before the first file is flashed
                 DoMassErase = false;
             }
@@ -221,32 +203,13 @@ public ExitCodes FlashBinFiles(IList<string> files, IList<string> addresses)
             // erase flash
             if (DoMassErase)
             {
-                if (Verbosity >= VerbosityLevel.Normal)
-                {
-                    Console.ForegroundColor = ConsoleColor.White;
-                    Console.Write("Mass erase device...");
-                }
-
-                cliOutput = RunSTM32ProgrammerCLI($"-c port=SWD sn={DeviceId} mode=UR -e all");
+                var eraseResult = MassErase();
 
-                if (!cliOutput.Contains("Flash memory erased."))
+                if (eraseResult != ExitCodes.OK)
                 {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine("ERROR");
-                    return ExitCodes.E5005;
+                    return eraseResult;
                 }
 
-                if (Verbosity >= VerbosityLevel.Normal)
-                {
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine(" OK");
-                }
-                else
-                {
-                    Console.WriteLine("");
-                }
-                Console.ForegroundColor = ConsoleColor.White;
-
                 // toggle mass erase so it's only performed before the first file is flashed
                 DoMassErase = false;
             }
@@ -369,6 +332,42 @@ public ExitCodes ResetMcu()
             return ExitCodes.OK;
         }
 
+
+        /// <summary>
+        /// Reset MCU of connected JTAG device.
+        /// </summary>
+        public ExitCodes MassErase()
+        {
+            if (Verbosity >= VerbosityLevel.Normal)
+            {
+                Console.ForegroundColor = ConsoleColor.White;
+                Console.Write("Mass erase device...");
+            }
+
+            var cliOutput = RunSTM32ProgrammerCLI($"-c port=SWD sn={DeviceId} mode=UR -e all");
+
+            if (!cliOutput.Contains("Mass erase successfully achieved"))
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine("ERROR");
+                return ExitCodes.E5005;
+            }
+
+            if (Verbosity >= VerbosityLevel.Normal)
+            {
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine(" OK");
+            }
+            else
+            {
+                Console.WriteLine("");
+            }
+
+            Console.ForegroundColor = ConsoleColor.White;
+
+            return ExitCodes.OK;
+        }
+
         private static string RunSTM32ProgrammerCLI(string arguments)
         {
             try