diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-02 23:29:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 23:29:12 +0200 |
| commit | 3e41cde9f99778ca30c03b97470c32780379db43 (patch) | |
| tree | 18e2376acae06563166b5ea8b8cd6368cb9cddae /tmk_core/common | |
| parent | e7347ff0de93ff823462b3ff2b4136b44dc576c0 (diff) | |
| parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
Merge pull request #19 from qmk/master
Merge from qmk
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/action_tapping.c | 9 | ||||
| -rw-r--r-- | tmk_core/common/eeconfig.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index ff78d7f2ab..bd9a69ae0a 100644 --- a/tmk_core/common/action_tapping.c +++ b/tmk_core/common/action_tapping.c @@ -228,6 +228,7 @@ bool process_tapping(keyrecord_t *keyp) if (WITHIN_TAPPING_TERM(event)) { if (event.pressed) { if (IS_TAPPING_KEY(event.key)) { +#ifndef TAPPING_FORCE_HOLD if (!tapping_key.tap.interrupted && tapping_key.tap.count > 0) { // sequential tap. keyp->tap = tapping_key.tap; @@ -237,11 +238,11 @@ bool process_tapping(keyrecord_t *keyp) tapping_key = *keyp; debug_tapping_key(); return true; - } else { - // FIX: start new tap again - tapping_key = *keyp; - return true; } +#endif + // FIX: start new tap again + tapping_key = *keyp; + return true; } else if (is_tap_key(event.key)) { // Sequential tap can be interfered with other tap key. debug("Tapping: Start with interfering other tap.\n"); diff --git a/tmk_core/common/eeconfig.h b/tmk_core/common/eeconfig.h index d8caa346f9..280dc7ab67 100644 --- a/tmk_core/common/eeconfig.h +++ b/tmk_core/common/eeconfig.h @@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EECONFIG_BACKLIGHT (uint8_t *)6 #define EECONFIG_AUDIO (uint8_t *)7 #define EECONFIG_RGBLIGHT (uint32_t *)8 +#define EECONFIG_UNICODEMODE (uint8_t *)12 /* debug bit */ |