summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-04-05 03:44:42 +0900
committertmk <nobody@nowhere>2013-04-05 03:44:42 +0900
commitc26a5eb2ac64892f2102e66477fa7f794e9dfe3f (patch)
tree7d3f07d037499e2b68bea5a2546ac0a7b355a042
parenta8c465215fce3dad502da868ca49eb446deadc4e (diff)
Fix keymap for new actions
-rw-r--r--common/keymap.c4
-rw-r--r--keyboard/hid_liber/keymap.c18
2 files changed, 11 insertions, 11 deletions
diff --git a/common/keymap.c b/common/keymap.c
index c98ce09b66..572d922c62 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -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;
diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c
index 609edb5e1b..28f59aab6b 100644
--- a/keyboard/hid_liber/keymap.c
+++ b/keyboard/hid_liber/keymap.c
@@ -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