CMake generated strings that configure the USB info section

- Defined Manufacturer name
- Product name now references each of the selected modules
- Serial number refers to the last commit date, branch, and whether modified since the last commit
This commit is contained in:
Jacob Alexander 2013-02-01 20:02:55 -05:00
parent 473e3359f4
commit b7afaa100f
6 changed files with 88 additions and 30 deletions

View file

@ -408,19 +408,19 @@ static struct usb_string_descriptor_struct string0 = {
};
static struct usb_string_descriptor_struct string1 = {
2 + MANUFACTURER_NAME_LEN * 2,
sizeof(STR_MANUFACTURER),
3,
MANUFACTURER_NAME
STR_MANUFACTURER
};
static struct usb_string_descriptor_struct string2 = {
2 + PRODUCT_NAME_LEN * 2,
sizeof(STR_PRODUCT),
3,
PRODUCT_NAME
STR_PRODUCT
};
static struct usb_string_descriptor_struct string3 = {
12,
sizeof(STR_SERIAL),
3,
{'1','2','3','4','5'}
STR_SERIAL
};
@ -447,9 +447,9 @@ const usb_descriptor_list_t usb_descriptor_list[] = {
{0x2100, JOYSTICK_INTERFACE, config_descriptor+JOYSTICK_DESC_OFFSET, 9},
#endif
{0x0300, 0x0000, (const uint8_t *)&string0, 4},
{0x0301, 0x0409, (const uint8_t *)&string1, 2 + MANUFACTURER_NAME_LEN * 2},
{0x0302, 0x0409, (const uint8_t *)&string2, 2 + PRODUCT_NAME_LEN * 2},
{0x0303, 0x0409, (const uint8_t *)&string3, 12},
{0x0301, 0x0409, (const uint8_t *)&string1, sizeof(STR_MANUFACTURER)},
{0x0302, 0x0409, (const uint8_t *)&string2, sizeof(STR_PRODUCT)},
{0x0303, 0x0409, (const uint8_t *)&string3, sizeof(STR_SERIAL)},
{0, 0, NULL, 0}
};