summaryrefslogtreecommitdiffstats
path: root/keyboards/atreus/keymaps
diff options
context:
space:
mode:
authorAustin Erlandson <austin.erlandson@metova.com>2016-09-15 18:19:54 +0200
committerAustin Erlandson <austin.erlandson@metova.com>2016-09-15 18:19:54 +0200
commitac6125cbea0ef2cfb9e8c79b89659128f60f0853 (patch)
treef782728a36cec2815cdf9198d784a38be2d39ee2 /keyboards/atreus/keymaps
parente50f15e36019fa39798bbe4e001fe7d2c94c88e7 (diff)
downloadqmk_firmware-ac6125cbea0ef2cfb9e8c79b89659128f60f0853.tar.gz
qmk_firmware-ac6125cbea0ef2cfb9e8c79b89659128f60f0853.tar.xz
Revert because the IGNORE_MOD_TAP_INTERRUPT flag didn't feel right.
Diffstat (limited to 'keyboards/atreus/keymaps')
-rw-r--r--keyboards/atreus/keymaps/erlandsona/config.h10
-rw-r--r--keyboards/atreus/keymaps/erlandsona/keymap.c10
2 files changed, 6 insertions, 14 deletions
diff --git a/keyboards/atreus/keymaps/erlandsona/config.h b/keyboards/atreus/keymaps/erlandsona/config.h
index bf09bf23a..d9eb1903e 100644
--- a/keyboards/atreus/keymaps/erlandsona/config.h
+++ b/keyboards/atreus/keymaps/erlandsona/config.h
@@ -22,15 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Make Overloaded Keys switch faster */
-#define TAPPING_TERM 175
-
-/* this makes it possible to do rolling combos (zx)
- * with keys that convert to other keys on hold
- * (z becomes ctrl when you hold it,
- * and when this option isn't enabled,
- * z rapidly followed by x actually sends Ctrl-x. That's bad.)
- */
-#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 150
/* USB Device descriptor parameter */
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index 7807eb224..32c8826e0 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -19,15 +19,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = KEYMAP( /* Qwerty */
KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,
- ALT_T(KC_A), KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN ,
+ KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN ,
SFT_T(KC_Z), KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , SFT_T(KC_QUOT),
KC_LCTL , KC_LALT, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, F(NUMS), KC_RALT, KC_SLSH, KC_BSLS ),
[NUMS] = KEYMAP( /* Numbers / Arrows / Symbols */
- KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC,
- ALT_T(KC_TAB), KC_5 , KC_6 , KC_7 , KC_8 , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC,
- _______ , KC_9 , KC_0 , KC_DOT , KC_COMM, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
- _______ , _______, _______, _______, KC_DEL , F(MOUS), _______, _______, _______, _______, _______, _______),
+ KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC,
+ KC_TAB , KC_5 , KC_6 , KC_7 , KC_8 , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC,
+ _______, KC_9 , KC_0 , KC_DOT , KC_COMM, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
+ _______, _______, _______, _______, KC_DEL , F(MOUS), _______, _______, _______, _______, _______, _______),
[MOUS] = KEYMAP( /* Mouse and Media Keys */
KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4,