aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-10-31 23:44:32 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-10-31 23:44:32 -0400
commit75cc55d91770573ab42670b4fe0fb6d4d13a9474 (patch)
tree25b82c297ec71323c6ad38663be2a7773f981e27
parent61b03fc98534a48609daf479f150a71bbc607f55 (diff)
changed Leonardo PID to 0x0032 for Diskloader testing. updated .inf to match.
-rw-r--r--bootloaders/diskloader/DiskLoader-Leonardo.hex4
-rw-r--r--bootloaders/diskloader/Makefile4
-rw-r--r--bootloaders/diskloader/src/Platform.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/bootloaders/diskloader/DiskLoader-Leonardo.hex b/bootloaders/diskloader/DiskLoader-Leonardo.hex
index 0e2c445..434b8bf 100644
--- a/bootloaders/diskloader/DiskLoader-Leonardo.hex
+++ b/bootloaders/diskloader/DiskLoader-Leonardo.hex
@@ -19,8 +19,8 @@
:10712000750069006E006F0020004C0065006F0064
:107130006E006100720064006F001803410072006D
:107140006400750069006E006F0020004C004C0068
-:1071500043001201000200000040412334000001FE
-:10716000010200011201000202000040412334002C
+:107150004300120100020000004041233200000100
+:10716000010200011201000202000040412332002E
:1071700000010102000100C180813D3C11241FBEBD
:10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E6EF87
:10719000FAE702C005900D92A830B107D9F711E0C7
diff --git a/bootloaders/diskloader/Makefile b/bootloaders/diskloader/Makefile
index 0ae99e8..8eec350 100644
--- a/bootloaders/diskloader/Makefile
+++ b/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/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h
index f1194a5..d1f884c 100644
--- a/bootloaders/diskloader/src/Platform.h
+++ b/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))