X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeymap.c;h=bfb8ffac1a593b1cd06a6364db4ce3c2f151df31;hb=cb33e78126c6a9154c747ebfb1a635716b9183e5;hp=8e2b8607c8339d78e8a3c37af580bcc710197b16;hpb=4e93b3fa67d3b8170de2f05322738e08ac17948e;p=max%2Ftmk_keyboard.git

diff --git a/common/keymap.c b/common/keymap.c
index 8e2b8607..bfb8ffac 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -36,10 +36,11 @@ action_t action_for_key(uint8_t layer, key_t key)
             return keymap_fn_to_action(keycode);
 #ifdef BOOTMAGIC_ENABLE
         case KC_CAPSLOCK:
+        case KC_LOCKING_CAPS:
             if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) {
                 return keycode_to_action(KC_LCTL);
             }
-            return keycode_to_action(KC_CAPS);
+            return keycode_to_action(keycode);
         case KC_LCTL:
             if (keymap_config.swap_control_capslock) {
                 return keycode_to_action(KC_CAPSLOCK);
@@ -106,7 +107,7 @@ action_t action_for_key(uint8_t layer, key_t key)
 
 /* Macro */
 __attribute__ ((weak))
-const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
     return MACRO_NONE;
 }