summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/ChangeLog/20200829/PR9318.md11
-rw-r--r--keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c2
-rw-r--r--keyboards/converter/usb_usb/keymaps/chriskopher/combo.c2
-rw-r--r--keyboards/converter/usb_usb/keymaps/narze/keymap.c2
-rw-r--r--keyboards/ergodox_infinity/keymaps/narze/keymap.c2
-rw-r--r--keyboards/gboards/g/keymap_combo.h2
-rw-r--r--keyboards/maxr1998/pulse4k/pulse4k.c2
-rw-r--r--keyboards/minidox/keymaps/rsthd_combos/keymap.c2
-rw-r--r--keyboards/planck/keymaps/narze/keymap.c2
-rw-r--r--keyboards/xd75/keymaps/4sstylz/keymap.c2
-rw-r--r--quantum/process_keycode/process_combo.c6
-rw-r--r--quantum/process_keycode/process_combo.h2
-rw-r--r--users/issmirnov/issmirnov.c2
-rw-r--r--users/kuchosauronad0/combo.c2
-rw-r--r--users/ninjonas/combos.c2
-rw-r--r--users/yet-another-developer/combo.c2
16 files changed, 28 insertions, 17 deletions
diff --git a/docs/ChangeLog/20200829/PR9318.md b/docs/ChangeLog/20200829/PR9318.md
new file mode 100644
index 0000000000..c238f6e449
--- /dev/null
+++ b/docs/ChangeLog/20200829/PR9318.md
@@ -0,0 +1,11 @@
+### Bigger integer type when looping over combos.
+
+[#9318](https://github.com/qmk/qmk_firmware/pull/9318)
+
+Changes `uint8_t` to `uint16_t` so it is possible have more than 256 combos.
+
+Any fork that uses `process_combo_event` needs to update the function's first argument to `uint16_t`.
+
+| Old function | New Function |
+|---------------------------------------------------------------|----------------------------------------------------------------|
+| `void process_combo_event(uint8_t combo_index, bool pressed)` | `void process_combo_event(uint16_t combo_index, bool pressed)` |
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
index 35b45e9ccf..30e6af7f6e 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
+++ b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
@@ -36,7 +36,7 @@ combo_t key_combos[COMBO_COUNT] = {
[CTRL_PAUS_RESET] = COMBO_ACTION(reset_combo),
};
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case CTRL_PAUS_RESET:
if (pressed) {
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c
index c0a354eb55..68a3eda04c 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c
@@ -33,7 +33,7 @@ combo_t key_combos[COMBO_COUNT] = {
};
// Called after a combo event is triggered
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch (combo_index) {
case SD_LAYER_COMBO:
if (pressed) {
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index b5938fa359..510b93b7ad 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -153,7 +153,7 @@ void matrix_setup(void) {
set_superduper_key_combos();
}
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
if (pressed) {
switch(combo_index) {
case CB_SUPERDUPER:
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
index 4a4e8ab941..dcabd657b0 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
@@ -683,7 +683,7 @@ void matrix_scan_user(void) {
// Combos
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
if (pressed) {
switch(combo_index) {
case CB_SUPERDUPER:
diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h
index 1302c46035..58e99863ea 100644
--- a/keyboards/gboards/g/keymap_combo.h
+++ b/keyboards/gboards/g/keymap_combo.h
@@ -60,7 +60,7 @@ int COMBO_LEN = sizeof(key_combos) / sizeof(key_combos[0]);
#define COMB BLANK
#define SUBS A_ACTI
#define TOGG A_TOGG
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch (combo_index) {
#include "combos.def"
}
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.c b/keyboards/maxr1998/pulse4k/pulse4k.c
index 61a18af743..37c558db72 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -30,7 +30,7 @@ combo_t key_combos[COMBO_COUNT] = {
bool led_adjust_active = false;
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
if (combo_index == LED_ADJUST) {
led_adjust_active = pressed;
}
diff --git a/keyboards/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/minidox/keymaps/rsthd_combos/keymap.c
index a3ba423c69..d80febecaf 100644
--- a/keyboards/minidox/keymaps/rsthd_combos/keymap.c
+++ b/keyboards/minidox/keymaps/rsthd_combos/keymap.c
@@ -45,7 +45,7 @@ combo_t key_combos[COMBO_COUNT] = {
[BOT_CTR] = COMBO_ACTION(bx_combo),
};
- void process_combo_event(uint8_t combo_index, bool pressed) {
+ void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case MID_R:
if (pressed) {
diff --git a/keyboards/planck/keymaps/narze/keymap.c b/keyboards/planck/keymaps/narze/keymap.c
index c878cf9e44..7fead32058 100644
--- a/keyboards/planck/keymaps/narze/keymap.c
+++ b/keyboards/planck/keymaps/narze/keymap.c
@@ -357,7 +357,7 @@ void matrix_setup(void) {
void matrix_scan_user(void) {
}
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
if (pressed) {
switch(combo_index) {
case CB_SUPERDUPER:
diff --git a/keyboards/xd75/keymaps/4sstylz/keymap.c b/keyboards/xd75/keymaps/4sstylz/keymap.c
index d722da9c58..497ca40a98 100644
--- a/keyboards/xd75/keymaps/4sstylz/keymap.c
+++ b/keyboards/xd75/keymaps/4sstylz/keymap.c
@@ -129,7 +129,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case SCR_LCK:
if (pressed) {
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index c4e299958a..1f715f43b9 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -24,10 +24,10 @@ extern combo_t key_combos[];
extern int COMBO_LEN;
#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 uint8_t current_combo_index = 0;
+static uint16_t current_combo_index = 0;
static bool drop_buffer = false;
static bool is_active = false;
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) {
uint8_t count = 0;
- uint8_t index = -1;
+ uint16_t index = -1;
/* Find index of keycode and number of combo keys */
for (const uint16_t *keys = combo->keys;; ++count) {
uint16_t key = pgm_read_word(&keys[count]);
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index e21ee19609..0f01aae93e 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -56,7 +56,7 @@ typedef struct {
bool process_combo(uint16_t keycode, keyrecord_t *record);
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_disable(void);
diff --git a/users/issmirnov/issmirnov.c b/users/issmirnov/issmirnov.c
index 665afbcfd7..45ef7b19a7 100644
--- a/users/issmirnov/issmirnov.c
+++ b/users/issmirnov/issmirnov.c
@@ -26,7 +26,7 @@ combo_t key_combos[COMBO_COUNT] = {
};
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case XC_COPY:
if (pressed) {
diff --git a/users/kuchosauronad0/combo.c b/users/kuchosauronad0/combo.c
index b4e8e84ae5..0a58e02770 100644
--- a/users/kuchosauronad0/combo.c
+++ b/users/kuchosauronad0/combo.c
@@ -1,6 +1,6 @@
#include "combo.h"
-void process_combo_event(uint8_t combo_index, bool pressed){
+void process_combo_event(uint16_t combo_index, bool pressed){
switch(combo_index) {
case ZV_COPY:
if (pressed) {
diff --git a/users/ninjonas/combos.c b/users/ninjonas/combos.c
index 9453ba84dc..8d1cd6510f 100644
--- a/users/ninjonas/combos.c
+++ b/users/ninjonas/combos.c
@@ -23,7 +23,7 @@ combo_t key_combos[COMBO_COUNT] = {
[XV_PASTE] = COMBO_ACTION(paste_combo),
};
-void process_combo_event(uint8_t combo_index, bool pressed) {
+void process_combo_event(uint16_t combo_index, bool pressed) {
switch(combo_index) {
case EQ_QUIT:
if (pressed) {
diff --git a/users/yet-another-developer/combo.c b/users/yet-another-developer/combo.c
index b4e8e84ae5..0a58e02770 100644
--- a/users/yet-another-developer/combo.c
+++ b/users/yet-another-developer/combo.c
@@ -1,6 +1,6 @@
#include "combo.h"
-void process_combo_event(uint8_t combo_index, bool pressed){
+void process_combo_event(uint16_t combo_index, bool pressed){
switch(combo_index) {
case ZV_COPY:
if (pressed) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:44:18 +0000