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

This commit is contained in:
QMK Bot 2021-04-03 05:06:28 +00:00
commit 655927ab15

View file

@ -138,10 +138,14 @@ void eeconfig_init_user(void) {
__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } __attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (process_record_keymap(keycode, record)) { if (!process_record_keymap(keycode, record)) {
return false; return false;
} }
if (!record->event.pressed) {
return true;
}
bool ls = (get_mods() | get_weak_mods()) & MOD_BIT(KC_LSFT); bool ls = (get_mods() | get_weak_mods()) & MOD_BIT(KC_LSFT);
bool rs = (get_mods() | get_weak_mods()) & MOD_BIT(KC_RSFT); bool rs = (get_mods() | get_weak_mods()) & MOD_BIT(KC_RSFT);
bool as = ls || rs; bool as = ls || rs;