Keymap introspection for combos. (#19670)

8 files changed, 12 insertions, 18 deletions

diff --git a/keyboards/drhigsby/dubba175/keymaps/default/config.h b/keyboards/drhigsby/dubba175/keymaps/default/config.h
index 7a4761b1ae..8f9a59ed69 100644
--- a/keyboards/drhigsby/dubba175/keymaps/default/config.h
+++ b/keyboards/drhigsby/dubba175/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define COMBO_COUNT 8
 #define COMBO_TERM 40
diff --git a/keyboards/drhigsby/dubba175/keymaps/default/keymap.c b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
index 37bae5b435..9a701bc9fe 100644
--- a/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
+++ b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
 const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
 
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [combo_ESC] = COMBO(esc_combo, KC_ESC),
   [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
   [combo_TAB] = COMBO(tab_combo, KC_TAB),
@@ -71,12 +71,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
                 xxx, xxx, xxx, xxx, KC_PGUP, KC_PGDN
   ),
-     
+
     [_FN] = LAYOUT(
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
         xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_F11, KC_F12,
-        xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, 
-                xxx, xxx, xxx, xxx, xxx, xxx        
+        xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
+                xxx, xxx, xxx, xxx, xxx, xxx
   )
 
 };
diff --git a/keyboards/drhigsby/ogurec/keymaps/default/config.h b/keyboards/drhigsby/ogurec/keymaps/default/config.h
index 9ff2d89acc..5d9acf020f 100644
--- a/keyboards/drhigsby/ogurec/keymaps/default/config.h
+++ b/keyboards/drhigsby/ogurec/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define COMBO_COUNT 7
 #define COMBO_TERM 40
diff --git a/keyboards/drhigsby/ogurec/keymaps/default/keymap.c b/keyboards/drhigsby/ogurec/keymaps/default/keymap.c
index 691f5c95a1..42a6f94781 100644
--- a/keyboards/drhigsby/ogurec/keymaps/default/keymap.c
+++ b/keyboards/drhigsby/ogurec/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
 const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
 
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [combo_ESC] = COMBO(esc_combo, KC_ESC),
   [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
   [combo_TAB] = COMBO(tab_combo, KC_TAB),
@@ -68,9 +68,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
     [_FN] = LAYOUT_ortho_3x12(
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
+        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
         xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
-        KC_VOLD, KC_VOLU, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_MRWD, KC_MFFD, xxx, xxx, xxx       
+        KC_VOLD, KC_VOLU, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_MRWD, KC_MFFD, xxx, xxx, xxx
   )
 
 };
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/config.h b/keyboards/drhigsby/packrat/keymaps/3uc/config.h
index 9ff2d89acc..5d9acf020f 100644
--- a/keyboards/drhigsby/packrat/keymaps/3uc/config.h
+++ b/keyboards/drhigsby/packrat/keymaps/3uc/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define COMBO_COUNT 7
 #define COMBO_TERM 40
diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
index f037a47acb..110d76f2cd 100644
--- a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
+++ b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
 const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
 
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [combo_ESC] = COMBO(esc_combo, KC_ESC),
   [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
   [combo_TAB] = COMBO(tab_combo, KC_TAB),
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         xxx, xxx, xxx, xxx, xxx,                    BASE,           xxx, KC_P7, KC_P8, KC_P9, KC_PPLS,
         xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P4, KC_P5, KC_P6, KC_PCMM,
         xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P1, KC_P2, KC_P3, KC_PEQL,
-                  xxx, xxx, xxx,                    xxx,           KC_P0, KC_PDOT, KC_PENT  
+                  xxx, xxx, xxx,                    xxx,           KC_P0, KC_PDOT, KC_PENT
 
   ),
 
@@ -85,8 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,          xxx,           KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
         xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, KC_F11, KC_F12,
         xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, xxx, xxx,
-                  xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx       
+                  xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx
   )
 
 };
-
diff --git a/keyboards/drhigsby/packrat/keymaps/default/config.h b/keyboards/drhigsby/packrat/keymaps/default/config.h
index 9ff2d89acc..5d9acf020f 100644
--- a/keyboards/drhigsby/packrat/keymaps/default/config.h
+++ b/keyboards/drhigsby/packrat/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define COMBO_COUNT 7
 #define COMBO_TERM 40
diff --git a/keyboards/drhigsby/packrat/keymaps/default/keymap.c b/keyboards/drhigsby/packrat/keymaps/default/keymap.c
index 74df6a73e6..fbc814b2b4 100644
--- a/keyboards/drhigsby/packrat/keymaps/default/keymap.c
+++ b/keyboards/drhigsby/packrat/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
 const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
 
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
   [combo_ESC] = COMBO(esc_combo, KC_ESC),
   [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
   [combo_TAB] = COMBO(tab_combo, KC_TAB),
@@ -74,8 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,           xxx,           KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
         xxx, xxx, xxx, xxx, xxx,                     xxx,           xxx, xxx, xxx, KC_F11, KC_F12,
         xxx, xxx, xxx, xxx, xxx,                     xxx,           xxx, xxx, xxx, xxx, xxx,
-        xxx, xxx, xxx,                                              xxx, xxx, xxx       
+        xxx, xxx, xxx,                                              xxx, xxx, xxx
   )
 
 };
-