Improve output of J-Link probe details (#194)

***NO_CI***

Author: josesimoes

nanoFirmwareFlasher.Library/JLinkDevice.cs

@@ -36,6 +36,16 @@ public class JLinkDevice : JLinkCli
         /// </summary>
         public string DeviceCPU { get; }
 
+        /// <summary>
+        /// Firmware details of the connected J-Link probe.
+        /// </summary>
+        public string Firmare { get; } = "N.A.";
+
+        /// <summary>
+        /// Hardware details of the connected J-Link probe.
+        /// </summary>
+        public string Hardware { get; } = "N.A.";
+
         /// <summary>
         /// Creates a new <see cref="JLinkDevice"/>.
         /// </summary>
@@ -79,12 +89,24 @@ public JLinkDevice(string probeId = null)
             }
 
             // parse the output to fill in the details
-            var match = Regex.Match(cliOutput, $"(Device \")(?<deviceid>\\w*)(\" selected.)");
+            var match = Regex.Match(cliOutput, @"(Device "")(?<deviceid>\w*)("" selected\.)|(Firmware: )(?<firmware>.*)", RegexOptions.Multiline);
             if (match.Success)
             {
                 // grab details
                 DeviceId = match.Groups["deviceid"].ToString().Trim();
+
+                if (match.Groups["firmware"] != null)
+                {
+                    Firmare = match.Groups["firmware"].ToString().Trim();
+                }
+            }
+
+            match = Regex.Match(cliOutput, @"(Hardware version: )(?<hardware>.*)", RegexOptions.Multiline);
+            if (match.Success && match.Groups["hardware"] != null)
+            {
+                Hardware = match.Groups["hardware"].ToString().Trim();
             }
+
             match = Regex.Match(cliOutput, $"(Found )(?<devicecpu>.*)(,)");
             if (match.Success)
             {

nanoFirmwareFlasher.Library/JLinkOperations.cs

@@ -130,6 +130,12 @@ public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
                 Console.ForegroundColor = ConsoleColor.White;
             }
 
+            if (verbosity == VerbosityLevel.Diagnostic)
+            {
+                Console.WriteLine($"Firmware: {jlinkDevice.Firmare}");
+                Console.WriteLine($"Hardware: {jlinkDevice.Hardware}");
+            }
+
             if (fitCheck)
             {
                 Console.ForegroundColor = ConsoleColor.Yellow;
@@ -175,6 +181,12 @@ public static ExitCodes MassErase(
                 Console.WriteLine($"Connected to J-Link device with ID {jlinkDevice.ProbeId}");
             }
 
+            if (verbosity == VerbosityLevel.Diagnostic)
+            {
+                Console.WriteLine($"Firmware: {jlinkDevice.Firmare}");
+                Console.WriteLine($"Hardware: {jlinkDevice.Hardware}");
+            }
+
             // set verbosity
             jlinkDevice.Verbosity = verbosity;
 

nanoFirmwareFlasher.Tool/Program.cs

@@ -1295,6 +1295,12 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                             Console.WriteLine($"Connected to J-Link device with ID {jlinkDevice.ProbeId}");
                         }
 
+                        if (_verbosityLevel == VerbosityLevel.Diagnostic)
+                        {
+                            Console.WriteLine($"Firmware: {jlinkDevice.Firmare}");
+                            Console.WriteLine($"Hardware: {jlinkDevice.Hardware}");
+                        }
+
                         // set VCP baud rate (if requested)
                         if (o.SetVcpBaudRate.HasValue)
                         {