Merge remote-tracking branch 'adafruit/master' into adafruit-tinyusb

Author: hathach

boards.txt

@@ -380,9 +380,11 @@ adafruit_metro_m4.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
 # ------------------------------
 adafruit_grandcentral_m4.name=Adafruit Grand Central M4 (SAMD51)
 adafruit_grandcentral_m4.vid.0=0x239A
-adafruit_grandcentral_m4.pid.0=0x8020
+adafruit_grandcentral_m4.pid.0=0x8031
 adafruit_grandcentral_m4.vid.1=0x239A
-adafruit_grandcentral_m4.pid.1=0x0020
+adafruit_grandcentral_m4.pid.1=0x0031
+adafruit_grandcentral_m4.vid.1=0x239A
+adafruit_grandcentral_m4.pid.1=0x0032
 adafruit_grandcentral_m4.upload.tool=bossac18
 adafruit_grandcentral_m4.upload.protocol=sam-ba
 adafruit_grandcentral_m4.upload.maximum_size=1032192
@@ -402,7 +404,7 @@ adafruit_grandcentral_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
 adafruit_grandcentral_m4.build.variant=grand_central_m4
 adafruit_grandcentral_m4.build.variant_system_lib=
 adafruit_grandcentral_m4.build.vid=0x239A
-adafruit_grandcentral_m4.build.pid=0x8020
+adafruit_grandcentral_m4.build.pid=0x8031
 adafruit_grandcentral_m4.bootloader.tool=openocd
 adafruit_grandcentral_m4.bootloader.file=grand_central_m4/bootloader-grandcentralM4-v2.0.0-adafruit.5.bin
 adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16