Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard

qmk · Oct 28, 2015 · e3050bb · e3050bb
2 parents 8643e01 + f024a46
commit e3050bb
Show file tree

Hide file tree

Showing 4 changed files with 1,423 additions and 1,419 deletions.
diff --git a/keyboard/ergodox_ez/config.h b/keyboard/ergodox_ez/config.h
@@ -53,6 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    2
 #define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // 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.)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE