summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-05-03 22:27:39 -0400
committerErez Zukerman <bulk@ezuk.org>2016-05-03 22:27:39 -0400
commit31a697bc054c97c5ef168c5fd4633bb247cc5d7b (patch)
tree0d7e5698e762dd1ec32f17759d4a88a27207f224 /keyboard/ergodox_ez
parent83e1cc241e3aabd69f6cdcd2581477d4b85bb8d3 (diff)
parent6bafe444865e228ddcae2234549f1fd0931d89ad (diff)
downloadqmk_firmware-31a697bc054c97c5ef168c5fd4633bb247cc5d7b.tar.gz
qmk_firmware-31a697bc054c97c5ef168c5fd4633bb247cc5d7b.zip
Merge pull request #304 from adiabatic/ergodox-zweihander-osx
zweihander: comment out action_get_macro()
Diffstat (limited to 'keyboard/ergodox_ez')
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c3
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) {