aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keycode.h
diff options
context:
space:
mode:
authorGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-07-12 11:57:15 -0400
committerGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-07-12 11:57:15 -0400
commitf4fbfe6e544bb2beab05464a23ab848ae4c5578a (patch)
tree3adffe7bfb24ded332e3f8bd0366a2fd2f2db7e3 /tmk_core/common/keycode.h
parent477ed703c88822aea62152d62fb2310267edc48f (diff)
parenta998a48673372e409991066d7d2d9ba282f79d59 (diff)
downloadqmk_firmware-f4fbfe6e544bb2beab05464a23ab848ae4c5578a.tar.gz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keycode.h')
-rw-r--r--tmk_core/common/keycode.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index 448195306..2f208c54e 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,