summaryrefslogtreecommitdiff
path: root/quantum/process_keycode/process_combo.c
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/process_keycode/process_combo.c')
-rw-r--r--quantum/process_keycode/process_combo.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index c99a66a74b..3fdb732c41 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -225,7 +225,7 @@ static inline void dump_key_buffer(void) {
225 key_buffer_next = key_buffer_i + 1; 225 key_buffer_next = key_buffer_i + 1;
226 226
227 queued_record_t *qrecord = &key_buffer[key_buffer_i]; 227 queued_record_t *qrecord = &key_buffer[key_buffer_i];
228 keyrecord_t * record = &qrecord->record; 228 keyrecord_t *record = &qrecord->record;
229 229
230 if (IS_NOEVENT(record->event)) { 230 if (IS_NOEVENT(record->event)) {
231 continue; 231 continue;
@@ -318,14 +318,14 @@ void apply_combo(uint16_t combo_index, combo_t *combo) {
318#if defined(EXTRA_EXTRA_LONG_COMBOS) 318#if defined(EXTRA_EXTRA_LONG_COMBOS)
319 uint32_t state = 0; 319 uint32_t state = 0;
320#elif defined(EXTRA_LONG_COMBOS) 320#elif defined(EXTRA_LONG_COMBOS)
321 uint16_t state = 0; 321 uint16_t state = 0;
322#else 322#else
323 uint8_t state = 0; 323 uint8_t state = 0;
324#endif 324#endif
325 325
326 for (uint8_t key_buffer_i = 0; key_buffer_i < key_buffer_size; key_buffer_i++) { 326 for (uint8_t key_buffer_i = 0; key_buffer_i < key_buffer_size; key_buffer_i++) {
327 queued_record_t *qrecord = &key_buffer[key_buffer_i]; 327 queued_record_t *qrecord = &key_buffer[key_buffer_i];
328 keyrecord_t * record = &qrecord->record; 328 keyrecord_t *record = &qrecord->record;
329 uint16_t keycode = qrecord->keycode; 329 uint16_t keycode = qrecord->keycode;
330 330
331 uint8_t key_count = 0; 331 uint8_t key_count = 0;
@@ -361,7 +361,7 @@ static inline void apply_combos(void) {
361 // Apply all buffered normal combos. 361 // Apply all buffered normal combos.
362 for (uint8_t i = combo_buffer_read; i != combo_buffer_write; INCREMENT_MOD(i)) { 362 for (uint8_t i = combo_buffer_read; i != combo_buffer_write; INCREMENT_MOD(i)) {
363 queued_combo_t *buffered_combo = &combo_buffer[i]; 363 queued_combo_t *buffered_combo = &combo_buffer[i];
364 combo_t * combo = combo_get(buffered_combo->combo_index); 364 combo_t *combo = combo_get(buffered_combo->combo_index);
365 365
366#ifdef COMBO_MUST_TAP_PER_COMBO 366#ifdef COMBO_MUST_TAP_PER_COMBO
367 if (get_combo_must_tap(buffered_combo->combo_index, combo)) { 367 if (get_combo_must_tap(buffered_combo->combo_index, combo)) {
@@ -466,7 +466,7 @@ static combo_key_action_t process_single_combo(combo_t *combo, uint16_t keycode,
466 combo_t *drop = NULL; 466 combo_t *drop = NULL;
467 for (uint8_t combo_buffer_i = combo_buffer_read; combo_buffer_i != combo_buffer_write; INCREMENT_MOD(combo_buffer_i)) { 467 for (uint8_t combo_buffer_i = combo_buffer_read; combo_buffer_i != combo_buffer_write; INCREMENT_MOD(combo_buffer_i)) {
468 queued_combo_t *qcombo = &combo_buffer[combo_buffer_i]; 468 queued_combo_t *qcombo = &combo_buffer[combo_buffer_i];
469 combo_t * buffered_combo = combo_get(qcombo->combo_index); 469 combo_t *buffered_combo = combo_get(qcombo->combo_index);
470 470
471 if ((drop = overlaps(buffered_combo, combo))) { 471 if ((drop = overlaps(buffered_combo, combo))) {
472 DISABLE_COMBO(drop); 472 DISABLE_COMBO(drop);
@@ -574,8 +574,8 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
574 /* Only check keycodes from one layer. */ 574 /* Only check keycodes from one layer. */
575 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); 575 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
576#else 576#else
577 uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state); 577 uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state);
578 uint8_t ref_layer = combo_ref_from_layer(highest_layer); 578 uint8_t ref_layer = combo_ref_from_layer(highest_layer);
579 if (ref_layer != highest_layer) { 579 if (ref_layer != highest_layer) {
580 keycode = keymap_key_to_keycode(ref_layer, record->event.key); 580 keycode = keymap_key_to_keycode(ref_layer, record->event.key);
581 } 581 }