summaryrefslogtreecommitdiff
path: root/keyboards/program_yoink
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-15 22:27:37 +1000
committerGitHub <noreply@github.com>2023-05-15 22:27:37 +1000
commit5faa23d54ca1e3ab83097f2a07922f48800616e6 (patch)
tree6ed05e5492f3fc8dda210a75b897dd9d4ed8df38 /keyboards/program_yoink
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/program_yoink')
-rw-r--r--keyboards/program_yoink/ortho/keymaps/default/config.h3
-rw-r--r--keyboards/program_yoink/ortho/keymaps/default/keymap.c2
-rw-r--r--keyboards/program_yoink/ortho/keymaps/ortho_split/config.h3
-rw-r--r--keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c2
-rw-r--r--keyboards/program_yoink/staggered/keymaps/default/config.h3
-rw-r--r--keyboards/program_yoink/staggered/keymaps/default/keymap.c2
-rw-r--r--keyboards/program_yoink/staggered/keymaps/split_bar/config.h3
-rw-r--r--keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c2
8 files changed, 8 insertions, 12 deletions
diff --git a/keyboards/program_yoink/ortho/keymaps/default/config.h b/keyboards/program_yoink/ortho/keymaps/default/config.h
index ea7075aecb..eb4161b940 100644
--- a/keyboards/program_yoink/ortho/keymaps/default/config.h
+++ b/keyboards/program_yoink/ortho/keymaps/default/config.h
@@ -20,6 +20,5 @@
#define TAPPING_TERM 200
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 10
# define COMBO_TERM 60
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/program_yoink/ortho/keymaps/default/keymap.c b/keyboards/program_yoink/ortho/keymaps/default/keymap.c
index 6719a38b0a..35f58efc4f 100644
--- a/keyboards/program_yoink/ortho/keymaps/default/keymap.c
+++ b/keyboards/program_yoink/ortho/keymaps/default/keymap.c
@@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
const uint16_t PROGMEM combo_ent[] = {KC_DOT, KC_SLSH, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
};
diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h b/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h
index ea7075aecb..eb4161b940 100644
--- a/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h
+++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h
@@ -20,6 +20,5 @@
#define TAPPING_TERM 200
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 10
# define COMBO_TERM 60
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
index 837dc1e754..7e14d95efc 100644
--- a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
+++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c
@@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
};
diff --git a/keyboards/program_yoink/staggered/keymaps/default/config.h b/keyboards/program_yoink/staggered/keymaps/default/config.h
index c4b4470e96..8759b84226 100644
--- a/keyboards/program_yoink/staggered/keymaps/default/config.h
+++ b/keyboards/program_yoink/staggered/keymaps/default/config.h
@@ -20,6 +20,5 @@
#define TAPPING_TERM 200
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 10
# define COMBO_TERM 200
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/program_yoink/staggered/keymaps/default/keymap.c b/keyboards/program_yoink/staggered/keymaps/default/keymap.c
index 8780cad06e..aa7a288705 100644
--- a/keyboards/program_yoink/staggered/keymaps/default/keymap.c
+++ b/keyboards/program_yoink/staggered/keymaps/default/keymap.c
@@ -68,7 +68,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
};
diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/config.h b/keyboards/program_yoink/staggered/keymaps/split_bar/config.h
index 842b3b8011..8759b84226 100644
--- a/keyboards/program_yoink/staggered/keymaps/split_bar/config.h
+++ b/keyboards/program_yoink/staggered/keymaps/split_bar/config.h
@@ -20,6 +20,5 @@
#define TAPPING_TERM 200
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 10
# define COMBO_TERM 200
-#endif
+#endif
diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
index d37722e7bc..1053fb7aa4 100644
--- a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
+++ b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c
@@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
};