summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-02-17 06:29:48 +0000
committerQMK Bot <hello@qmk.fm>2021-02-17 06:29:48 +0000
commitfad659650b2045794f8e31d0c5252367e51c47b3 (patch)
tree2f685810386a14b15c419b1b9ccf7a6fc5c9b524 /keyboards
parentbe70f466fef0a5248bf0f6b8003d2f5e7b81eec8 (diff)
parentfe7240628ae524dae91e57529c157a700cf691be (diff)
downloadqmk_firmware-fad659650b2045794f8e31d0c5252367e51c47b3.tar.gz
qmk_firmware-fad659650b2045794f8e31d0c5252367e51c47b3.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/hhkb/ansi/keymaps/shela/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
index 9fbb469381..68f9aa6726 100644
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
@@ -315,7 +315,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
register_code(r_inner);
r_long_pressed = true;
}
- set_single_persistent_default_layer(_PSEUDO);
+ // set_single_persistent_default_layer(_PSEUDO);
}
return false;
case TENKEY:
@@ -433,7 +433,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-uint16_t get_tapping_term(uint16_t keycode) {
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case LT_SPFN:
return SPFN_TAPPING_TERM;