12 files changed, 9 insertions, 20 deletions
diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c
index 7c95c6189b..e1e050ab1d 100644
--- a/keyboards/keebio/iris/keymaps/default/keymap.c
+++ b/keyboards/keebio/iris/keymaps/default/keymap.c
@@ -1,5 +1,7 @@
-#include QMK_KEYBOARD_H
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
+#include QMK_KEYBOARD_H
 
 #define _QWERTY 0
 #define _LOWER 1
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 864cedae98..d5caa23369 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -8,7 +8,6 @@
 
 #define SWAP_SCLN
 #define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
index 9f1982935a..0aa25a88bc 100644
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ b/keyboards/keebio/iris/keymaps/emp/config.h
@@ -50,12 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #undef PERMISSIVE_HOLD
 
-/* IGNORE_MOD_TAP_INTERRUPT
- * when on: rolling tap-hold keys taps all keys
- * when off: rolling tap-hold keys modifies keys
-*/
-#undef IGNORE_MOD_TAP_INTERRUPT
-
 /* TAPPING_TERM x (ms)
  * how long before a tap becomes a hold. if set above 500, a key tapped during
  * the tapping term will turn it into a hold too
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h
index fd3ebfd94b..44c4fbd1e5 100644
--- a/keyboards/keebio/iris/keymaps/fluffactually/config.h
+++ b/keyboards/keebio/iris/keymaps/fluffactually/config.h
@@ -19,6 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define USE_I2C
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 175
 
diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h
index 62760cce35..22b4d6eac7 100644
--- a/keyboards/keebio/iris/keymaps/khitsule/config.h
+++ b/keyboards/keebio/iris/keymaps/khitsule/config.h
@@ -19,6 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define USE_I2C
 #define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c
index ef51a973f6..67eee220fc 100644
--- a/keyboards/keebio/iris/keymaps/krusli/keymap.c
+++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c
@@ -1,6 +1,4 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/keebio/iris/keymaps/mattly/rules.mk b/keyboards/keebio/iris/keymaps/mattly/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/keebio/iris/keymaps/mattly/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h
index 359dda7b61..c2ea15af87 100644
--- a/keyboards/keebio/iris/keymaps/radlinskii/config.h
+++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h
@@ -8,7 +8,6 @@
 
 #define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 #define RGBLIGHT_LAYERS
 
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h
index 8c576917e8..59004bfa8a 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/config.h
+++ b/keyboards/keebio/iris/keymaps/sq5rix/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #define EE_HANDS
 #define TAPPING_TERM 164
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 #define RGBLIGHT_LAYERS
 #define ENCODER_RESOLUTION 4
diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h
index 37ffb20a2f..83b0fcfc44 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/config.h
+++ b/keyboards/keebio/iris/keymaps/two_knob/config.h
@@ -13,9 +13,6 @@
 /* If you're setting colors per key, this is required. */
 #define SPLIT_LAYER_STATE_ENABLE
 
-/* If you type too fast, it confuses the Mod key combos. This resolves it: */
-#define IGNORE_MOD_TAP_INTERRUPT
-
 /* Set tapdance speed */
 #define TAPPING_TERM 210
 
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
index f6017d7266..f40392ba1e 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c
+++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
@@ -232,7 +232,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  * https://docs.qmk.fm/#/feature_macros?id=super-alt%e2%86%aftab
  */
 #if defined(ENCODER_MAP_ENABLE)
-    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
         /* Left Hand */                                                     /* Right Hand */
         /* Switch between tabs. (Control + Tab). */                         /* Switch between open apps on Mac. (Command + Tab + timer logic) */
         [_QWERTY] =  { ENCODER_CCW_CW(S(C(KC_TAB)), C(KC_TAB)),             ENCODER_CCW_CW(CMD_TAB_CCW, CMD_TAB_CW)  },
diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index 65d3ac434e..7f793333cc 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 enum custom_layer {
@@ -67,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 #   if defined(KEYBOARD_keebio_iris_rev7)
     [_MAIN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
     [_FN1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END) },