diff options
Diffstat (limited to 'Projects/LEDNotifier')
| -rw-r--r-- | Projects/LEDNotifier/Descriptors.c | 10 | ||||
| -rw-r--r-- | Projects/LEDNotifier/Descriptors.h | 11 | 
2 files changed, 16 insertions, 5 deletions
| diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c index 5a0c7603dc..1875bba014 100644 --- a/Projects/LEDNotifier/Descriptors.c +++ b/Projects/LEDNotifier/Descriptors.c @@ -58,8 +58,8 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =  	.ProductID              = 0x2044,  	.ReleaseNumber          = VERSION_BCD(00.01), -	.ManufacturerStrIndex   = 0x01, -	.ProductStrIndex        = 0x02, +	.ManufacturerStrIndex   = STRING_ID_Manufacturer, +	.ProductStrIndex        = STRING_ID_Product,  	.SerialNumStrIndex      = USE_INTERNAL_SERIAL,  	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS @@ -237,15 +237,15 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,  		case DTYPE_String:  			switch (DescriptorNumber)  			{ -				case 0x00: +				case STRING_ID_Language:  					Address = &LanguageString;  					Size    = pgm_read_byte(&LanguageString.Header.Size);  					break; -				case 0x01: +				case STRING_ID_Manufacturer:  					Address = &ManufacturerString;  					Size    = pgm_read_byte(&ManufacturerString.Header.Size);  					break; -				case 0x02: +				case STRING_ID_Product:  					Address = &ProductString;  					Size    = pgm_read_byte(&ProductString.Header.Size);  					break; diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index f111e434b5..363951c5b6 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -79,6 +79,17 @@  			USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;  		} USB_Descriptor_Configuration_t; +		/** Enum for the device string descriptor IDs within the device. Each string descriptor should +		 *  have a unique ID index associated with it, which can be used to refer to the string from +		 *  other descriptors. +		 */ +		enum StringDescriptors_t +		{ +		    STRING_ID_Language      = 0, /**< Supported Languages string descriptor ID (must be zero) */ +		    STRING_ID_Manufacturer  = 1, /**< Manufacturer string ID */ +		    STRING_ID_Product       = 2, /**< Product string ID */ +		}; +  	/* Function Prototypes: */  		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,  		                                    const uint8_t wIndex, | 
