From 515dd18c2801663bbac0e59f683c2a93e4bd9b1a Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Tue, 13 Dec 2022 12:20:07 +0100
Subject: Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of
 HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741)

---
 keyboards/planck/keymaps/adamtabrams/config.h | 4 ++--
 keyboards/planck/keymaps/adamtabrams/keymap.c | 4 ++--
 keyboards/planck/keymaps/rootiest/config.h    | 2 +-
 keyboards/planck/keymaps/rootiest/keymap.c    | 6 ++++--
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'keyboards/planck/keymaps')

diff --git a/keyboards/planck/keymaps/adamtabrams/config.h b/keyboards/planck/keymaps/adamtabrams/config.h
index 8ff86760b4..d47e552434 100644
--- a/keyboards/planck/keymaps/adamtabrams/config.h
+++ b/keyboards/planck/keymaps/adamtabrams/config.h
@@ -33,7 +33,7 @@
 // Tap-Hold Configs
 #define TAPPING_TERM 180
 #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+#define HOLD_ON_OTHER_KEY_PRESS
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 #define QUICK_TAP_TERM 0
 #define QUICK_TAP_TERM_PER_KEY
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
index 2203ecd30f..ce1acd437b 100644
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ b/keyboards/planck/keymaps/adamtabrams/keymap.c
@@ -255,7 +255,7 @@ uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
     }
 }
 
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case ALT__A:
         case ALTSCLN:
@@ -272,7 +272,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
         case CTL__J:
         case CTL__T:
         case CTL__N:
-            return true;
+            return false;
         default:
             return false;
     }
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index bdb5cea91b..1cca7e5ba9 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -118,7 +118,7 @@
  */
 #define RETRO_TAPPING_PER_KEY             // Control Retro-Tap individually by key
 #define QUICK_TAP_TERM_PER_KEY            // Control Quick-Tap individually by key
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY  // Control Mod-Tap-Interrupt individually by key
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY   // Control Hold-on-Other-Key-Press individually by key
 #define PERMISSIVE_HOLD_PER_KEY           // Control Permissive-Hold individually by key
 
 #define MK_KINETIC_SPEED  // Use kinetic acceleration for mouse-keys
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index cc43aff673..9b6bc9cc18 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -1369,9 +1369,11 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t* record) {
             return false;
     }
 }
-// Handles per-key configuration of Mod-Tap-Interrupt
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t* record) {
+// Handles per-key configuration of Hold-on-Other-Key-Press
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t* record) {
     switch (keycode) {
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            return true;
         default:
             return false;
     }
-- 
cgit v1.2.3