Fix parsing of detection data for ESP32-S2 (#121)

josesimoes · web-flow · commit 602ef30ba28a · 2022-03-08T12:51:05.000Z
***NO_CI***
diff --git a/nanoFirmwareFlasher/EspTool.cs b/nanoFirmwareFlasher/EspTool.cs
@@ -200,7 +200,7 @@ internal 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\\-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>.*)");
             if (!match.Success)
             {
                 throw new EspToolExecutionException(messages);

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ internal Esp32DeviceInfo GetDeviceDetails(`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`- 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>.)");`
	`203`	`+ 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>.)");`
`204`	`204`	`if (!match.Success)`
`205`	`205`	`{`
`206`	`206`	`throw new EspToolExecutionException(messages);`