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

Bigger combo index (#9318)

Browse Source 
* Add change log

* Change combo index from uint8_t to uint16_t
This commit is contained in:
Pete Sevander
2020-07-16 15:39:01 +03:00
committed by Drashna Jael're
parent 2d37b79534
commit 3f900fc967
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/process_keycode/process_combo.c
View File

@@ -24,10 +24,10 @@ extern combo_t key_combos[];
extern int COMBO_LEN; extern int COMBO_LEN;
#endif #endif
__attribute__((weak)) void process_combo_event(uint8_t combo_index, bool pressed) {} __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
static uint16_t timer = 0; static uint16_t timer = 0;
static uint8_t current_combo_index = 0; static uint16_t current_combo_index = 0;
static bool drop_buffer = false; static bool drop_buffer = false;
static bool is_active = false; static bool is_active = false;
static bool b_combo_enable = true; // defaults to enabled static bool b_combo_enable = true; // defaults to enabled
@@ -83,7 +83,7 @@ static inline void dump_key_buffer(bool emit) {
static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) { static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) {
uint8_t count = 0; uint8_t count = 0;
uint8_t index = -1; uint16_t index = -1;
/* Find index of keycode and number of combo keys */ /* Find index of keycode and number of combo keys */
for (const uint16_t *keys = combo->keys;; ++count) { for (const uint16_t *keys = combo->keys;; ++count) {
uint16_t key = pgm_read_word(&keys[count]); uint16_t key = pgm_read_word(&keys[count]);

2
quantum/process_keycode/process_combo.h
View File

@@ -56,7 +56,7 @@ typedef struct {
bool process_combo(uint16_t keycode, keyrecord_t *record); bool process_combo(uint16_t keycode, keyrecord_t *record);
void matrix_scan_combo(void); void matrix_scan_combo(void);
void process_combo_event(uint8_t combo_index, bool pressed); void process_combo_event(uint16_t combo_index, bool pressed);
void combo_enable(void); void combo_enable(void);
void combo_disable(void); void combo_disable(void);