diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
| commit | 660511f05007b7299a8ceceba02d92ab33574ce1 (patch) | |
| tree | a36d0f69f87f0045f5a3c015ddd632cba3c0e37c /keyboard/ergodox_ez | |
| parent | 507db3ab13b7d058e683a6729f81ee214c1a4f17 (diff) | |
| parent | 31a697bc054c97c5ef168c5fd4633bb247cc5d7b (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c index d019b731f2..a9980593fb 100644 --- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -139,6 +139,8 @@ const uint16_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) }; +// action_get_macro() is unused — remove the “#if 0” and “#endif” lines to reenable +#if 0 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function @@ -153,6 +155,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } return MACRO_NONE; }; +#endif // Runs just one time when the keyboard initializes. void matrix_init_user(void) { |