summaryrefslogtreecommitdiffstats
path: root/keyboards/40percentclub
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/40percentclub
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/40percentclub')
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h2
-rw-r--r--keyboards/40percentclub/nori/keymaps/wings_36key/config.h2
-rw-r--r--keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c4
3 files changed, 2 insertions, 6 deletions
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index 589a67f03d..c97c9c2f4b 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -37,8 +37,6 @@
// how long before oneshot times out
#define ONESHOT_TAP_TOGGLE 2
// how many taps before oneshot toggle is triggered
- #define COMBO_COUNT 2
- // Set this to the number of combos that you're using in the Combo feature.
#define COMBO_TERM 200
// how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
#define TAP_CODE_DELAY 100
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
index f076ded9ba..0ac12473e0 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -19,7 +19,5 @@
#define RETRO_TAPPING_PER_KEY
#define TAPPING_TERM_PER_KEY
-#define COMBO_COUNT 2 // number of combos used
#define COMBO_TERM 40 // time out for combos in ms
#define TAPPING_TERM 200 // time out for tap-hold in ms
-
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
index 40d59ecf76..fc6b19ff3c 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
@@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
COMBO(df_tab, KC_TAB),
COMBO(jk_alt, KC_LALT),
};
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
+}
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {