From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Mon, 3 Apr 2023 07:32:47 +0200
Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps
 (#20211)

---
 keyboards/lily58/keymaps/hvp/config.h         | 1 -
 keyboards/lily58/keymaps/muppetjones/config.h | 3 ---
 keyboards/lily58/keymaps/muuko/config.h       | 1 -
 keyboards/lily58/keymaps/narze/config.h       | 1 -
 keyboards/lily58/keymaps/niolang/config.h     | 3 ---
 5 files changed, 9 deletions(-)

(limited to 'keyboards/lily58/keymaps')

diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index 5699395f73..ec0960470a 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 150
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h
index 283a4ed890..81bc728d5a 100644
--- a/keyboards/lily58/keymaps/muppetjones/config.h
+++ b/keyboards/lily58/keymaps/muppetjones/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Change "hold" time (default is 200 ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
index 377ee816fe..5d833d34d0 100644
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ b/keyboards/lily58/keymaps/muuko/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_MUSIC_MODE
 
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #ifdef TAPPING_TERM
 #undef TAPPING_TERM
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index a6fac1a58b..814338c18f 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define COMBO_TERM 20
 #define COMBO_COUNT 3
 
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #define QUICK_TAP_TERM 0
diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h
index 58ffd90e2f..dedefc2fcf 100644
--- a/keyboards/lily58/keymaps/niolang/config.h
+++ b/keyboards/lily58/keymaps/niolang/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-/* Necessary because of use fo tap dance for ç (leads to un wanted modifications after typing c if not) */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* RGB light */
 #ifdef RGBLIGHT_ENABLE
 #define RGBLIGHT_EFFECT_BREATHING
-- 
cgit v1.2.3


From 5faa23d54ca1e3ab83097f2a07922f48800616e6 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 15 May 2023 22:27:37 +1000
Subject: Keymap introspection for combos. (#19670)

---
 keyboards/lily58/keymaps/muuko/config.h | 4 ----
 keyboards/lily58/keymaps/muuko/keymap.c | 2 +-
 keyboards/lily58/keymaps/narze/config.h | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'keyboards/lily58/keymaps')

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
 
-- 
cgit v1.2.3