summaryrefslogtreecommitdiffstats
path: root/keyboards/splitkb/kyria/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/splitkb/kyria/keymaps')
-rw-r--r--keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c5
-rw-r--r--keyboards/splitkb/kyria/keymaps/cwebster2/config.h4
-rw-r--r--keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c2
3 files changed, 2 insertions, 9 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c
index 294d6a278f..902cb33b54 100644
--- a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c
@@ -176,11 +176,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
enum combo_events {
- CAPS_COMBO,
- // Other combos...
- COMBO_LENGTH
+ CAPS_COMBO
};
-uint16_t COMBO_LEN = COMBO_LENGTH;
const uint16_t PROGMEM caps_combo[] = {KC_F, KC_J, COMBO_END};
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
index 1fa51f23f1..e6fc5e2d0f 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h
@@ -42,10 +42,6 @@
//#define RGBLIGHT_STARTUP_ANIMATION
#endif
-#ifdef COMBO_ENABLE
- #define COMBO_COUNT 5
-#endif
-
#define EE_HANDS
//#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
index 9c31e2617c..3a5aa429d5 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM curly_combo[] = { KC_F, KC_P, COMBO_END };
const uint16_t PROGMEM parens_combo[] = { KC_P, KC_B, COMBO_END };
const uint16_t PROGMEM square_combo[] = { KC_D, KC_V, COMBO_END };
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[ZX_COPY] = COMBO(copy_combo, LCTL_T(KC_C)),
[CV_PASTE] = COMBO(paste_combo, LCTL_T(KC_V)),
[PB_PARENS] = COMBO(parens_combo, KC_LPRN),