From c8f495ba7fddc71c23a6ece14a08d6c1bddb8f36 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Mon, 31 Oct 2011 23:44:32 -0400
Subject: [PATCH] changed Leonardo PID to 0x0032 for Diskloader testing. 
 updated .inf to match.

---
 build/windows/dist/drivers/Arduino Leonardo.inf             | 2 ++
 .../arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex  | 4 ++--
 hardware/arduino/bootloaders/diskloader/Makefile            | 4 ++--
 hardware/arduino/bootloaders/diskloader/src/Platform.h      | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/windows/dist/drivers/Arduino Leonardo.inf b/build/windows/dist/drivers/Arduino Leonardo.inf
index a6a747729..b77462ce5 100644
--- a/build/windows/dist/drivers/Arduino Leonardo.inf	
+++ b/build/windows/dist/drivers/Arduino Leonardo.inf	
@@ -86,9 +86,11 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [SourceDisksFiles]
 [SourceDisksNames]
 [DeviceList]
+%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_0032
 %DESCRIPTION%=DriverInstall, USB\VID_2341&PID_0034&MI_00
 
 [DeviceList.NTamd64]
+%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_0032
 %DESCRIPTION%=DriverInstall, USB\VID_2341&PID_0034&MI_00
 
 
diff --git a/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex b/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
index 0e2c44532..434b8bfff 100644
--- a/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
+++ b/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
@@ -19,8 +19,8 @@
 :10712000750069006E006F0020004C0065006F0064
 :107130006E006100720064006F001803410072006D
 :107140006400750069006E006F0020004C004C0068
-:1071500043001201000200000040412334000001FE
-:10716000010200011201000202000040412334002C
+:107150004300120100020000004041233200000100
+:10716000010200011201000202000040412332002E
 :1071700000010102000100C180813D3C11241FBEBD
 :10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E6EF87
 :10719000FAE702C005900D92A830B107D9F711E0C7
diff --git a/hardware/arduino/bootloaders/diskloader/Makefile b/hardware/arduino/bootloaders/diskloader/Makefile
index 0ae99e816..8eec35049 100644
--- a/hardware/arduino/bootloaders/diskloader/Makefile
+++ b/hardware/arduino/bootloaders/diskloader/Makefile
@@ -14,9 +14,9 @@ AVR_FREQ   = 16000000L
 # Specify the Arduino model using the assigned PID.  This is used by Descriptors.c
 #   to set PID and product descriptor string
 # Arduino Leonardo PID
-ARDUINO_MODEL_PID = 0x0034
+ARDUINO_MODEL_PID = 0x0032
 # Arduino Micro PID
-#ARDUINO_MODEL_PID = 0x0035
+#ARDUINO_MODEL_PID = 0x0033
 
 # Change if your programmer is different
 AVRDUDE_PROGRAMMER = avrispmkII
diff --git a/hardware/arduino/bootloaders/diskloader/src/Platform.h b/hardware/arduino/bootloaders/diskloader/src/Platform.h
index f1194a58e..d1f884cfb 100644
--- a/hardware/arduino/bootloaders/diskloader/src/Platform.h
+++ b/hardware/arduino/bootloaders/diskloader/src/Platform.h
@@ -25,10 +25,10 @@ typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
 
-#define USB_PID_LEONARDO 0x0034
-#define USB_PID_MICRO 0x0035
+#define USB_PID_LEONARDO 0x0032
+#define USB_PID_MICRO 0x0033
 #define USB_VID 0x2341	// arduino LLC vid
-#define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro
+#define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0032 for Leonardo, 0x0033 for Micro
 
 #define min(a,b) ((a)<(b)?(a):(b))