noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added to sketch iProduct and iManufacturer strings identifying board as either an "Arduino Leonardo" or "Arduino Micro" manufactured by "Arduino LLC"

This commit is contained in:
Zach Eveland 2011-09-16 12:29:47 -04:00
parent 24cb818be8
commit 7166603c89
2 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cores/arduino/USBCore.cpp
View File

@ -34,7 +34,8 @@
//==================================================================
extern const u16 STRING_LANGUAGE[] PROGMEM;
extern const u16 STRING_SERIAL[] PROGMEM;
extern const u16 STRING_IPRODUCT[] PROGMEM;
extern const u16 STRING_IMANUFACTURER[] PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
@ -43,16 +44,18 @@ const u16 STRING_LANGUAGE[2] = {
0x0409 // English
};
#if 0
const u16 STRING_PRODUCT[] = {
(3<<8) | (2+2*10),
PRODUCT_NAME
};
const u16 STRING_IPRODUCT[17] = {
(3<<8) | (2+2*16),
#if USB_PID == USB_PID_LEONARDO
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
#elif USB_PID == USB_PID_MICRO
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
#endif
};
const u16 STRING_SERIAL[13] = {
(3<<8) | (2+2*12),
MSC_DISK_SERIAL
const u16 STRING_IMANUFACTURER[12] = {
(3<<8) | (2+2*11),
'A','r','d','u','i','n','o',' ','L','L','C'
};
#ifdef CDC_ENABLED
@ -63,10 +66,10 @@ const u16 STRING_SERIAL[13] = {
// DEVICE DESCRIPTOR
const DeviceDescriptor USB_DeviceDescriptor =
D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
const DeviceDescriptor USB_DeviceDescriptorA =
D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,0,IPRODUCT,ISERIAL,1);
D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
//==================================================================
//==================================================================
@ -473,8 +476,12 @@ bool SendDescriptor(Setup& setup)
{
if (setup.wValueL == 0)
desc_addr = (const u8*)&STRING_LANGUAGE;
if (setup.wValueL == ISERIAL)
desc_addr = (const u8*)&STRING_SERIAL;
else if (setup.wValueL == IPRODUCT)
desc_addr = (const u8*)&STRING_IPRODUCT;
else if (setup.wValueL == IMANUFACTURER)
desc_addr = (const u8*)&STRING_IMANUFACTURER;
else
return false;
}
if (desc_addr == 0)

37
cores/arduino/USBDesc.h
View File

@ -18,7 +18,6 @@
#define CDC_ENABLED
#define HID_ENABLED
//#define MSC_ENABLED
#ifdef CDC_ENABLED
@ -37,14 +36,6 @@
#define HID_ENPOINT_COUNT 0
#endif
#ifdef MSC_ENABLED
#define MSC_INTERFACE_COUNT 1
#define MSC_ENPOINT_COUNT 2
#else
#define MSC_INTERFACE_COUNT 0
#define MSC_ENPOINT_COUNT 0
#endif
#define CDC_ACM_INTERFACE 0 // CDC ACM
#define CDC_DATA_INTERFACE 1 // CDC Data
#define CDC_FIRST_ENDPOINT 1
@ -56,11 +47,6 @@
#define HID_FIRST_ENDPOINT (CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
#define HID_ENDPOINT_INT (HID_FIRST_ENDPOINT)
#define MSC_INTERFACE (HID_INTERFACE + HID_INTERFACE_COUNT) // MSC Interface
#define MSC_FIRST_ENDPOINT (HID_FIRST_ENDPOINT + HID_ENPOINT_COUNT)
#define MSC_ENDPOINT_OUT (MSC_FIRST_ENDPOINT)
#define MSC_ENDPOINT_IN (MSC_FIRST_ENDPOINT+1)
#define INTERFACE_COUNT (MSC_INTERFACE + MSC_INTERFACE_COUNT)
#ifdef CDC_ENABLED
@ -72,25 +58,10 @@
#define HID_TX HID_ENDPOINT_INT
#endif
#ifdef MSC_ENABLED
#define MSC_RX MSC_ENDPOINT_OUT
#define MSC_TX MSC_ENDPOINT_IN
#endif
#define IMANUFACTURER 0
#define IPRODUCT 0
#define ISERIAL 1 // Only need this for MSC
#define WRITABLE_DIRECTORY // undef saved 56 + 512 RAM
#define FAT_DISK_LABEL 'b','o','o','t','l','o','a','d','e','r',' ' // 11 chars (undef saves 12)
#define FAT_FILE_NAME 'F','I','R','M','W','A','R','E','B','I','N' // 11 chars
#define MSC_DISK_SERIAL '0','0','0','0','0','0','0','0','1','7','0','1' // 12 chars
#define IMANUFACTURER 1
#define IPRODUCT 2
#define USB_PID_LEONARDO 0x0034
#define USB_PID_MICRO 0x0035
#define USB_VID 0x2341 // arduino LLC vid
#define USB_PID ARDUINO_MODEL_USB_PID
#define FAT_OEM_NAME 'l','e','o','n','a','r','d','o' // 8 chars
#define PRODUCT_NAME 'A','r','d','u','i','n','o','l','l','c' // 10