esp8266
diff --git a/‎cores/esp8266/HardwareSerial.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/HardwareSerial.cpp
+2-2Lines changed: 2 additions & 2 deletions b/‎cores/esp8266/HardwareSerial.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/HardwareSerial.cpp
+2-2Lines changed: 2 additions & 2 deletions
@@ -121,9 +121,9 @@ unsigned long HardwareSerial::testBaudrate()
 
 unsigned long HardwareSerial::detectBaudrate(time_t timeoutMillis)
 {
-    time_t startMillis = millis();
+    esp8266::polledTimeout::oneShotFastMs timeOut(timeoutMillis);
     unsigned long detectedBaudrate;
-    while ((time_t) millis() - startMillis < timeoutMillis) {
+    while (!timeOut) {
         if ((detectedBaudrate = testBaudrate())) {
           break;
         }
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ unsigned long HardwareSerial::testBaudrate()`
`121`	`121`
`122`	`122`	`unsigned long HardwareSerial::detectBaudrate(time_t timeoutMillis)`
`123`	`123`	`{`
`124`		`- time_t startMillis = millis();`
	`124`	`+ esp8266::polledTimeout::oneShotFastMs timeOut(timeoutMillis);`
`125`	`125`	`unsigned long detectedBaudrate;`
`126`		`- while ((time_t) millis() - startMillis < timeoutMillis) {`
	`126`	`+ while (!timeOut) {`
`127`	`127`	`if ((detectedBaudrate = testBaudrate())) {`
`128`	`128`	`break;`
`129`	`129`	`}`