adafruit-mirror/ArduinoCore-samd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into matrixportal

Browse source
This commit is contained in:
lady ada 2020-08-30 14:03:12 -04:00
commit 287d079c4d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boards.txt
View file

@ -1321,6 +1321,7 @@ adafruit_hallowing_m4.menu.debug.off=Off
adafruit_hallowing_m4.menu.debug.on=On
adafruit_hallowing_m4.menu.debug.on.build.flags.debug=-g
<<<<<<< HEAD
# Adafruit Matrix Portal M4 (SAMD51)
# ------------------------------
adafruit_matrixportal_m4.name=Adafruit Matrix Portal M4 (SAMD51)
@ -1414,7 +1415,7 @@ adafruit_blm_badge.build.variant_system_lib=
adafruit_blm_badge.build.vid=0x239A
adafruit_blm_badge.build.pid=0x80BF
adafruit_blm_badge.bootloader.tool=openocd
adafruit_blm_badge.bootloader.file=gemmaM0/bootloader-gemma_m0-v2.0.0-adafruit.5.bin
adafruit_blm_badge.bootloader.file=blmbadge/bootloader-blm_badge.bin
adafruit_blm_badge.menu.usbstack.arduino=Arduino
adafruit_blm_badge.menu.usbstack.tinyusb=TinyUSB
adafruit_blm_badge.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB

BIN
bootloaders/blmbadge/bootloader-blm_badge.bin Normal file
View file

Binary file not shown.