summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/erez_experimental
diff options
context:
space:
mode:
authorJack Humbert2016-06-21 17:42:29 -0400
committerGitHub2016-06-21 17:42:29 -0400
commit1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (patch)
treeca8a2a62e744a3448cfc247caab029152e2ebefb /keyboard/ergodox_ez/keymaps/erez_experimental
parent758a8c64e9ffb12cda4c78d8d1ee6a3f448901fc (diff)
Warning reductions (#430)
Warning reductions
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/erez_experimental')
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/config.h3
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config.h b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
index 314c2ec32..e5d7fe188 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
@@ -6,4 +6,7 @@
#define ONESHOT_TAP_TOGGLE 2
#define ONESHOT_TIMEOUT 300
+#undef LEADER_TIMEOUT
+#define LEADER_TIMEOUT 300
+
#endif
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
index 93d1c84bc..04ad2a816 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
@@ -7,8 +7,6 @@
#define SYMB 1 // symbols
#define MDIA 2 // media keys
-#define LEADER_TIMEOUT 300
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
@@ -144,8 +142,6 @@ const uint16_t PROGMEM fn_actions[] = {
[3] = ACTION_MACRO_TAP(1) // Eric Tang's Famous Macro!
};
-static uint16_t key_timer;
-
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
return MACRO_NONE;