diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2012-04-09 08:03:56 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2012-04-09 08:03:56 -0400 |
| commit | afedb5a92bac5c7f62a02ba085b4fff2b4f2070a (patch) | |
| tree | ea3a3b6952ca2aaf602eee096a590be5746b491c /bootloaders/caterina/Descriptors.c | |
| parent | ee611dc194fad72d2db9a901208577857365778f (diff) | |
PID and VID are no longer hard-coded in bootloader. instead they are passed in at compile-time from makefile. also added and renamed built bootloader images for Micro and Leonardo
Diffstat (limited to 'bootloaders/caterina/Descriptors.c')
| -rwxr-xr-x | bootloaders/caterina/Descriptors.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bootloaders/caterina/Descriptors.c b/bootloaders/caterina/Descriptors.c index f1756e2..824e0dd 100755 --- a/bootloaders/caterina/Descriptors.c +++ b/bootloaders/caterina/Descriptors.c @@ -53,8 +53,8 @@ const USB_Descriptor_Device_t DeviceDescriptor = .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
- .VendorID = 0x2341,
- .ProductID = 0x0701,
+ .VendorID = DEVICE_VID,
+ .ProductID = DEVICE_PID,
.ReleaseNumber = VERSION_BCD(00.01),
.ManufacturerStrIndex = 0x02,
@@ -193,7 +193,13 @@ const USB_Descriptor_String_t ProductString = {
.Header = {.Size = USB_STRING_LEN(16), .Type = DTYPE_String},
- .UnicodeString = L"Arduino Leonardo"
+ #if DEVICE_PID == 0x0034
+ .UnicodeString = L"Arduino Leonardo"
+ #elif DEVICE_PID == 0x0035
+ .UnicodeString = L"Arduino Micro "
+ #else
+ .UnicodeString = L"USB IO board "
+ #endif
};
/*
const USB_Descriptor_String_t SerialNumString =
|