diff options
author | Damien <Dbroqua@users.noreply.github.com> | 2017-05-26 15:57:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 15:57:08 +0200 |
commit | 0a4a966c6648e66a1129ae3af36639054d3e0ed3 (patch) | |
tree | ec50b19b9031b1f3f24e003879f95cf9690d61af /keyboards/clueboard/keymaps/mac_optimized | |
parent | 7180e195e84aabf252fcadb2852644417ac1d663 (diff) | |
parent | 7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff) |
Merge pull request #22 from qmk/master
Merge from QMK
Diffstat (limited to 'keyboards/clueboard/keymaps/mac_optimized')
-rw-r--r-- | keyboards/clueboard/keymaps/mac_optimized/keymap.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/keyboards/clueboard/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/keymaps/mac_optimized/keymap.c index 7ea02d27e8..e72733092f 100644 --- a/keyboards/clueboard/keymaps/mac_optimized/keymap.c +++ b/keyboards/clueboard/keymaps/mac_optimized/keymap.c @@ -50,35 +50,28 @@ const uint16_t PROGMEM fn_actions[] = { void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { static uint8_t mods_pressed; - static bool mod_flag; switch (id) { case 0: /* Handle the combined Grave/Esc key */ - mods_pressed = get_mods()&GRAVE_MODS; // Check to see what mods are pressed - if (record->event.pressed) { /* The key is being pressed. */ + mods_pressed = get_mods()&GRAVE_MODS; // Check to see what mods are pressed if (mods_pressed) { - mod_flag = true; - add_key(KC_GRV); - send_keyboard_report(); + register_code(KC_GRV); } else { - add_key(KC_ESC); - send_keyboard_report(); + register_code(KC_ESC); } } else { /* The key is being released. */ - if (mod_flag) { - mod_flag = false; - del_key(KC_GRV); - send_keyboard_report(); + if (mods_pressed) { + mods_pressed = false; + unregister_code(KC_GRV); } else { - del_key(KC_ESC); - send_keyboard_report(); + unregister_code(KC_ESC); } } break; |