Merge remote-tracking branch 'qmk/master' into merge-2023-06-03

This commit is contained in:
Ilya Zhuravlev
2023-06-03 12:35:25 -06:00
14389 changed files with 536595 additions and 476101 deletions

View File

@@ -120,6 +120,14 @@ __attribute__((weak)) void tap_code16(uint16_t code) {
tap_code16_delay(code, code == KC_CAPS_LOCK ? QS_tap_hold_caps_delay : QS_tap_code_delay);
}
__attribute__((weak)) bool pre_process_record_kb(uint16_t keycode, keyrecord_t *record) {
return pre_process_record_user(keycode, record);
}
__attribute__((weak)) bool pre_process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
__attribute__((weak)) bool process_action_kb(keyrecord_t *record) {
return true;
}
@@ -174,7 +182,7 @@ void soft_reset_keyboard(void) {
/* Convert record into usable keycode via the contained event. */
uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) {
#ifdef COMBO_ENABLE
#if defined(COMBO_ENABLE) || defined(REPEAT_KEY_ENABLE)
if (record->keycode) {
return record->keycode;
}
@@ -208,14 +216,12 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) {
/* Get keycode, and then process pre tapping functionality */
bool pre_process_record_quantum(keyrecord_t *record) {
if (!(
uint16_t keycode = get_record_keycode(record, true);
return pre_process_record_kb(keycode, record) &&
#ifdef COMBO_ENABLE
process_combo(get_record_keycode(record, true), record) &&
process_combo(keycode, record) &&
#endif
true)) {
return false;
}
return true; // continue processing
true;
}
/* Get keycode, and then call keyboard function */
@@ -275,6 +281,9 @@ bool process_record_quantum_helper(uint16_t keycode, keyrecord_t *record) {
// Must run asap to ensure all keypresses are recorded.
process_dynamic_macro(keycode, record) &&
#endif
#ifdef REPEAT_KEY_ENABLE
process_last_key(keycode, record) && process_repeat_key(keycode, record) &&
#endif
#if defined(AUDIO_ENABLE) && defined(AUDIO_CLICKY)
process_clicky(keycode, record) &&
#endif