From afedb5a92bac5c7f62a02ba085b4fff2b4f2070a Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Mon, 9 Apr 2012 08:03:56 -0400 Subject: 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 --- bootloaders/caterina/Descriptors.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'bootloaders/caterina/Descriptors.c') 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 = -- cgit v1.2.3-18-g5258