diff options
author | QMK Bot <hello@qmk.fm> | 2021-01-05 00:37:55 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-01-05 00:37:55 +0000 |
commit | d0aa9ff972e7e438d1a5fa2baa4b35db91c8a070 (patch) | |
tree | 9da864d1811a6fc892a346cd3fe8b900f816709c /keyboards | |
parent | fd7ab5a22bd5ba85dde3a5da54856784bfb19120 (diff) | |
parent | 810eafad121bda333c53490e2d8a29f3a83d9c19 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/handwired/tennie/keymaps/default/config.h | 1 | ||||
-rw-r--r-- | keyboards/handwired/tennie/keymaps/default/keymap.c | 3 | ||||
-rw-r--r-- | keyboards/marksard/leftover30/keymaps/default/keymap.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/keyboards/handwired/tennie/keymaps/default/config.h b/keyboards/handwired/tennie/keymaps/default/config.h index 4496c59100..b8f7e42789 100644 --- a/keyboards/handwired/tennie/keymaps/default/config.h +++ b/keyboards/handwired/tennie/keymaps/default/config.h @@ -17,3 +17,4 @@ #pragma once // place overrides here +#define TAPPING_TOGGLE 2 diff --git a/keyboards/handwired/tennie/keymaps/default/keymap.c b/keyboards/handwired/tennie/keymaps/default/keymap.c index 3736841cbb..b65abb89e0 100644 --- a/keyboards/handwired/tennie/keymaps/default/keymap.c +++ b/keyboards/handwired/tennie/keymaps/default/keymap.c @@ -15,9 +15,6 @@ */ #include QMK_KEYBOARD_H -#define TAPPING_TOGGLE 2 - - // Layer names #define base 0 #define shrek 1 diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c index 60751cd1ca..b8d9973330 100644 --- a/keyboards/marksard/leftover30/keymaps/default/keymap.c +++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -uint16_t get_tapping_term(uint16_t keycode) { +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case KC_SPRA: return TAPPING_LAYER_TERM; |