aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-05 15:41:21 +0900
committertmk <nobody@nowhere>2013-03-05 15:41:21 +0900
commit5808317b694004c43a6e0f76e9715415cce19a25 (patch)
tree9814dbe96eecbb940a710505feb82125a483dc2d /common
parent633d9aa53e3fc2b9fa9f01475cba9c151ab31d9a (diff)
downloadqmk_firmware-5808317b694004c43a6e0f76e9715415cce19a25.tar.gz
qmk_firmware-5808317b694004c43a6e0f76e9715415cce19a25.zip
Fix keymap for new framework
Diffstat (limited to 'common')
-rw-r--r--common/keymap.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/common/keymap.c b/common/keymap.c
index f72be5779..aa8d944a7 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -38,12 +38,6 @@ action_t action_for_key(uint8_t layer, key_t key)
38 return keycode_to_action(keycode); 38 return keycode_to_action(keycode);
39 } 39 }
40} 40}
41
42__attribute__ ((weak))
43const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
44
45__attribute__ ((weak))
46void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
47#else 41#else
48/* 42/*
49 * legacy keymap support 43 * legacy keymap support
@@ -71,13 +65,17 @@ action_t action_for_key(uint8_t layer, key_t key)
71 return keycode_to_action(keycode); 65 return keycode_to_action(keycode);
72 } 66 }
73} 67}
74/* not used for legacy keymap */
75void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
76{
77}
78#endif 68#endif
79 69
80 70
71__attribute__ ((weak))
72const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
73
74__attribute__ ((weak))
75void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
76
77
78
81 79
82/* translates keycode to action */ 80/* translates keycode to action */
83static action_t keycode_to_action(uint8_t keycode) 81static action_t keycode_to_action(uint8_t keycode)