Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-02-17 06:29:48 +00:00
commit fad659650b

View File

@ -315,7 +315,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
register_code(r_inner); register_code(r_inner);
r_long_pressed = true; r_long_pressed = true;
} }
set_single_persistent_default_layer(_PSEUDO); // set_single_persistent_default_layer(_PSEUDO);
} }
return false; return false;
case TENKEY: case TENKEY:
@ -433,7 +433,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
uint16_t get_tapping_term(uint16_t keycode) { uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case LT_SPFN: case LT_SPFN:
return SPFN_TAPPING_TERM; return SPFN_TAPPING_TERM;