From 73b46de27bb78a7aeb2066cde86a44bd313a8382 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Tue, 10 Jan 2012 21:23:01 -0500
Subject: [PATCH] made Leonardo and Micro bootloader PIDs same as sketch PIDs

---
 bootloaders/caterina/Caterina-Leonardo.hex | 12 ++++++------
 bootloaders/caterina/Makefile              |  4 ++--
 bootloaders/caterina/src/Platform.h        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bootloaders/caterina/Caterina-Leonardo.hex b/bootloaders/caterina/Caterina-Leonardo.hex
index 44a452e..ea2af98 100644
--- a/bootloaders/caterina/Caterina-Leonardo.hex
+++ b/bootloaders/caterina/Caterina-Leonardo.hex
@@ -4,14 +4,14 @@
 :107830000CA10185037508150026FF00954009017C
 :107840008102954009029102C0040309041A033021
 :1078500000300030003000300030003000300031A7
-:107860000037003000310038030000000000000045
-:107870000000000000000000000000000000000008
-:1078800000000000000000000000000000000000F8
-:1078900000000000000000000000000000000018D0
+:1078600000370030003100380341007200640075B9
+:107870000069006E006F0020004C0065006F006E14
+:10788000006100720064006F00200062006F006FF2
+:107890000074006C006F00610064006500720018E5
 :1078A00003410072006400750069006E006F0020E3
 :1078B000004C004C00430012010002020000404155
-:1078C0002330000001000203011201000200000049
-:1078D000404123300000010002030109026400035B
+:1078C0002334000001000203011201000200000045
+:1078D0004041233400000100020301090264000357
 :1078E00001008032080B00020202010009040000BE
 :1078F0000102020000052400100105240101010419
 :107900002402020524060001070581031000400936
diff --git a/bootloaders/caterina/Makefile b/bootloaders/caterina/Makefile
index 4bb41c8..8075a56 100644
--- a/bootloaders/caterina/Makefile
+++ b/bootloaders/caterina/Makefile
@@ -15,9 +15,9 @@ AVR_FREQ = 16000000L
 #   to set PID and product descriptor string
 
 # Arduino Leonardo bootloader PID 
-ARDUINO_MODEL_PID = 0x0030
+ARDUINO_MODEL_PID = 0x0034
 # Arduino Micro bootloader PID
-#ARDUINO_MODEL_PID = 0x0031
+#ARDUINO_MODEL_PID = 0x0035
 
 # Change if your programmer is different
 AVRDUDE_PROGRAMMER = avrispmkII
diff --git a/bootloaders/caterina/src/Platform.h b/bootloaders/caterina/src/Platform.h
index 75e5bc3..26c1114 100644
--- a/bootloaders/caterina/src/Platform.h
+++ b/bootloaders/caterina/src/Platform.h
@@ -14,8 +14,8 @@
 #define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))
 #define DISABLE_JTAG()  MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD);
 
-#define USB_PID_LEONARDO_BOOTLOADER 0x008D
-#define USB_PID_MICRO_BOOTLOADER 0x0031
+#define USB_PID_LEONARDO_BOOTLOADER 0x0034
+#define USB_PID_MICRO_BOOTLOADER 0x0035
 #define USB_VID 0x2341	// arduino LLC vid
 #define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro