diff options
| author | Jack Humbert <[email protected]> | 2016-07-07 13:57:39 -0400 | 
|---|---|---|
| committer | GitHub <[email protected]> | 2016-07-07 13:57:39 -0400 | 
| commit | e8719e10c4395102f8e252c8377e2f19a18ee74d (patch) | |
| tree | d802534a5cd71b046543fe8eaf31c94e5155b7b8 /tmk_core/common/keycode.h | |
| parent | c1dfb636ef61159456bdb24f4fee3f27e5babbeb (diff) | |
| parent | a2eae81927ab0e817857d5b6ba2c7ce4a4b751b6 (diff) | |
| download | qmk_firmware-e8719e10c4395102f8e252c8377e2f19a18ee74d.tar.gz qmk_firmware-e8719e10c4395102f8e252c8377e2f19a18ee74d.zip | |
Merge pull request #491 from fredizzimo/keycode_fixes
Some fixes for keycode processing
Diffstat (limited to 'tmk_core/common/keycode.h')
| -rw-r--r-- | tmk_core/common/keycode.h | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h index 448195306f..2f208c54e0 100644 --- a/tmk_core/common/keycode.h +++ b/tmk_core/common/keycode.h @@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define IS_SPECIAL(code)         ((0xA5 <= (code) && (code) <= 0xDF) || (0xE8 <= (code) && (code) <= 0xFF))  #define IS_SYSTEM(code)          (KC_PWR       <= (code) && (code) <= KC_WAKE) -#define IS_CONSUMER(code)        (KC_MUTE      <= (code) && (code) <= KC_WFAV) +#define IS_CONSUMER(code)        (KC_MUTE      <= (code) && (code) <= KC_MRWD)  #define IS_FN(code)              (KC_FN0       <= (code) && (code) <= KC_FN31)  #define IS_MOUSEKEY(code)        (KC_MS_UP     <= (code) && (code) <= KC_MS_ACCEL2)  #define IS_MOUSEKEY_MOVE(code)   (KC_MS_UP     <= (code) && (code) <= KC_MS_RIGHT) @@ -156,8 +156,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define KC_WSTP KC_WWW_STOP  #define KC_WREF KC_WWW_REFRESH  #define KC_WFAV KC_WWW_FAVORITES -/* Jump to bootloader */ -#define KC_BTLD KC_BOOTLOADER  /* Transparent */  #define KC_TRANSPARENT  1  #define KC_TRNS KC_TRANSPARENT @@ -428,9 +426,6 @@ enum internal_special_keycodes {      KC_MEDIA_FAST_FORWARD,      KC_MEDIA_REWIND,    /* 0xBC */ -    /* Jump to bootloader */ -    KC_BOOTLOADER       = 0xBF, -      /* Fn key */      KC_FN0              = 0xC0,      KC_FN1, | 
