aboutsummaryrefslogtreecommitdiff
path: root/common/keymap.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-09-21 21:21:34 +0900
committertmk <nobody@nowhere>2013-09-21 21:21:34 +0900
commitb2c7529ec9dce2d1f32f0c3e228059092f5f2238 (patch)
tree09bd4f2647c174423f489ff8b4ddca8aca025159 /common/keymap.c
parent58ca7b904b4410416f6b7edf1051ec58f6cdb6c4 (diff)
downloadqmk_firmware-b2c7529ec9dce2d1f32f0c3e228059092f5f2238.tar.gz
qmk_firmware-b2c7529ec9dce2d1f32f0c3e228059092f5f2238.zip
Fix to bootmagic key configurable
Diffstat (limited to 'common/keymap.c')
-rw-r--r--common/keymap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/keymap.c b/common/keymap.c
index cf4711bf6..bfb8ffac1 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -36,10 +36,11 @@ action_t action_for_key(uint8_t layer, key_t key)
36 return keymap_fn_to_action(keycode); 36 return keymap_fn_to_action(keycode);
37#ifdef BOOTMAGIC_ENABLE 37#ifdef BOOTMAGIC_ENABLE
38 case KC_CAPSLOCK: 38 case KC_CAPSLOCK:
39 case KC_LOCKING_CAPS:
39 if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) { 40 if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) {
40 return keycode_to_action(KC_LCTL); 41 return keycode_to_action(KC_LCTL);
41 } 42 }
42 return keycode_to_action(KC_CAPS); 43 return keycode_to_action(keycode);
43 case KC_LCTL: 44 case KC_LCTL:
44 if (keymap_config.swap_control_capslock) { 45 if (keymap_config.swap_control_capslock) {
45 return keycode_to_action(KC_CAPSLOCK); 46 return keycode_to_action(KC_CAPSLOCK);