Merge pull request #344 from adafruit/release-1.7.12

fix incorrect PID for pIRKey board (conflict with M0 trinket)

boards.txt

@@ -772,9 +772,11 @@ adafruit_pirkey.name=Adafruit pIRKey (SAMD21)
 
 # VID/PID for Bootloader, Arduino & CircuitPython
 adafruit_pirkey.vid.0=0x239A
-adafruit_pirkey.pid.0=0x801E
+adafruit_pirkey.pid.0=0x8027
 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
 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_system_lib=
 adafruit_pirkey.build.vid=0x239A
-adafruit_pirkey.build.pid=0x801E
+adafruit_pirkey.build.pid=0x8027
 adafruit_pirkey.bootloader.tool=openocd
 adafruit_pirkey.bootloader.file=pirkey/bootloader-pirkey-v2.0.0-adafruit.5.bin
 

extras/makeboards.py

@@ -225,7 +225,7 @@ def make_board(mcu, name, variant, vendor, product, vid, pid_list, boarddefine,
            "ITSYBITSY_M0", "-D__SAMD21G18A__ -DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0", "itsybitsyM0/bootloader-itsybitsy_m0-v2.0.0-adafruit.5.bin")
 
 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")
 
 make_board("SAMD21", "adafruit_hallowing", "hallowing_m0_express", 

platform.txt

@@ -20,7 +20,7 @@
 # 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
-version=1.7.11
+version=1.7.12
 
 # Compile variables
 # -----------------