aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjamesofarrell <jofarrell@gmail.com>2017-06-17 07:56:50 +1000
committerskullydazed <skullydazed@users.noreply.github.com>2017-06-16 14:56:50 -0700
commit98316ef0170c6e0f994a45e1f62959ae0f278177 (patch)
tree7e1981d5966d09e1bd8c53cdeef0edb37a9dd0c1
parentff2b01da49ccf2d57e61bb70cdbaacb40799299c (diff)
downloadqmk_firmware-98316ef0170c6e0f994a45e1f62959ae0f278177.tar.gz
qmk_firmware-98316ef0170c6e0f994a45e1f62959ae0f278177.zip
Added Grave Escape (#1391)
* added QK_GRAVE_ESC and KC_GESC * fixed name * Fixed keycode emnu * Removed layer check, added left and right GUI mod detection for OSX GUI+~
-rw-r--r--quantum/quantum.c8
-rw-r--r--quantum/quantum_keycodes.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 4f4cee4e9..f5fb1e35c 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -437,6 +437,14 @@ bool process_record_quantum(keyrecord_t *record) {
437 return false; 437 return false;
438 // break; 438 // break;
439 } 439 }
440 case GRAVE_ESC: {
441 void (*method)(uint8_t) = (record->event.pressed) ? &add_key : &del_key;
442 uint8_t shifted = get_mods() & ((MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)
443 |MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)));
444
445 method(shifted ? KC_GRAVE : KC_ESCAPE);
446 send_keyboard_report();
447 }
440 default: { 448 default: {
441 shift_interrupted[0] = true; 449 shift_interrupted[0] = true;
442 shift_interrupted[1] = true; 450 shift_interrupted[1] = true;
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7354ae0da..c34ecafa5 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -104,6 +104,7 @@ enum quantum_keycodes {
104 MAGIC_UNHOST_NKRO, 104 MAGIC_UNHOST_NKRO,
105 MAGIC_UNSWAP_ALT_GUI, 105 MAGIC_UNSWAP_ALT_GUI,
106 MAGIC_TOGGLE_NKRO, 106 MAGIC_TOGGLE_NKRO,
107 GRAVE_ESC,
107 108
108 // Leader key 109 // Leader key
109#ifndef DISABLE_LEADER 110#ifndef DISABLE_LEADER
@@ -514,6 +515,8 @@ enum quantum_keycodes {
514#define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8) 515#define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8)
515#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) 516#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
516 517
518#define KC_GESC GRAVE_ESC
519
517 520
518// L-ayer, T-ap - 256 keycode max, 16 layer max 521// L-ayer, T-ap - 256 keycode max, 16 layer max
519#define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) 522#define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8))