jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11 from ErgoDox-EZ/fix/combo_logic

Browse Source 
Fixes logic for Combo Feature
This commit is contained in:
Florian Didron
2019-04-18 09:58:13 +09:00
committed by GitHub
parent 54a7f66aee 12c0611189
commit 362eaec0a3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.md
+3 -2
View File
@@ -1,3 +1,4 @@
04-12-2019 - Add AltGr/RALT support to Send String #4046 04-12-2019 - Add AltGr/RALT support to Send String (qmk#4046)
04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091) 04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091)
04-12-2019 - Enhancement for Eager debouncing (and Ergodox EZ host sleep fix) (qmk#5621) 04-12-2019 - Enhancement for Eager debouncing (and Ergodox EZ host sleep fix) (qmk#5621)
04-16-2019 - Fix logic for Combo feature (qmk#5610)
quantum/process_keycode/process_combo.c
+2 -2
View File
@@ -126,13 +126,13 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode,
bool process_combo(uint16_t keycode, keyrecord_t *record) { bool process_combo(uint16_t keycode, keyrecord_t *record) {
bool is_combo_key = false; bool is_combo_key = false;
drop_buffer = false; drop_buffer = false;
bool no_combo_keys_pressed = false; bool no_combo_keys_pressed = true;
for (current_combo_index = 0; current_combo_index < COMBO_COUNT; for (current_combo_index = 0; current_combo_index < COMBO_COUNT;
++current_combo_index) { ++current_combo_index) {
combo_t *combo = &key_combos[current_combo_index]; combo_t *combo = &key_combos[current_combo_index];
is_combo_key |= process_single_combo(combo, keycode, record); is_combo_key |= process_single_combo(combo, keycode, record);
no_combo_keys_pressed |= NO_COMBO_KEYS_ARE_DOWN; no_combo_keys_pressed = no_combo_keys_pressed && NO_COMBO_KEYS_ARE_DOWN;
} }
if (drop_buffer) { if (drop_buffer) {