Keymap introspection for combos. (#19670)

14 files changed, 7 insertions, 14 deletions

diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
index ccfd50638b..d4b4480810 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #define COMBO_TERM  50
-#define COMBO_COUNT 50
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM 175
 #define TAPPING_TERM 175
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
index 88c3784754..9c1f0cb63e 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
@@ -188,7 +188,7 @@ const uint16_t PROGMEM rl_r_m_i_combo[]   =  {RLR, RLM, RLI, COMBO_END};
 // both hand combinations.
 const uint16_t PROGMEM bl_m_m_combo[]      = {LLM, RLM, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [L_U_PINKY_RING]          = COMBO(lu_p_r_combo,  KC_TAB),
     [L_U_RING_MIDDLE]         = COMBO(lu_r_m_combo,  KC_QUES),
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
index 6411ba8c66..22ceb2f996 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
index c85099a144..47269b07ff 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[]       = {KC_Z, KC_SLSH, COMBO_END};
 const uint16_t PROGMEM x_comma_combo[]       = {KC_X, KC_COMM, COMBO_END};
 const uint16_t PROGMEM j_f_combo[]           = {KC_F, KC_J,    COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [Q_W]           = COMBO(q_w_combo, KC_TAB),
     [W_E]           = COMBO(w_e_combo, KC_DQT),
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
index fa95320e90..822264ca78 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
@@ -20,5 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
index aa51f479ff..8e4685757c 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[]       = {KC_Z, KC_SLSH, COMBO_END};
 const uint16_t PROGMEM x_comma_combo[]       = {KC_X, KC_COMM, COMBO_END};
 const uint16_t PROGMEM j_f_combo[]           = {KC_F, KC_J,    COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [Q_W]           = COMBO(q_w_combo, KC_TAB),
     [W_E]           = COMBO(w_e_combo, KC_DQT),
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
index 65eec1d7f8..127f7d0fb8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
@@ -17,5 +17,4 @@
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
index 78f9617cf0..0d56ef08a8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[]       = {KC_Z, KC_SLSH, COMBO_END};
 const uint16_t PROGMEM x_comma_combo[]       = {KC_X, KC_COMM, COMBO_END};
 const uint16_t PROGMEM j_f_combo[]           = {KC_F, KC_J,    COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [Q_W]           = COMBO(q_w_combo, KC_TAB),
     [W_E]           = COMBO(w_e_combo, KC_DQT),
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
index 6411ba8c66..22ceb2f996 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
index 477aa2229e..171f1a373e 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[]       = {KC_Z, KC_SLSH, COMBO_END};
 const uint16_t PROGMEM x_comma_combo[]       = {KC_X, KC_COMM, COMBO_END};
 const uint16_t PROGMEM j_f_combo[]           = {KC_F, KC_J,    COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [Q_W]           = COMBO(q_w_combo, KC_TAB),
     [W_E]           = COMBO(w_e_combo, KC_DQT),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
index 9920602ab8..2392b46be6 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
 
 #define LEADER_TIMEOUT 300
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index c030738400..b28fc84499 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
 // both hand combinations.
 const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
     [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
index 6411ba8c66..22ceb2f996 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
@@ -1,5 +1,4 @@
 #pragma once
 
 #define COMBO_TERM 100
-#define COMBO_COUNT 38
 #define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index f0ab692f28..75ea54c548 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
@@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
 // both hand combinations.
 const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
     // left hand combinations.
     [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
     [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),