Merge pull request #664 from pillilz/master

facchinm · web-flow · commit 86d2463791ef · 2022-02-22T11:14:17.000+01:00
Fix USBDevice.connected()
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -480,8 +480,8 @@ void USBDeviceClass::stall(uint32_t ep)
 bool USBDeviceClass::connected()
 {
 	// Count frame numbers
-	uint8_t f = USB->DEVICE.FNUM.bit.FNUM;
-	//delay(3);
+	uint16_t f = USB->DEVICE.FNUM.bit.FNUM;
+	delay(1); // wait for next SOF
 	return f != USB->DEVICE.FNUM.bit.FNUM;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -480,8 +480,8 @@ void USBDeviceClass::stall(uint32_t ep)`
`480`	`480`	`bool USBDeviceClass::connected()`
`481`	`481`	`{`
`482`	`482`	`// Count frame numbers`
`483`		`- uint8_t f = USB->DEVICE.FNUM.bit.FNUM;`
`484`		`- //delay(3);`
	`483`	`+ uint16_t f = USB->DEVICE.FNUM.bit.FNUM;`
	`484`	`+ delay(1); // wait for next SOF`
`485`	`485`	`return f != USB->DEVICE.FNUM.bit.FNUM;`
`486`	`486`	`}`
`487`	`487`