rekahsoft
/
qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix process_combo which assign -1 to uint16_t (#3697)

This commit is contained in:
Drashna Jaelre 2019-01-25 12:11:38 -08:00 committed by GitHub
parent b416113616 1950a145c7
commit 3542e573c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
quantum/process_keycode/process_combo.c
View File

@ -18,9 +18,6 @@
#include "print.h" #include "print.h"
#define COMBO_TIMER_ELAPSED -1
__attribute__ ((weak)) __attribute__ ((weak))
combo_t key_combos[COMBO_COUNT] = { combo_t key_combos[COMBO_COUNT] = {
@ -65,7 +62,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
if (-1 == (int8_t)index) return false; if (-1 == (int8_t)index) return false;
/* The combos timer is used to signal whether the combo is active */ /* The combos timer is used to signal whether the combo is active */
bool is_combo_active = COMBO_TIMER_ELAPSED == combo->timer ? false : true; bool is_combo_active = combo->is_active;
if (record->event.pressed) { if (record->event.pressed) {
KEY_STATE_DOWN(index); KEY_STATE_DOWN(index);
@ -73,9 +70,10 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
if (is_combo_active) { if (is_combo_active) {
if (ALL_COMBO_KEYS_ARE_DOWN) { /* Combo was pressed */ if (ALL_COMBO_KEYS_ARE_DOWN) { /* Combo was pressed */
send_combo(combo->keycode, true); send_combo(combo->keycode, true);
combo->timer = COMBO_TIMER_ELAPSED; combo->is_active = false;
} else { /* Combo key was pressed */ } else { /* Combo key was pressed */
combo->timer = timer_read(); combo->timer = timer_read();
combo->is_active = true;
#ifdef COMBO_ALLOW_ACTION_KEYS #ifdef COMBO_ALLOW_ACTION_KEYS
combo->prev_record = *record; combo->prev_record = *record;
#else #else
@ -99,6 +97,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
send_keyboard_report(); send_keyboard_report();
unregister_code16(keycode); unregister_code16(keycode);
#endif #endif
combo->is_active = false;
combo->timer = 0; combo->timer = 0;
} }
@ -106,6 +105,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
} }
if (NO_COMBO_KEYS_ARE_DOWN) { if (NO_COMBO_KEYS_ARE_DOWN) {
combo->is_active = true;
combo->timer = 0; combo->timer = 0;
} }
@ -132,14 +132,14 @@ void matrix_scan_combo(void)
#pragma GCC diagnostic ignored "-Warray-bounds" #pragma GCC diagnostic ignored "-Warray-bounds"
combo_t *combo = &key_combos[i]; combo_t *combo = &key_combos[i];
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
if (combo->timer && if (combo->is_active &&
combo->timer != COMBO_TIMER_ELAPSED && combo->timer &&
timer_elapsed(combo->timer) > COMBO_TERM) { timer_elapsed(combo->timer) > COMBO_TERM) {
/* This disables the combo, meaning key events for this /* This disables the combo, meaning key events for this
* combo will be handled by the next processors in the chain * combo will be handled by the next processors in the chain
*/ */
combo->timer = COMBO_TIMER_ELAPSED; combo->is_active = false;
#ifdef COMBO_ALLOW_ACTION_KEYS #ifdef COMBO_ALLOW_ACTION_KEYS
process_action(&combo->prev_record, process_action(&combo->prev_record,

1
quantum/process_keycode/process_combo.h
View File

@ -33,6 +33,7 @@ typedef struct
uint8_t state; uint8_t state;
#endif #endif
uint16_t timer; uint16_t timer;
bool is_active;
#ifdef COMBO_ALLOW_ACTION_KEYS #ifdef COMBO_ALLOW_ACTION_KEYS
keyrecord_t prev_record; keyrecord_t prev_record;
#else #else