Commit fd6f57d

committed

Added 16 byte endpoint support

1 parent a1cf704 commit fd6f57dCopy full SHA for fd6f57d

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ const CDCDescriptor _cdcInterface =`
`49`	`49`
`50`	`50`	`// CDC data interface`
`51`	`51`	`D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),`
`52`		`- D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),`
`53`		`- D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)`
	`52`	`+ D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,USB_EP_SIZE,0),`
	`53`	`+ D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,USB_EP_SIZE,0)`
`54`	`54`	`};`
`55`	`55`
`56`	`56`	`int CDC_GetInterface(u8* interfaceNum)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,12 @@ typedef unsigned long u32;`
`32`	`32`
`33`	`33`	`#include "Arduino.h"`
`34`	`34`
	`35`	`+// This definitions is usefull if you want to reduce the EP_SIZE to 16`
	`36`	`+// at the moment only 64 and 16 as EP_SIZE for all EPs are supported except the control endpoint`
	`37`	`+#ifndef USB_EP_SIZE`
	`38`	`+#define USB_EP_SIZE 64`
	`39`	`+#endif`
	`40`	`+`
`35`	`41`	`#if defined(USBCON)`
`36`	`42`
`37`	`43`	`#include "USBDesc.h"`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ u8 USB_SendSpace(u8 ep)`
`253`	`253`	`LockEP lock(ep);`
`254`	`254`	`if (!ReadWriteAllowed())`
`255`	`255`	`return 0;`
`256`		`- return 64 - FifoByteCount();`
	`256`	`+ return USB_EP_SIZE - FifoByteCount();`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`// Blocking Send of data to an endpoint`
`@@ -326,6 +326,7 @@ u8 _initEndpoints[] =`
`326`	`326`
`327`	`327`	`#define EP_SINGLE_64 0x32 // EP0`
`328`	`328`	`#define EP_DOUBLE_64 0x36 // Other endpoints`
	`329`	`+#define EP_SINGLE_16 0x12`
`329`	`330`
`330`	`331`	`static`
`331`	`332`	`void InitEP(u8 index, u8 type, u8 size)`
`@@ -344,7 +345,13 @@ void InitEndpoints()`
`344`	`345`	`UENUM = i;`
`345`	`346`	`UECONX = (1<<EPEN);`
`346`	`347`	`UECFG0X = _initEndpoints[i];`
	`348`	`+#if USB_EP_SIZE == 16`
	`349`	`+ UECFG1X = EP_SINGLE_16;`
	`350`	`+#elif USB_EP_SIZE == 64`
`347`	`351`	`UECFG1X = EP_DOUBLE_64;`
	`352`	`+#else`
	`353`	`+#error Unsupported value for USB_EP_SIZE`
	`354`	`+#endif`
`348`	`355`	`}`
`349`	`356`	`UERST = 0x7E; // And reset them`
`350`	`357`	`UERST = 0;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ int HID_GetInterface(u8* interfaceNum)`
`59`	`59`	`{`
`60`	`60`	`D_INTERFACE(HID_INTERFACE,1,3,0,0),`
`61`	`61`	`D_HIDREPORT(sizeof_hidReportDescriptor),`
`62`		`- D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)`
	`62`	`+ D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,USB_EP_SIZE,0x01)`
`63`	`63`	`};`
`64`	`64`	`return USB_SendControl(0,&_hidInterface,sizeof(_hidInterface));`
`65`	`65`	`}`

Comments

(0)