RP2040: don't expose MSC interface when resetting via 1200bps touch

Author: facchinm

variants/NANO_RP2040_CONNECT/double_tap_usb_boot.cpp

@@ -3,6 +3,8 @@ extern "C" {
     #include "pico/time.h"
     #include "pico/bootrom.h"
 }
+#include "macros.h"
+#include "pins_arduino.h"
 
 // Allow user override of the LED mask
 #ifndef USB_BOOT_LED_ACTIVITY_MASK
@@ -33,7 +35,7 @@ static void boot_double_tap_check() {
     }
 
     magic_location[0] = 0;
-    reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0);
+    reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0);
 }
 
 class DoubleTap {

variants/NANO_RP2040_CONNECT/variant.cpp

@@ -91,7 +91,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {
 }
 
 void _ontouch1200bps_() {
-  reset_usb_boot(0, 0);
+  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);
 }
 
 #endif

variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp

@@ -3,11 +3,8 @@ extern "C" {
     #include "pico/time.h"
     #include "pico/bootrom.h"
 }
-
-// Allow user override of the LED mask
-#ifndef USB_BOOT_LED_ACTIVITY_MASK
-#define USB_BOOT_LED_ACTIVITY_MASK 1
-#endif
+#include "macros.h"
+#include "pins_arduino.h"
 
 // Doesn't make any sense for a RAM only binary
 #if !PICO_NO_FLASH
@@ -33,7 +30,7 @@ static void boot_double_tap_check() {
     }
 
     magic_location[0] = 0;
-    reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0);
+    reset_usb_boot(1 << LED_BUILTIN, 0);
 }
 
 class DoubleTap {

variants/RASPBERRY_PI_PICO/variant.cpp

@@ -80,7 +80,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) {
 }
 
 void _ontouch1200bps_() {
-  reset_usb_boot(0, 0);
+  reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1);
 }
 
 #endif