diff options
Diffstat (limited to 'Projects/LEDNotifier')
| -rw-r--r-- | Projects/LEDNotifier/Descriptors.c | 10 | ||||
| -rw-r--r-- | Projects/LEDNotifier/Descriptors.h | 12 | ||||
| -rw-r--r-- | Projects/LEDNotifier/LEDNotifier.c | 32 | 
3 files changed, 30 insertions, 24 deletions
| diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c index e362857b41..d5bc6faed4 100644 --- a/Projects/LEDNotifier/Descriptors.c +++ b/Projects/LEDNotifier/Descriptors.c @@ -143,7 +143,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =  		{  			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, -			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM), +			.EndpointAddress        = CDC_NOTIFICATION_EPADDR,  			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),  			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,  			.PollingIntervalMS      = 0xFF @@ -169,20 +169,20 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =  		{  			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, -			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM), +			.EndpointAddress        = CDC_RX_EPADDR,  			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),  			.EndpointSize           = CDC_TXRX_EPSIZE, -			.PollingIntervalMS      = 0x01 +			.PollingIntervalMS      = 0x05  		},  	.CDC_DataInEndpoint =  		{  			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, -			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM), +			.EndpointAddress        = CDC_TX_EPADDR,  			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),  			.EndpointSize           = CDC_TXRX_EPSIZE, -			.PollingIntervalMS      = 0x01 +			.PollingIntervalMS      = 0x05  		}  }; diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index 03f4e5e7a8..e481793b06 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -42,14 +42,14 @@  		#include <LUFA/Drivers/USB/USB.h>  	/* Macros: */ -		/** Endpoint number of the CDC device-to-host notification IN endpoint. */ -		#define CDC_NOTIFICATION_EPNUM         2 +		/** Endpoint address of the CDC device-to-host notification IN endpoint. */ +		#define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN  | 2) -		/** Endpoint number of the CDC device-to-host data IN endpoint. */ -		#define CDC_TX_EPNUM                   3 +		/** Endpoint address of the CDC device-to-host data IN endpoint. */ +		#define CDC_TX_EPADDR                  (ENDPOINT_DIR_IN  | 3) -		/** Endpoint number of the CDC host-to-device data OUT endpoint. */ -		#define CDC_RX_EPNUM                   4 +		/** Endpoint address of the CDC host-to-device data OUT endpoint. */ +		#define CDC_RX_EPADDR                  (ENDPOINT_DIR_OUT | 4)  		/** Size in bytes of the CDC device-to-host notification IN endpoint. */  		#define CDC_NOTIFICATION_EPSIZE        8 diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c index 34f29e1248..dd3a8ae3a0 100644 --- a/Projects/LEDNotifier/LEDNotifier.c +++ b/Projects/LEDNotifier/LEDNotifier.c @@ -44,19 +44,25 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =  	{  		.Config =  			{ -				.ControlInterfaceNumber         = 0, - -				.DataINEndpointNumber           = CDC_TX_EPNUM, -				.DataINEndpointSize             = CDC_TXRX_EPSIZE, -				.DataINEndpointDoubleBank       = false, - -				.DataOUTEndpointNumber          = CDC_RX_EPNUM, -				.DataOUTEndpointSize            = CDC_TXRX_EPSIZE, -				.DataOUTEndpointDoubleBank      = false, - -				.NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM, -				.NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE, -				.NotificationEndpointDoubleBank = false, +				.ControlInterfaceNumber   = 0, +				.DataINEndpoint           = +					{ +						.Address          = CDC_TX_EPADDR, +						.Size             = CDC_TXRX_EPSIZE, +						.Banks            = 1, +					}, +				.DataOUTEndpoint = +					{ +						.Address          = CDC_RX_EPADDR, +						.Size             = CDC_TXRX_EPSIZE, +						.Banks            = 1, +					}, +				.NotificationEndpoint = +					{ +						.Address          = CDC_NOTIFICATION_EPADDR, +						.Size             = CDC_NOTIFICATION_EPSIZE, +						.Banks            = 1, +					},  			},  	}; | 
