Merge pull request #344 from adafruit/release-1.7.12

fix incorrect PID for pIRKey board (conflict with M0 trinket)
This commit is contained in:
Ha Thach 2023-05-23 11:14:01 +07:00 committed by GitHub
commit 313ef47993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View file

@ -772,9 +772,11 @@ adafruit_pirkey.name=Adafruit pIRKey (SAMD21)
# VID/PID for Bootloader, Arduino & CircuitPython # VID/PID for Bootloader, Arduino & CircuitPython
adafruit_pirkey.vid.0=0x239A adafruit_pirkey.vid.0=0x239A
adafruit_pirkey.pid.0=0x801E adafruit_pirkey.pid.0=0x8027
adafruit_pirkey.vid.1=0x239A adafruit_pirkey.vid.1=0x239A
adafruit_pirkey.pid.1=0x001E adafruit_pirkey.pid.1=0x0027
adafruit_pirkey.vid.2=0x239A
adafruit_pirkey.pid.2=0x8028
# Upload # Upload
adafruit_pirkey.upload.tool=bossac18 adafruit_pirkey.upload.tool=bossac18
@ -798,7 +800,7 @@ adafruit_pirkey.build.openocdscript=openocd_scripts/pirkey.cfg
adafruit_pirkey.build.variant=pirkey adafruit_pirkey.build.variant=pirkey
adafruit_pirkey.build.variant_system_lib= adafruit_pirkey.build.variant_system_lib=
adafruit_pirkey.build.vid=0x239A adafruit_pirkey.build.vid=0x239A
adafruit_pirkey.build.pid=0x801E adafruit_pirkey.build.pid=0x8027
adafruit_pirkey.bootloader.tool=openocd adafruit_pirkey.bootloader.tool=openocd
adafruit_pirkey.bootloader.file=pirkey/bootloader-pirkey-v2.0.0-adafruit.5.bin adafruit_pirkey.bootloader.file=pirkey/bootloader-pirkey-v2.0.0-adafruit.5.bin

View file

@ -225,7 +225,7 @@ make_board("SAMD21", "adafruit_itsybitsy_m0", "itsybitsy_m0",
"ITSYBITSY_M0", "-D__SAMD21G18A__ -DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0", "itsybitsyM0/bootloader-itsybitsy_m0-v2.0.0-adafruit.5.bin") "ITSYBITSY_M0", "-D__SAMD21G18A__ -DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0", "itsybitsyM0/bootloader-itsybitsy_m0-v2.0.0-adafruit.5.bin")
make_board("SAMD21", "adafruit_pirkey", "pirkey", make_board("SAMD21", "adafruit_pirkey", "pirkey",
"Adafruit", "pIRKey", "0x239A", ["0x801E", "0x001E"], "Adafruit", "pIRKey", "0x239A", ["0x8027", "0x0027", "0x8028"],
"PIRKEY", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_PIRKEY", "pirkey/bootloader-pirkey-v2.0.0-adafruit.5.bin") "PIRKEY", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_PIRKEY", "pirkey/bootloader-pirkey-v2.0.0-adafruit.5.bin")
make_board("SAMD21", "adafruit_hallowing", "hallowing_m0_express", make_board("SAMD21", "adafruit_hallowing", "hallowing_m0_express",

View file

@ -20,7 +20,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
version=1.7.11 version=1.7.12
# Compile variables # Compile variables
# ----------------- # -----------------