]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Fix keymap for new actions
authortmk <nobody@nowhere>
Thu, 4 Apr 2013 18:44:42 +0000 (03:44 +0900)
committertmk <nobody@nowhere>
Thu, 4 Apr 2013 18:44:42 +0000 (03:44 +0900)
common/keymap.c
keyboard/hid_liber/keymap.c

index c98ce09b66f7efb3df3f9ea093a7a22efdbcc3d3..572d922c6293084595d9421484eccd3519d22cec 100644 (file)
@@ -108,9 +108,9 @@ action_t keymap_fn_to_action(uint8_t keycode)
                 uint8_t layer = keymap_fn_layer(FN_INDEX(keycode));
                 uint8_t key = keymap_fn_keycode(FN_INDEX(keycode));
                 if (key) {
-                    action.code = ACTION_KEYMAP_TAP_KEY(layer, key);
+                    action.code = ACTION_LAYER_TAP_KEY(layer, key);
                 } else {
-                    action.code = ACTION_KEYMAP_MOMENTARY(layer);
+                    action.code = ACTION_LAYER_MOMENTARY(layer);
                 }
             }
             return action;
index 609edb5e1b9ba5f01ca580b87beafda66603e1fe..28f59aab6b3ce343dad704904fabae81af1b0013 100644 (file)
@@ -163,15 +163,15 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Fn action definition
  */
 static const uint16_t PROGMEM fn_actions[] = { 
-    [0] = ACTION_DEFAULT_LAYER_SET(0),
-    [1] = ACTION_DEFAULT_LAYER_SET(1),
-    [2] = ACTION_DEFAULT_LAYER_SET(2),
-    [3] = ACTION_DEFAULT_LAYER_SET(3),
-    [4] = ACTION_DEFAULT_LAYER_SET(4),
-    [5] = ACTION_DEFAULT_LAYER_SET(5),
-    [6] = ACTION_DEFAULT_LAYER_SET(6),
-    [7] = ACTION_DEFAULT_LAYER_SET(7),
-    [8] = ACTION_DEFAULT_LAYER_SET(8),
+    [0] = ACTION_LAYER_MOMENTARY(0),
+    [1] = ACTION_LAYER_MOMENTARY(1),
+    [2] = ACTION_LAYER_MOMENTARY(2),
+    [3] = ACTION_LAYER_MOMENTARY(3),
+    [4] = ACTION_LAYER_MOMENTARY(4),
+    [5] = ACTION_LAYER_MOMENTARY(5),
+    [6] = ACTION_LAYER_MOMENTARY(6),
+    [7] = ACTION_LAYER_MOMENTARY(7),
+    [8] = ACTION_LAYER_MOMENTARY(8),
 };
 #endif