TEMP: RP2040: expose MSD interface again

facchinm · facchinm · commit d2942e207a5b · 2021-05-05T18:01:23.000+02:00
Partially revert fbad244 On Windows, the "pure" picoboot interface is not composite, but keeps the same VID/PID pair (USB\VID_2E8A&PID_0003) Adding this identifier to the winusb driver unloads the Mass storage interface on MI_00, even when the device is composite. Since this issue is catastrophic for Windows users, reverting is the safest method by now.
diff --git a/variants/NANO_RP2040_CONNECT/variant.cpp b/variants/NANO_RP2040_CONNECT/variant.cpp
@@ -91,7 +91,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {
 }
 
 void _ontouch1200bps_() {
-  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);
+  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);
 }
 
 #endif
diff --git a/variants/RASPBERRY_PI_PICO/variant.cpp b/variants/RASPBERRY_PI_PICO/variant.cpp
@@ -80,7 +80,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {
 }
 
 void _ontouch1200bps_() {
-  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);
+  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`void _ontouch1200bps_() {`
`94`		`- reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);`
	`94`	`+ reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void _ontouch1200bps_() {`
`83`		`- reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);`
	`83`	`+ reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`#endif`