aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Erlandson <austin.erlandson@metova.com>2016-09-15 10:58:28 -0500
committerAustin Erlandson <austin.erlandson@metova.com>2016-09-15 10:58:28 -0500
commite50f15e36019fa39798bbe4e001fe7d2c94c88e7 (patch)
tree1e6688d68cc90ec66adcb7b09f6c44e46a53693f
parentc8e7cca6eddf7c352ec6579adf1177871e106bca (diff)
downloadqmk_firmware-e50f15e36019fa39798bbe4e001fe7d2c94c88e7.tar.gz
qmk_firmware-e50f15e36019fa39798bbe4e001fe7d2c94c88e7.zip
Add IGNORE_MOD_TAP_INTERRUPT to fix overloaded mod keys sending mod on diads...
-rw-r--r--keyboards/atreus/keymaps/erlandsona/config.h11
-rw-r--r--keyboards/atreus/keymaps/erlandsona/keymap.c16
2 files changed, 15 insertions, 12 deletions
diff --git a/keyboards/atreus/keymaps/erlandsona/config.h b/keyboards/atreus/keymaps/erlandsona/config.h
index 6f0d258f5..bf09bf23a 100644
--- a/keyboards/atreus/keymaps/erlandsona/config.h
+++ b/keyboards/atreus/keymaps/erlandsona/config.h
@@ -21,13 +21,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21#include "config_common.h" 21#include "config_common.h"
22 22
23 23
24
25
26/* Make Overloaded Keys switch faster */ 24/* Make Overloaded Keys switch faster */
27#define TAPPING_TERM 175 25#define TAPPING_TERM 175
28 26
29 27/* this makes it possible to do rolling combos (zx)
30 28 * with keys that convert to other keys on hold
29 * (z becomes ctrl when you hold it,
30 * and when this option isn't enabled,
31 * z rapidly followed by x actually sends Ctrl-x. That's bad.)
32 */
33#define IGNORE_MOD_TAP_INTERRUPT
31 34
32/* USB Device descriptor parameter */ 35/* USB Device descriptor parameter */
33 36
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index 9e11ac048..7807eb224 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -18,16 +18,16 @@
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20[BASE] = KEYMAP( /* Qwerty */ 20[BASE] = KEYMAP( /* Qwerty */
21 KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , 21 KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,
22 KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN , 22 ALT_T(KC_A), KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN ,
23 SFT_T(KC_Z), KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , SFT_T(KC_QUOT), 23 SFT_T(KC_Z), KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , SFT_T(KC_QUOT),
24 KC_LCTL , KC_LALT, KC_LALT, KC_LGUI, KC_BSPC, ALT_T(KC_ESC), CTL_T(KC_ENT), KC_SPC, F(NUMS), KC_RALT, KC_SLSH, KC_BSLS ), 24 KC_LCTL , KC_LALT, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, F(NUMS), KC_RALT, KC_SLSH, KC_BSLS ),
25 25
26[NUMS] = KEYMAP( /* Numbers / Arrows / Symbols */ 26[NUMS] = KEYMAP( /* Numbers / Arrows / Symbols */
27 KC_GRV , KC_7 , KC_8 , KC_9 , KC_0 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC, 27 KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC,
28 KC_TAB , KC_4 , KC_5 , KC_6 , KC_DLR, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC, 28 ALT_T(KC_TAB), KC_5 , KC_6 , KC_7 , KC_8 , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC,
29 _______, KC_1 , KC_2 , KC_3 , KC_DOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, 29 _______ , KC_9 , KC_0 , KC_DOT , KC_COMM, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
30 _______, _______, _______, _______, KC_DEL, F(MOUS), _______, _______, _______, _______, _______, _______), 30 _______ , _______, _______, _______, KC_DEL , F(MOUS), _______, _______, _______, _______, _______, _______),
31 31
32[MOUS] = KEYMAP( /* Mouse and Media Keys */ 32[MOUS] = KEYMAP( /* Mouse and Media Keys */
33 KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4, 33 KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4,