summaryrefslogtreecommitdiff
path: root/keyboards/pierce/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/pierce/keymaps
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/pierce/keymaps')
-rw-r--r--keyboards/pierce/keymaps/durken1/config.h1
-rw-r--r--keyboards/pierce/keymaps/durken1/keymap.c22
2 files changed, 11 insertions, 12 deletions
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 8ff2df3709..ecc59f31bd 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -25,7 +25,6 @@
#define PERMISSIVE_HOLD
// Combo settings
-#define COMBO_COUNT 3
#define COMBO_TERM 35
#ifdef PS2_DRIVER_USART
diff --git a/keyboards/pierce/keymaps/durken1/keymap.c b/keyboards/pierce/keymaps/durken1/keymap.c
index a4f77753a8..5bc2f4d307 100644
--- a/keyboards/pierce/keymaps/durken1/keymap.c
+++ b/keyboards/pierce/keymaps/durken1/keymap.c
@@ -17,25 +17,25 @@
#include QMK_KEYBOARD_H
#include "keymap_swedish.h"
-enum layers {
- BASE,
- MBO,
- SYM,
- NUM,
+enum layers {
+ BASE,
+ MBO,
+ SYM,
+ NUM,
FN
};
-enum combos {
- WF_ARNG,
- EI_ADIA,
- UK_ODIA
+enum combos {
+ WF_ARNG,
+ EI_ADIA,
+ UK_ODIA
};
#if defined PS2_MOUSE_ENABLE
#include "ps2_mouse.h"
#endif
-#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
+#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
static uint16_t auto_buttons_timer;
extern int tp_buttons; // mousekey button state set in action.c and used in ps2_mouse.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM arng_combo[] = {ALT_R, SFT_S, COMBO_END};
const uint16_t PROGMEM adia_combo[] = {SFT_E, ALT_I, COMBO_END};
const uint16_t PROGMEM odia_combo[] = {SE_U, SE_K, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[WF_ARNG] = COMBO(arng_combo, SE_ARNG),
[EI_ADIA] = COMBO(adia_combo, SE_ADIA),
[UK_ODIA] = COMBO(odia_combo, SE_ODIA)