ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into hid_joystick

Browse source
This commit is contained in:
a-chol 2020-03-30 14:41:56 +02:00 • committed by GitHub
commit a80ea8b7cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
284 changed files with 9404 additions and 2408 deletions
Download patch file Download diff file Expand all files Collapse all files

14
quantum/process_keycode/process_combo.c
View file

@ -17,9 +17,12 @@
#include "print.h"
#include "process_combo.h"
__attribute__((weak)) combo_t key_combos[COMBO_COUNT] = {
};
#ifndef COMBO_VARIABLE_LEN
__attribute__((weak)) combo_t key_combos[COMBO_COUNT] = {};
#else
extern combo_t key_combos[];
extern int COMBO_LEN;
#endif
__attribute__((weak)) void process_combo_event(uint8_t combo_index, bool pressed) {}
@ -141,8 +144,11 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
if (!is_combo_enabled()) {
return true;
}
#ifndef COMBO_VARIABLE_LEN
for (current_combo_index = 0; current_combo_index < COMBO_COUNT; ++current_combo_index) {
#else
for (current_combo_index = 0; current_combo_index < COMBO_LEN; ++current_combo_index) {
#endif
combo_t *combo = &key_combos[current_combo_index];
is_combo_key |= process_single_combo(combo, keycode, record);
no_combo_keys_pressed = no_combo_keys_pressed && NO_COMBO_KEYS_ARE_DOWN;