Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Jack Humbert 2015-10-28 13:54:43 -04:00
commit e3050bba67
4 changed files with 7 additions and 3 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 */
#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

BIN
keyboard/ergodox_ez/ergodox_ez.hex
View file

Binary file not shown.

BIN
keyboard/ergodox_ez/reference_compiled_default_firmware.hex Normal file
View file

Binary file not shown.

9
tmk_core/common/action.c
View file

@ -142,12 +142,15 @@ void process_action(keyrecord_t *record)
default:
if (event.pressed) {
if (tap_count > 0) {
#ifndef IGNORE_MOD_TAP_INTERRUPT
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
record->tap.count = 0;
register_mods(mods);
} else {
} else
#endif
{
dprint("MODS_TAP: Tap: register_code\n");
register_code(action.key.code);
}
@ -397,7 +400,7 @@ void register_code(uint8_t code)
set_mods(tmp_mods);
send_keyboard_report();
oneshot_cancel();
} else
} else
*/
#endif
{