andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
Jack Humbert 2015-10-28 13:54:43 -04:00
parent 8643e01286 f024a462cd
commit e3050bba67
4 changed files with 1423 additions and 1419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keyboard/ergodox_ez/config.h
View File

@ -53,6 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if debouncing isn't needed */ /* Set 0 if debouncing isn't needed */
#define DEBOUNCE 2 #define DEBOUNCE 2
#define TAPPING_TERM 200 #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 */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

1416
keyboard/ergodox_ez/ergodox_ez.hex
View File

File diff suppressed because it is too large Load Diff

1416
keyboard/ergodox_ez/reference_compiled_default_firmware.hex 100644
View File

File diff suppressed because it is too large Load Diff

7
tmk_core/common/action.c
View File

@ -142,12 +142,15 @@ void process_action(keyrecord_t *record)
default: default:
if (event.pressed) { if (event.pressed) {
if (tap_count > 0) { if (tap_count > 0) {
#ifndef IGNORE_MOD_TAP_INTERRUPT
if (record->tap.interrupted) { if (record->tap.interrupted) {
dprint("MODS_TAP: Tap: Cancel: add_mods\n"); dprint("mods_tap: tap: cancel: add_mods\n");
// ad hoc: set 0 to cancel tap // ad hoc: set 0 to cancel tap
record->tap.count = 0; record->tap.count = 0;
register_mods(mods); register_mods(mods);
} else { } else
#endif
{
dprint("MODS_TAP: Tap: register_code\n"); dprint("MODS_TAP: Tap: register_code\n");
register_code(action.key.code); register_code(action.key.code);
} }