tschwery/tmk_keyboard
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'yangdigi-master'

Browse source
This commit is contained in:
tmk 2018-01-04 13:14:42 +09:00
commit 965daf9dac
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tmk_core/protocol/lufa/descriptor.h
View file

@ -121,33 +121,33 @@ typedef struct
// Endopoint number and size // Endopoint number and size
#define KEYBOARD_IN_EPNUM 1 #define CUR_EPNUM 1
#define KEYBOARD_IN_EPNUM CUR_EPNUM
#ifdef MOUSE_ENABLE #ifdef MOUSE_ENABLE
# define MOUSE_IN_EPNUM (KEYBOARD_IN_EPNUM + 1) # define CUR_EPNUM (CUR_EPNUM + 1)
#else # define MOUSE_IN_EPNUM CUR_EPNUM
# define MOUSE_IN_EPNUM KEYBOARD_IN_EPNUM
#endif #endif
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
# define EXTRAKEY_IN_EPNUM (MOUSE_IN_EPNUM + 1) # define CUR_EPNUM (CUR_EPNUM + 1)
#else # define EXTRAKEY_IN_EPNUM CUR_EPNUM
# define EXTRAKEY_IN_EPNUM MOUSE_IN_EPNUM
#endif #endif
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
# define CONSOLE_IN_EPNUM (EXTRAKEY_IN_EPNUM + 1) # define CUR_EPNUM (CUR_EPNUM + 1)
# define CONSOLE_OUT_EPNUM (EXTRAKEY_IN_EPNUM + 1) # define CONSOLE_IN_EPNUM CUR_EPNUM
//# define CONSOLE_OUT_EPNUM (EXTRAKEY_IN_EPNUM + 2) # define CONSOLE_OUT_EPNUM CUR_EPNUM
#else
# define CONSOLE_OUT_EPNUM EXTRAKEY_IN_EPNUM
#endif #endif
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
# define NKRO_IN_EPNUM (CONSOLE_OUT_EPNUM + 1) # define CUR_EPNUM (CUR_EPNUM + 1)
# if defined(__AVR_ATmega32U2__) && NKRO_IN_EPNUM > 4 # define NKRO_IN_EPNUM CUR_EPNUM
# error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO)" #endif
# endif
/* Check number of endpoints. ATmega32u2 has only four except for control endpoint. */
#if defined(__AVR_ATmega32U2__) && CUR_EPNUM > 4
# error "Endpoints are not available enough to support all functions. Disable some of build options in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO)"
#endif #endif