diff options
| author | Joshua T <[email protected]> | 2016-10-15 15:14:10 -0500 | 
|---|---|---|
| committer | Joshua T <[email protected]> | 2016-10-15 15:14:10 -0500 | 
| commit | 2e6a1a53d73607030c470b88d3ed7223db5e0004 (patch) | |
| tree | fd8ff310f0dba21f9135cdead49482af2276329b /tmk_core/protocol/lufa/descriptor.h | |
| parent | 5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff) | |
| parent | 0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff) | |
| download | qmk_firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.gz qmk_firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.zip  | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa/descriptor.h')
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.h | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h index 316650a7b1..c6c94e3618 100644 --- a/tmk_core/protocol/lufa/descriptor.h +++ b/tmk_core/protocol/lufa/descriptor.h @@ -1,4 +1,4 @@ -/*  +/*   * Copyright 2012,2013 Jun Wako <[email protected]>   * This file is based on:   *     LUFA-120219/Demos/Device/Lowlevel/KeyboardMouse @@ -129,13 +129,13 @@ typedef struct  #   define MOUSE_INTERFACE          (KEYBOARD_INTERFACE + 1)  #else  #   define MOUSE_INTERFACE          KEYBOARD_INTERFACE -#endif  +#endif  #ifdef EXTRAKEY_ENABLE  #   define EXTRAKEY_INTERFACE       (MOUSE_INTERFACE + 1)  #else  #   define EXTRAKEY_INTERFACE       MOUSE_INTERFACE -#endif  +#endif  #ifdef CONSOLE_ENABLE  #   define CONSOLE_INTERFACE        (EXTRAKEY_INTERFACE + 1) @@ -171,7 +171,7 @@ typedef struct  #define KEYBOARD_IN_EPNUM           1  #ifdef MOUSE_ENABLE -#   define MOUSE_IN_EPNUM           (KEYBOARD_IN_EPNUM + 1)  +#   define MOUSE_IN_EPNUM           (KEYBOARD_IN_EPNUM + 1)  #else  #   define MOUSE_IN_EPNUM           KEYBOARD_IN_EPNUM  #endif @@ -179,7 +179,7 @@ typedef struct  #ifdef EXTRAKEY_ENABLE  #   define EXTRAKEY_IN_EPNUM        (MOUSE_IN_EPNUM + 1)  #else -#   define EXTRAKEY_IN_EPNUM        MOUSE_IN_EPNUM  +#   define EXTRAKEY_IN_EPNUM        MOUSE_IN_EPNUM  #endif  #ifdef CONSOLE_ENABLE @@ -226,7 +226,7 @@ typedef struct  #define MOUSE_EPSIZE                8  #define EXTRAKEY_EPSIZE             8  #define CONSOLE_EPSIZE              32 -#define NKRO_EPSIZE                 16 +#define NKRO_EPSIZE                 32  #define MIDI_STREAM_EPSIZE          64  #define CDC_NOTIFICATION_EPSIZE     8  #define CDC_EPSIZE                  16  | 
