summaryrefslogtreecommitdiff
path: root/keyboards/crkbd/keymaps/markstos
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/crkbd/keymaps/markstos
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/crkbd/keymaps/markstos')
-rw-r--r--keyboards/crkbd/keymaps/markstos/config.h5
-rw-r--r--keyboards/crkbd/keymaps/markstos/keymap.c4
2 files changed, 3 insertions, 6 deletions
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
index 5644812e5e..24101724de 100644
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ b/keyboards/crkbd/keymaps/markstos/config.h
@@ -43,11 +43,9 @@ This is the C configuration file for the keymap
#define QMK_SPEAKER C6
// When enabled, typing a mod-tap plus second within term will register as the mod-combo
-// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
+// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
#define PERMISSIVE_HOLD
-#define COMBO_COUNT 2
-
// Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing.
// They would have be held together intentionally to trigger this.
#define COMBO_TERM 40
@@ -56,4 +54,3 @@ This is the C configuration file for the keymap
// I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on.
#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */
#define ONESHOT_TIMEOUT 2000 /* Time (in ms) before the one shot key is released */
-
diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c
index ca5be183b1..1f95ee52b2 100644
--- a/keyboards/crkbd/keymaps/markstos/keymap.c
+++ b/keyboards/crkbd/keymaps/markstos/keymap.c
@@ -18,7 +18,7 @@ enum combos {
const uint16_t PROGMEM df_combo[] = {KC_D, KC_F, COMBO_END};
const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
// Add commonly used dash to home row
[DF_DASH] = COMBO(df_combo, KC_MINS),
// For Vim, put Escape on the home row
@@ -43,7 +43,7 @@ enum custom_layers {
#define GUI_ENT GUI_T(KC_ENT)
#define LOW_TAB LT(_LOWER, KC_TAB)
#define RSE_BSP LT(_RAISE, KC_BSPC)
-#define OSM_SFT OSM(MOD_LSFT)
+#define OSM_SFT OSM(MOD_LSFT)
// For _RAISE layer