Fix parsing of ESP32 chiptype (#272)

josesimoes · web-flow · commit b1fb1ba83e25 · 2024-05-31T15:02:12.000+01:00
***NO_CI***
diff --git a/nanoFirmwareFlasher.Library/EspTool.cs b/nanoFirmwareFlasher.Library/EspTool.cs
@@ -197,7 +197,9 @@ public Esp32DeviceInfo GetDeviceDetails(
                 }
             }
 
-            var match = Regex.Match(messages, $"(Detecting chip type... )(?<type>[ESP32\\-ICOCH]+)(.*?[\r\n]*)*(Chip is )(?<name>.*)(.*?[\r\n]*)*(Features: )(?<features>.*)(.*?[\r\n]*)*(Crystal is )(?<crystal>.*)(.*?[\r\n]*)*(MAC: )(?<mac>.*)(.*?[\r\n]*)*(Manufacturer: )(?<manufacturer>.*)(.*?[\r\n]*)*(Device: )(?<device>.*)(.*?[\r\n]*)*(Detected flash size: )(?<size>.*)");
+            var match = Regex.Match(messages,
+                                    $"(Detecting chip type... )(?<type>[ESP32\\-ICOCH6]+)(.*?[\r\n]*)*(Chip is )(?<name>.*)(.*?[\r\n]*)*(Features: )(?<features>.*)(.*?[\r\n]*)*(Crystal is )(?<crystal>.*)(.*?[\r\n]*)*(MAC: )(?<mac>.*)(.*?[\r\n]*)*(Manufacturer: )(?<manufacturer>.*)(.*?[\r\n]*)*(Device: )(?<device>.*)(.*?[\r\n]*)*(Detected flash size: )(?<size>.*)");
+
             if (!match.Success)
             {
                 throw new EspToolExecutionException(messages);

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,9 @@ public Esp32DeviceInfo GetDeviceDetails(`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`200`		`- var match = Regex.Match(messages, $"(Detecting chip type... )(?<type>[ESP32\\-ICOCH]+)(.?[\r\n])(Chip is )(?<name>.)(.?[\r\n])(Features: )(?<features>.)(.?[\r\n])(Crystal is )(?<crystal>.)(.?[\r\n])(MAC: )(?<mac>.)(.?[\r\n])(Manufacturer: )(?<manufacturer>.)(.?[\r\n])(Device: )(?<device>.)(.?[\r\n])(Detected flash size: )(?<size>.)");`
	`200`	`+ var match = Regex.Match(messages,`
	`201`	`+ $"(Detecting chip type... )(?<type>[ESP32\\-ICOCH6]+)(.?[\r\n])(Chip is )(?<name>.)(.?[\r\n])(Features: )(?<features>.)(.?[\r\n])(Crystal is )(?<crystal>.)(.?[\r\n])(MAC: )(?<mac>.)(.?[\r\n])(Manufacturer: )(?<manufacturer>.)(.?[\r\n])(Device: )(?<device>.)(.?[\r\n])(Detected flash size: )(?<size>.)");`
	`202`	`+`
`201`	`203`	`if (!match.Success)`
`202`	`204`	`{`
`203`	`205`	`throw new EspToolExecutionException(messages);`