summaryrefslogtreecommitdiff
path: root/keyboards/lily58
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/lily58
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/keymaps/muuko/config.h4
-rw-r--r--keyboards/lily58/keymaps/muuko/keymap.c2
-rw-r--r--keyboards/lily58/keymaps/narze/config.h1
3 files changed, 1 insertions, 6 deletions
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
index 5d833d34d0..29a0801d2e 100644
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ b/keyboards/lily58/keymaps/muuko/config.h
@@ -33,8 +33,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#define TAPPING_TERM 120
-#ifdef COMBO_COUNT
-#undef COMBO_COUNT
-#endif
-#define COMBO_COUNT 2
#define COMBO_TERM 20
diff --git a/keyboards/lily58/keymaps/muuko/keymap.c b/keyboards/lily58/keymaps/muuko/keymap.c
index c984202b9e..b5cc97ee38 100644
--- a/keyboards/lily58/keymaps/muuko/keymap.c
+++ b/keyboards/lily58/keymaps/muuko/keymap.c
@@ -36,7 +36,7 @@ static long int oled_timeout = 300000;
enum combos { ESCAPE_COMBO, DELETE_COMBO };
const uint16_t PROGMEM escape_combo[] = { KC_GRV, KC_1, COMBO_END };
const uint16_t PROGMEM delete_combo[] = { KC_DOT, KC_SLSH, COMBO_END };
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[ESCAPE_COMBO] = COMBO(escape_combo, KC_ESC),
[DELETE_COMBO] = COMBO(delete_combo, KC_DEL)
};
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index 814338c18f..300321b3db 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define EE_HANDS
#define COMBO_TERM 20
-#define COMBO_COUNT 3
#define PERMISSIVE_HOLD