diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
| commit | ee3c7892ad585e2e702d8975420d25ae052d97bb (patch) | |
| tree | 71c23600099fe5670482f8900d787dbc7c9551b2 /keyboard/ergodox_ez/keymaps/erez_experimental | |
| parent | 2d314810086684883329af730d8f5e8ecd0506b0 (diff) | |
| parent | 1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/erez_experimental')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/erez_experimental/config.h | 3 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c | 4 |
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 314c2ec32b..e5d7fe1885 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 93d1c84bc5..04ad2a8167 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; |