summaryrefslogtreecommitdiff
path: root/keyboards/planck/keymaps
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/planck/keymaps
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/planck/keymaps')
-rw-r--r--keyboards/planck/keymaps/antosha417/keymap.c7
-rw-r--r--keyboards/planck/keymaps/ariccb/keymap.c4
-rw-r--r--keyboards/planck/keymaps/dvz/config.h2
-rw-r--r--keyboards/planck/keymaps/dvz/keymap.c2
-rw-r--r--keyboards/planck/keymaps/narze/config.h1
-rw-r--r--keyboards/planck/keymaps/rootiest/config.h1
-rw-r--r--keyboards/planck/keymaps/rootiest/keymap.c2
7 files changed, 4 insertions, 15 deletions
diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c
index 2a6caca201..06bc0b8657 100644
--- a/keyboards/planck/keymaps/antosha417/keymap.c
+++ b/keyboards/planck/keymaps/antosha417/keymap.c
@@ -397,11 +397,8 @@ enum combo_events {
DELQ_COMBO,
SAVEQ_COMBO,
BSPCQ_COMBO,
- BSPCWQ_COMBO,
-
- COMBO_LENGTH
+ BSPCWQ_COMBO
};
-uint16_t COMBO_LEN = COMBO_LENGTH;
const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END};
const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END};
@@ -448,5 +445,3 @@ combo_t key_combos[] = {
[SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE),
[BSPCWQ_COMBO] = COMBO(bspcwq_combo, A(KC_BSPC)),
};
-
-
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index 4237955bb5..5caaf1922e 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -511,10 +511,8 @@ enum combo_events {
CSS_STYLE,
HTML_GENERIC_TAG,
CTLRGHT,
- CTLLEFT,
- COMBO_LENGTH
+ CTLLEFT
};
-uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead!
const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END};
const uint16_t PROGMEM email_work_combo[] = {KC_E, KC_K, COMBO_END};
diff --git a/keyboards/planck/keymaps/dvz/config.h b/keyboards/planck/keymaps/dvz/config.h
index bcdc3e57d6..ab925009ed 100644
--- a/keyboards/planck/keymaps/dvz/config.h
+++ b/keyboards/planck/keymaps/dvz/config.h
@@ -50,8 +50,6 @@
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4
-#define COMBO_COUNT 4
-
#ifdef AUDIO_ENABLE
#define DAC_SAMPLE_MAX 65535/2
#endif
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index d69bf18620..ff57d28cf8 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END};
const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END};
const uint16_t PROGMEM sz_combo[] = {KC_S, DE_Z, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[AE] = COMBO(ae_combo, DE_AE),
[OE] = COMBO(oe_combo, DE_OE),
[UE] = COMBO(ue_combo, DE_UE),
diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h
index fddd9cd376..a7fccc4187 100644
--- a/keyboards/planck/keymaps/narze/config.h
+++ b/keyboards/planck/keymaps/narze/config.h
@@ -24,7 +24,6 @@
#define TAPPING_TERM 100
#define COMBO_TERM 20
-#define COMBO_COUNT 1
#define PERMISSIVE_HOLD
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index 1cca7e5ba9..3d2d3f38a6 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -111,7 +111,6 @@
/*
* COMBO-KEY options
*/
-#define COMBO_COUNT 2
#define COMBO_TERM 300
/*
* MACRO per-key options
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index ce3b69ed1f..7e3b8af367 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -168,7 +168,7 @@ enum combo_events { ZC_COPY, XV_PASTE };
const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END};
const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[ZC_COPY] = COMBO_ACTION(copy_combo),
[XV_PASTE] = COMBO_ACTION(paste_combo),
};