From cbabc8dbe6a8476d3082e8bc649d330f87e7b904 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 12 Dec 2022 23:52:22 +0800
Subject: [Core] Replace Tapping Force Hold feature with Quick Tap Term
 (#17007)

* Replace Tapping Force Hold feature with Quick Tap Term

* Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0

* Deprecate force hold in info_config.json

* Before and after quick tap term unit tests

* Quick tap unit tests iteration

* Keymap config.h correction

* Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed

* Add two more test cases for quick tap

* Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2

* Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2

* Add function declaration for get_quick_tap_term

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 keyboards/keebio/iris/keymaps/jhelvy/config.h | 2 +-
 keyboards/keebio/iris/keymaps/osiris/config.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/keymaps/jhelvy/config.h b/keyboards/keebio/iris/keymaps/jhelvy/config.h
index c019234732..7ec5b41761 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/config.h
+++ b/keyboards/keebio/iris/keymaps/jhelvy/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Had to swap the master to get the right-side rotary encoder supported
 #define MASTER_RIGHT
 
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
 #define AUTO_SHIFT_TIMEOUT 150
diff --git a/keyboards/keebio/iris/keymaps/osiris/config.h b/keyboards/keebio/iris/keymaps/osiris/config.h
index 225a858131..eac14a7246 100644
--- a/keyboards/keebio/iris/keymaps/osiris/config.h
+++ b/keyboards/keebio/iris/keymaps/osiris/config.h
@@ -37,6 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 
 // #undef PERMISSIVE_HOLD
-//#define TAPPING_FORCE_HOLD
+//#define QUICK_TAP_TERM 0
 //#define RETRO_TAPPING
 #define PERMISSIVE_HOLD
-- 
cgit v1.2.3


From 1978007faefc0fb3af809ddf0d2ff1274e540570 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 15 Dec 2022 07:40:25 +1100
Subject: Tap Dance: remove `qk_` prefix (#19313)

---
 keyboards/keebio/iris/keymaps/adamgate/keymap.c   | 2 +-
 keyboards/keebio/iris/keymaps/boo/keymap.c        | 2 +-
 keyboards/keebio/iris/keymaps/davidrambo/keymap.c | 6 +++---
 keyboards/keebio/iris/keymaps/khord/keymap.c      | 2 +-
 keyboards/keebio/iris/keymaps/omgvee/keymap.c     | 2 +-
 keyboards/keebio/iris/keymaps/sq5rix/keymap.c     | 2 +-
 keyboards/keebio/iris/keymaps/two_knob/keymap.c   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/keymaps/adamgate/keymap.c b/keyboards/keebio/iris/keymaps/adamgate/keymap.c
index 84c3b74711..e67ceef091 100644
--- a/keyboards/keebio/iris/keymaps/adamgate/keymap.c
+++ b/keyboards/keebio/iris/keymaps/adamgate/keymap.c
@@ -36,7 +36,7 @@ enum custom_tapdances {
    TD_SHFT_CAPS = 0,
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_SHFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), //shift if pressed 1x, caps lock if pressed 2x
 };
 
diff --git a/keyboards/keebio/iris/keymaps/boo/keymap.c b/keyboards/keebio/iris/keymaps/boo/keymap.c
index 7fc9162b47..e6325ae876 100644
--- a/keyboards/keebio/iris/keymaps/boo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/boo/keymap.c
@@ -44,7 +44,7 @@ enum keycodes {
     KC_KAK = SAFE_RANGE,
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [_LCTLGUI] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, KC_LGUI),
 };
 
diff --git a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
index 188e3c3345..42c6d6fcfe 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Shift vs. capslock function. From bbaserdem's Planck keymap (since deprecated).
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
+void caps_tap (tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_code (KC_LSFT);
     } else if (state->count == 2) {
@@ -134,7 +134,7 @@ void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
         register_code (KC_CAPS);
     }
 }
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
+void caps_tap_end (tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         unregister_code (KC_LSFT);
     } else {
@@ -142,7 +142,7 @@ void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
     }
 }
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     //Tap once for Shift, twice for Caps Lock
     [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end)
 };
diff --git a/keyboards/keebio/iris/keymaps/khord/keymap.c b/keyboards/keebio/iris/keymaps/khord/keymap.c
index 10ef4ce099..07155d5d17 100644
--- a/keyboards/keebio/iris/keymaps/khord/keymap.c
+++ b/keyboards/keebio/iris/keymaps/khord/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
 };
 
diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 29ce513fed..4276938b8d 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -40,7 +40,7 @@ enum {
   TD_SCL = 0
 };
 //Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   //Tap once for Shift, twice for Caps Lock
   [TD_SCL]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
 };
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
index 92f4294a40..74e1dcd531 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
+++ b/keyboards/keebio/iris/keymaps/sq5rix/keymap.c
@@ -36,7 +36,7 @@ enum custom_keycodes {
 enum {
     TD_S
 };
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TD_S] = ACTION_TAP_DANCE_DOUBLE(KC_S, KC_Z),
 };
 
diff --git a/keyboards/keebio/iris/keymaps/two_knob/keymap.c b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
index 221855d3fa..f6017d7266 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/keymap.c
+++ b/keyboards/keebio/iris/keymaps/two_knob/keymap.c
@@ -53,7 +53,7 @@ enum tapdances {
  *
  * To use this in the configurator, enter the name 'TD_FIVE_ENTER' in the "Any" key.
  */
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     /* Tap once for 5, twice for Enter. */
     [_TD_FIVE_ENTER] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_ENT),
 };
-- 
cgit v1.2.3


From 8e16920530b810510885f5f77a1c0731c463d8bf Mon Sep 17 00:00:00 2001
From: Dean Scarff <15805+p00ya@users.noreply.github.com>
Date: Wed, 18 Jan 2023 07:54:16 +1100
Subject: [Keyboard] keebio/iris document LED matrix (#19588)

---
 keyboards/keebio/iris/rev6b/rev6b.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev6b/rev6b.c b/keyboards/keebio/iris/rev6b/rev6b.c
index f4d9a6830b..883154c5c3 100644
--- a/keyboards/keebio/iris/rev6b/rev6b.c
+++ b/keyboards/keebio/iris/rev6b/rev6b.c
@@ -22,7 +22,7 @@ led_config_t g_led_config = { {
     { 12, 13, 14, 15, 16, 17 },
     { 23, 22, 21, 20, 19, 18 },
     { NO_LED, NO_LED, 24, 25, 26, 27 },
-    // Right Half
+    // Right Half (mirrored, i.e. LEDs 39 and 40 are the leftmost column).
     { 34, 35, 36, 37, 38, 39 },
     { 45, 44, 43, 42, 41, 40 },
     { 46, 47, 48, 49, 50, 51 },
-- 
cgit v1.2.3


From cf935d97ae479e7a1e1f2f2f248b93e52e4cc69e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 21 Jan 2023 03:21:17 +1100
Subject: Fix functions with empty params (#19647)

* Fix functions with empty params

* Found a bunch more
---
 keyboards/keebio/iris/keymaps/edvorakjp/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
index e593051db8..97c9f48f89 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-void matrix_init_keymap() {}
+void matrix_init_keymap(void) {}
 
 #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
 layer_state_t layer_state_set_keymap(layer_state_t state) {
-- 
cgit v1.2.3


From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 29 Jan 2023 02:42:44 +1100
Subject: Remove commented out backlight config & stray "backlight levels"
 (#19703)

---
 keyboards/keebio/iris/rev1/config.h     | 3 ---
 keyboards/keebio/iris/rev1_led/config.h | 3 ---
 keyboards/keebio/iris/rev2/config.h     | 3 ---
 keyboards/keebio/iris/rev3/config.h     | 3 ---
 keyboards/keebio/iris/rev4/config.h     | 3 ---
 keyboards/keebio/iris/rev5/config.h     | 3 ---
 keyboards/keebio/iris/rev6/config.h     | 3 ---
 keyboards/keebio/iris/rev6a/config.h    | 3 ---
 keyboards/keebio/iris/rev6b/config.h    | 3 ---
 keyboards/keebio/iris/rev7/config.h     | 3 ---
 10 files changed, 30 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 96be096317..7a1525ce61 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index ccb617a0d3..a8364f9533 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index fe4780dd69..595999d8fa 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 552cc0cad5..da190b50fb 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index c865dea6f9..69244965c4 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -44,9 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 2d06626486..1c52ac4b1c 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -44,9 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 5742bf4566..98ae5d27e5 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 69ea7556fe..ad4c6323a3 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 69ea7556fe..ad4c6323a3 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 7c683a19c9..66f85a72f6 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-- 
cgit v1.2.3


From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 31 Jan 2023 06:03:30 +1100
Subject: Remove usages of config_common.h from config.h files. (#19714)

---
 keyboards/keebio/iris/config.h                     | 1 -
 keyboards/keebio/iris/keymaps/hbbisenieks/config.h | 1 -
 keyboards/keebio/iris/keymaps/impstyle/config.h    | 1 -
 keyboards/keebio/iris/keymaps/krusli/config.h      | 1 -
 4 files changed, 4 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/config.h b/keyboards/keebio/iris/config.h
index 6868dc1354..f64deae13a 100644
--- a/keyboards/keebio/iris/config.h
+++ b/keyboards/keebio/iris/config.h
@@ -17,4 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index 7772d71905..cc229edb94 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* Select hand configuration */
 
diff --git a/keyboards/keebio/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h
index 68b45c217d..6bf02411b5 100644
--- a/keyboards/keebio/iris/keymaps/impstyle/config.h
+++ b/keyboards/keebio/iris/keymaps/impstyle/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "config_common.h"
 
 #define USE_I2C
 
diff --git a/keyboards/keebio/iris/keymaps/krusli/config.h b/keyboards/keebio/iris/keymaps/krusli/config.h
index adfe26d7c2..1048a02198 100644
--- a/keyboards/keebio/iris/keymaps/krusli/config.h
+++ b/keyboards/keebio/iris/keymaps/krusli/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "config_common.h"
 
 /* Select hand configuration */
 
-- 
cgit v1.2.3


From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 3 Feb 2023 11:04:10 +1100
Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726)

---
 keyboards/keebio/iris/rev1/config.h     | 3 ---
 keyboards/keebio/iris/rev1_led/config.h | 3 ---
 keyboards/keebio/iris/rev2/config.h     | 3 ---
 keyboards/keebio/iris/rev3/config.h     | 3 ---
 keyboards/keebio/iris/rev4/config.h     | 3 ---
 keyboards/keebio/iris/rev5/config.h     | 3 ---
 keyboards/keebio/iris/rev6/config.h     | 3 ---
 keyboards/keebio/iris/rev6a/config.h    | 3 ---
 keyboards/keebio/iris/rev6b/config.h    | 3 ---
 keyboards/keebio/iris/rev7/config.h     | 3 ---
 10 files changed, 30 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 7a1525ce61..f34b5f934d 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index a8364f9533..03f1693b32 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 595999d8fa..fcdebd4645 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index da190b50fb..cc7b7798d2 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 69244965c4..ccf200f6cf 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 1c52ac4b1c..570d116c45 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 98ae5d27e5..887d9ea6e0 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index ad4c6323a3..95113a8a6f 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index ad4c6323a3..95113a8a6f 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 66f85a72f6..3733f10645 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-- 
cgit v1.2.3


From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 4 Feb 2023 06:19:58 +1100
Subject: Debounce defines cleanup (#19742)

* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
---
 keyboards/keebio/iris/rev1/config.h     | 3 ---
 keyboards/keebio/iris/rev1_led/config.h | 3 ---
 keyboards/keebio/iris/rev2/config.h     | 3 ---
 keyboards/keebio/iris/rev3/config.h     | 3 ---
 keyboards/keebio/iris/rev4/config.h     | 3 ---
 keyboards/keebio/iris/rev5/config.h     | 3 ---
 keyboards/keebio/iris/rev6/config.h     | 3 ---
 keyboards/keebio/iris/rev6a/config.h    | 3 ---
 keyboards/keebio/iris/rev6b/config.h    | 3 ---
 keyboards/keebio/iris/rev7/config.h     | 3 ---
 10 files changed, 30 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index f34b5f934d..646eb3df8e 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 03f1693b32..6116a8d200 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index fcdebd4645..4ea28a041e 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index cc7b7798d2..cbe4f83ac0 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index ccf200f6cf..36d044b772 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 570d116c45..cbcd86afe5 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 887d9ea6e0..12207beaa1 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 95113a8a6f..5793e50d19 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 95113a8a6f..5793e50d19 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 3733f10645..5a5b998a26 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
 
-- 
cgit v1.2.3


From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 8 Feb 2023 18:41:46 +1100
Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)

---
 keyboards/keebio/iris/rev1/info.json     | 4 +++-
 keyboards/keebio/iris/rev1/rules.mk      | 6 ------
 keyboards/keebio/iris/rev1_led/info.json | 4 +++-
 keyboards/keebio/iris/rev1_led/rules.mk  | 6 ------
 keyboards/keebio/iris/rev2/info.json     | 4 +++-
 keyboards/keebio/iris/rev2/rules.mk      | 6 ------
 keyboards/keebio/iris/rev3/info.json     | 4 +++-
 keyboards/keebio/iris/rev3/rules.mk      | 6 ------
 keyboards/keebio/iris/rev4/info.json     | 4 +++-
 keyboards/keebio/iris/rev4/rules.mk      | 6 ------
 keyboards/keebio/iris/rev5/info.json     | 4 +++-
 keyboards/keebio/iris/rev5/rules.mk      | 6 ------
 keyboards/keebio/iris/rev6/info.json     | 4 +++-
 keyboards/keebio/iris/rev6/rules.mk      | 6 ------
 keyboards/keebio/iris/rev6a/info.json    | 4 +++-
 keyboards/keebio/iris/rev6a/rules.mk     | 6 ------
 keyboards/keebio/iris/rev6b/info.json    | 4 +++-
 keyboards/keebio/iris/rev6b/rules.mk     | 6 ------
 keyboards/keebio/iris/rev7/info.json     | 4 +++-
 keyboards/keebio/iris/rev7/rules.mk      | 6 ------
 20 files changed, 30 insertions(+), 70 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 414db5ad6a..8daff17bfc 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x1256",
         "device_version": "1.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk
index 4b17f9c833..12e5a0674b 100644
--- a/keyboards/keebio/iris/rev1/rules.mk
+++ b/keyboards/keebio/iris/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index 38b09bbe35..98cd499b5b 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x1256",
         "device_version": "1.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk
index 4b17f9c833..12e5a0674b 100644
--- a/keyboards/keebio/iris/rev1_led/rules.mk
+++ b/keyboards/keebio/iris/rev1_led/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index dd223d4f94..c0d2528df4 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x2256",
         "device_version": "2.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk
index 314daabe3f..286733cc50 100644
--- a/keyboards/keebio/iris/rev2/rules.mk
+++ b/keyboards/keebio/iris/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index af6215b201..fe7973b368 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x3256",
         "device_version": "3.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk
index b3b724cc1b..44c1c1fac3 100644
--- a/keyboards/keebio/iris/rev3/rules.mk
+++ b/keyboards/keebio/iris/rev3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index aa42788154..732623daab 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x4256",
         "device_version": "4.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk
index b1ee82a527..02da189f9e 100644
--- a/keyboards/keebio/iris/rev4/rules.mk
+++ b/keyboards/keebio/iris/rev4/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 60a73d4252..dda77533e2 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x5256",
         "device_version": "5.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk
index 4425ef2f9b..8859d8f69c 100644
--- a/keyboards/keebio/iris/rev5/rules.mk
+++ b/keyboards/keebio/iris/rev5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 86dc585c81..c7fcfe9c79 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x6256",
         "device_version": "6.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
index 87f19b5fc1..5dcf2c2b7c 100644
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index c580018ea7..4d551fd759 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x6356",
         "device_version": "6.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6a/rules.mk b/keyboards/keebio/iris/rev6a/rules.mk
index 87f19b5fc1..5dcf2c2b7c 100644
--- a/keyboards/keebio/iris/rev6a/rules.mk
+++ b/keyboards/keebio/iris/rev6a/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index eafae19202..38a90c7b86 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x6456",
         "device_version": "6.2.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk
index 87f19b5fc1..5dcf2c2b7c 100644
--- a/keyboards/keebio/iris/rev6b/rules.mk
+++ b/keyboards/keebio/iris/rev6b/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index b0ba3ca359..74767c0d08 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -3,5 +3,7 @@
     "usb": {
         "pid": "0x7256",
         "device_version": "7.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
index 87f19b5fc1..5dcf2c2b7c 100644
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
-- 
cgit v1.2.3


From ccb6c908dd71fac3dfa89f2d8baa8196eac9994f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 9 Feb 2023 10:57:42 +1100
Subject: Remove `SOFT_SERIAL_PIN` for non-split boards (#19774)

* Remove `SOFT_SERIAL_PIN` for non-split boards

* Delete more empty config.h
---
 keyboards/keebio/iris/config.h | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 keyboards/keebio/iris/config.h

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/config.h b/keyboards/keebio/iris/config.h
deleted file mode 100644
index f64deae13a..0000000000
--- a/keyboards/keebio/iris/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-- 
cgit v1.2.3


From bbf7a20b33de2d203518687cb5cd1aa85005ea27 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 13 Feb 2023 03:19:02 +1100
Subject: Refactor Leader key feature (#19632)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebio/iris/keymaps/omgvee/keymap.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/keymaps/omgvee/keymap.c b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
index 4276938b8d..035d381bac 100644
--- a/keyboards/keebio/iris/keymaps/omgvee/keymap.c
+++ b/keyboards/keebio/iris/keymaps/omgvee/keymap.c
@@ -32,9 +32,6 @@ enum custom_keycodes {
 #define MW_L KC_MS_WH_LEFT 
 #define MW_R KC_MS_WH_RIGHT
 
-//// only uncomment the below line when you enable leader key in rules.mk
-//LEADER_EXTERNS();
-
 //Tap Dance Declarations
 enum {
   TD_SCL = 0
-- 
cgit v1.2.3


From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 16:08:25 +1100
Subject: Remove matrix size defines (#19581)

---
 keyboards/keebio/iris/rev1/config.h     | 5 -----
 keyboards/keebio/iris/rev1_led/config.h | 5 -----
 keyboards/keebio/iris/rev2/config.h     | 5 -----
 keyboards/keebio/iris/rev3/config.h     | 5 -----
 keyboards/keebio/iris/rev4/config.h     | 5 -----
 keyboards/keebio/iris/rev5/config.h     | 5 -----
 keyboards/keebio/iris/rev6/config.h     | 5 -----
 keyboards/keebio/iris/rev6a/config.h    | 5 -----
 keyboards/keebio/iris/rev6b/config.h    | 5 -----
 keyboards/keebio/iris/rev7/config.h     | 5 -----
 10 files changed, 50 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index 646eb3df8e..dfcc6c3b69 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index 6116a8d200..ada06fdeb8 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 4ea28a041e..d3b012df1a 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index cbe4f83ac0..a70c25c911 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 }
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 36d044b772..2d1ab5734a 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
 #define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index cbcd86afe5..7e17330843 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
 #define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 12207beaa1..e61f1c2875 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
 #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 5793e50d19..34899032e7 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
 #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 5793e50d19..34899032e7 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
 #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 5a5b998a26..3bb2dc7566 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 }
 #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 }
-- 
cgit v1.2.3


From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 16:40:49 +1100
Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863)

---
 keyboards/keebio/iris/rev1/config.h      | 3 ---
 keyboards/keebio/iris/rev1/info.json     | 3 +++
 keyboards/keebio/iris/rev1_led/config.h  | 3 ---
 keyboards/keebio/iris/rev1_led/info.json | 3 +++
 keyboards/keebio/iris/rev2/config.h      | 3 ---
 keyboards/keebio/iris/rev2/info.json     | 3 +++
 keyboards/keebio/iris/rev3/config.h      | 3 ---
 keyboards/keebio/iris/rev3/info.json     | 3 +++
 keyboards/keebio/iris/rev4/config.h      | 3 ---
 keyboards/keebio/iris/rev4/info.json     | 3 +++
 keyboards/keebio/iris/rev5/config.h      | 4 ----
 keyboards/keebio/iris/rev5/info.json     | 3 +++
 keyboards/keebio/iris/rev6/config.h      | 3 ---
 keyboards/keebio/iris/rev6/info.json     | 3 +++
 keyboards/keebio/iris/rev6a/config.h     | 3 ---
 keyboards/keebio/iris/rev6a/info.json    | 3 +++
 keyboards/keebio/iris/rev6b/config.h     | 3 ---
 keyboards/keebio/iris/rev6b/info.json    | 3 +++
 keyboards/keebio/iris/rev7/config.h      | 3 ---
 keyboards/keebio/iris/rev7/info.json     | 3 +++
 20 files changed, 30 insertions(+), 31 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index dfcc6c3b69..fcb96a3911 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 8daff17bfc..788b92a7b4 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -4,6 +4,9 @@
         "pid": "0x1256",
         "device_version": "1.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index ada06fdeb8..d639957d66 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index 98cd499b5b..c58770c3ce 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -4,6 +4,9 @@
         "pid": "0x1256",
         "device_version": "1.1.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index d3b012df1a..17f35564b1 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -24,9 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index c0d2528df4..1f3d5c7d61 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -4,6 +4,9 @@
         "pid": "0x2256",
         "device_version": "2.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index a70c25c911..93f5074027 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index fe7973b368..c52dfee400 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,9 @@
         "pid": "0x3256",
         "device_version": "3.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 2d1ab5734a..7674f72876 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -36,9 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index 732623daab..183108825b 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,9 @@
         "pid": "0x4256",
         "device_version": "4.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 7e17330843..9f0bdfc633 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -36,10 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
-
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_DEFAULT_LEVEL 3
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index dda77533e2..495dfb5f5a 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,9 @@
         "pid": "0x5256",
         "device_version": "5.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index e61f1c2875..a07aee024d 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index c7fcfe9c79..930cc7a34d 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,6 +4,9 @@
         "pid": "0x6256",
         "device_version": "6.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index 34899032e7..b78a757344 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index 4d551fd759..f03043a0e7 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,6 +4,9 @@
         "pid": "0x6356",
         "device_version": "6.1.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index 34899032e7..b78a757344 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index 38a90c7b86..2fef279eb3 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,6 +4,9 @@
         "pid": "0x6456",
         "device_version": "6.2.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 3bb2dc7566..112edec592 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index 74767c0d08..b44059ee24 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,6 +4,9 @@
         "pid": "0x7256",
         "device_version": "7.0.0"
     },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu"
 }
-- 
cgit v1.2.3


From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 23 Feb 2023 09:19:00 +1100
Subject: VIA Protocol 12 + fixes (#19916)

Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
---
 keyboards/keebio/iris/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index cfd274cd9a..65d3ac434e 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_HOME,          KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LGUI, FN_MO13, KC_ENT,                    KC_SPC,  FN_MO23, KC_RALT
+                                    KC_LGUI, TL_LOWR, KC_ENT,                    KC_SPC,  TL_UPPR, KC_RALT
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-- 
cgit v1.2.3


From 3bf01bb9ed202b14f78105db2aa2a75d01fc4323 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 23 Feb 2023 09:20:23 +1100
Subject: Move QMK LUFA bootloader config to data driven (#19879)

---
 keyboards/keebio/iris/rev3/config.h  | 4 ----
 keyboards/keebio/iris/rev3/info.json | 6 ++++++
 keyboards/keebio/iris/rev4/config.h  | 4 ----
 keyboards/keebio/iris/rev4/info.json | 6 ++++++
 keyboards/keebio/iris/rev5/config.h  | 4 ----
 keyboards/keebio/iris/rev5/info.json | 6 ++++++
 6 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 93f5074027..17dd3d35e4 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -21,10 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D2, D3, D5, D7, D6 }
 #define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 }
 #define SPLIT_HAND_PIN F0
-#define QMK_ESC_OUTPUT F1
-#define QMK_ESC_INPUT D2
-#define QMK_LED B0
-#define QMK_SPEAKER C6
 
 #define ENCODERS_PAD_A { B5 }
 #define ENCODERS_PAD_B { B7 }
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index c52dfee400..f930160d0f 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,12 @@
         "pid": "0x3256",
         "device_version": "3.0.0"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "D2",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 7674f72876..35d4d59721 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
 #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
-#define QMK_ESC_OUTPUT F1
-#define QMK_ESC_INPUT B1
-#define QMK_LED B0
-#define QMK_SPEAKER C6
 
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index 183108825b..8288b2fdf4 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,12 @@
         "pid": "0x4256",
         "device_version": "4.0.0"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 9f0bdfc633..fcfe3b5b68 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -23,10 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
 #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
-#define QMK_ESC_OUTPUT F1
-#define QMK_ESC_INPUT B1
-#define QMK_LED B0
-#define QMK_SPEAKER C6
 
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 495dfb5f5a..11b8bed530 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,12 @@
         "pid": "0x5256",
         "device_version": "5.0.0"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
-- 
cgit v1.2.3


From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 26 Feb 2023 08:37:57 +1100
Subject: Move backlight config to data driven (#19910)

---
 keyboards/keebio/iris/rev1/config.h      | 3 ---
 keyboards/keebio/iris/rev1/info.json     | 4 ++++
 keyboards/keebio/iris/rev1_led/config.h  | 3 ---
 keyboards/keebio/iris/rev1_led/info.json | 4 ++++
 keyboards/keebio/iris/rev2/config.h      | 3 ---
 keyboards/keebio/iris/rev2/info.json     | 4 ++++
 keyboards/keebio/iris/rev3/config.h      | 3 ---
 keyboards/keebio/iris/rev3/info.json     | 4 ++++
 keyboards/keebio/iris/rev4/config.h      | 3 ---
 keyboards/keebio/iris/rev4/info.json     | 4 ++++
 keyboards/keebio/iris/rev5/config.h      | 2 --
 keyboards/keebio/iris/rev5/info.json     | 4 ++++
 12 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h
index fcb96a3911..436c47ccac 100644
--- a/keyboards/keebio/iris/rev1/config.h
+++ b/keyboards/keebio/iris/rev1/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define BACKLIGHT_PIN D2
-#define BACKLIGHT_LEVELS 5
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
index 788b92a7b4..736b6006b9 100644
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -4,6 +4,10 @@
         "pid": "0x1256",
         "device_version": "1.0.0"
     },
+    "backlight": {
+        "pin": "D2",
+        "levels": 5
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h
index d639957d66..3bd96004be 100644
--- a/keyboards/keebio/iris/rev1_led/config.h
+++ b/keyboards/keebio/iris/rev1_led/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 5
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
index c58770c3ce..e5d71a70b0 100644
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -4,6 +4,10 @@
         "pid": "0x1256",
         "device_version": "1.1.0"
     },
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h
index 17f35564b1..71a5e3ad01 100644
--- a/keyboards/keebio/iris/rev2/config.h
+++ b/keyboards/keebio/iris/rev2/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define BACKLIGHT_PIN B5
-#define BACKLIGHT_LEVELS 5
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index 1f3d5c7d61..7ac3883bb5 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -4,6 +4,10 @@
         "pid": "0x2256",
         "device_version": "2.0.0"
     },
+    "backlight": {
+        "pin": "B5",
+        "levels": 5
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 17dd3d35e4..1834b0573d 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -33,9 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 5
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index f930160d0f..a90be8a1b6 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,10 @@
         "pid": "0x3256",
         "device_version": "3.0.0"
     },
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "D2",
         "esc_output": "F1",
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index 35d4d59721..afac7c80ee 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -37,9 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define BACKLIGHT_PIN B5
-#define BACKLIGHT_LEVELS 5
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 12    // Number of LEDs
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index 8288b2fdf4..6915619b0f 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,10 @@
         "pid": "0x4256",
         "device_version": "4.0.0"
     },
+    "backlight": {
+        "pin": "B5",
+        "levels": 5
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "F1",
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index fcfe3b5b68..086bddd8ce 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -32,8 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define BACKLIGHT_PIN B5
-#define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_DEFAULT_LEVEL 3
 
 /* ws2812 RGB LED */
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index 11b8bed530..c45d09a8df 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,10 @@
         "pid": "0x5256",
         "device_version": "5.0.0"
     },
+    "backlight": {
+        "pin": "B5",
+        "levels": 5
+    },
     "qmk_lufa_bootloader": {
         "esc_input": "B1",
         "esc_output": "F1",
-- 
cgit v1.2.3


From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 26 Feb 2023 09:45:12 +1100
Subject: Move encoder config to data driven (#19923)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/keebio/iris/rev3/config.h   |  3 ---
 keyboards/keebio/iris/rev3/info.json  |  5 +++++
 keyboards/keebio/iris/rev4/config.h   |  5 -----
 keyboards/keebio/iris/rev4/info.json  | 14 +++++++++++++-
 keyboards/keebio/iris/rev5/config.h   |  5 -----
 keyboards/keebio/iris/rev5/info.json  | 14 +++++++++++++-
 keyboards/keebio/iris/rev6/config.h   |  5 -----
 keyboards/keebio/iris/rev6/info.json  |  5 +++++
 keyboards/keebio/iris/rev6a/config.h  |  5 -----
 keyboards/keebio/iris/rev6a/info.json |  5 +++++
 keyboards/keebio/iris/rev6b/config.h  |  5 -----
 keyboards/keebio/iris/rev6b/info.json |  5 +++++
 keyboards/keebio/iris/rev7/config.h   |  5 -----
 keyboards/keebio/iris/rev7/info.json  |  6 ++++++
 14 files changed, 52 insertions(+), 35 deletions(-)

(limited to 'keyboards/keebio/iris')

diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h
index 1834b0573d..932daf4396 100644
--- a/keyboards/keebio/iris/rev3/config.h
+++ b/keyboards/keebio/iris/rev3/config.h
@@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F1, F4, F5, F6, D4, B4 }
 #define SPLIT_HAND_PIN F0
 
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B7 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index a90be8a1b6..0fc9aa4832 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -4,6 +4,11 @@
         "pid": "0x3256",
         "device_version": "3.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B7"}
+        ]
+    },
     "backlight": {
         "pin": "B6",
         "levels": 5
diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h
index afac7c80ee..d1e542d774 100644
--- a/keyboards/keebio/iris/rev4/config.h
+++ b/keyboards/keebio/iris/rev4/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B2 }
-#define ENCODERS_PAD_B { B3 }
-#define ENCODERS_PAD_A_RIGHT { F7 }
-#define ENCODERS_PAD_B_RIGHT { F6 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index 6915619b0f..a0689c0ed4 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -4,6 +4,11 @@
         "pid": "0x4256",
         "device_version": "4.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
     "backlight": {
         "pin": "B5",
         "levels": 5
@@ -15,7 +20,14 @@
         "speaker": "C6"
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F7", "pin_b": "F6"}
+                ]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu"
diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h
index 086bddd8ce..2444970342 100644
--- a/keyboards/keebio/iris/rev5/config.h
+++ b/keyboards/keebio/iris/rev5/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B2 }
-#define ENCODERS_PAD_B { B3 }
-#define ENCODERS_PAD_A_RIGHT { F7 }
-#define ENCODERS_PAD_B_RIGHT { F6 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
index c45d09a8df..8279cdcc2b 100644
--- a/keyboards/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -4,6 +4,11 @@
         "pid": "0x5256",
         "device_version": "5.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
     "backlight": {
         "pin": "B5",
         "levels": 5
@@ -15,7 +20,14 @@
         "speaker": "C6"
     },
     "split": {
-        "soft_serial_pin": "D0"
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F7", "pin_b": "F6"}
+                ]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu"
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index a07aee024d..0c6b1e38f8 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B2 }
-#define ENCODERS_PAD_A_RIGHT { B3 }
-#define ENCODERS_PAD_B_RIGHT { B2 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 930cc7a34d..8470624a31 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -4,6 +4,11 @@
         "pid": "0x6256",
         "device_version": "6.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h
index b78a757344..dd05a6ec3b 100644
--- a/keyboards/keebio/iris/rev6a/config.h
+++ b/keyboards/keebio/iris/rev6a/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B2 }
-#define ENCODERS_PAD_A_RIGHT { B3 }
-#define ENCODERS_PAD_B_RIGHT { B2 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json
index f03043a0e7..027a79f512 100644
--- a/keyboards/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -4,6 +4,11 @@
         "pid": "0x6356",
         "device_version": "6.1.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h
index b78a757344..dd05a6ec3b 100644
--- a/keyboards/keebio/iris/rev6b/config.h
+++ b/keyboards/keebio/iris/rev6b/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B2 }
-#define ENCODERS_PAD_A_RIGHT { B3 }
-#define ENCODERS_PAD_B_RIGHT { B2 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json
index 2fef279eb3..b8d1f076a4 100644
--- a/keyboards/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -4,6 +4,11 @@
         "pid": "0x6456",
         "device_version": "6.2.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h
index 112edec592..906b65b0b2 100644
--- a/keyboards/keebio/iris/rev7/config.h
+++ b/keyboards/keebio/iris/rev7/config.h
@@ -24,11 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B3, F6 }
-#define ENCODERS_PAD_B { B2, F7 }
-#define ENCODERS_PAD_A_RIGHT { B3, F6 }
-#define ENCODERS_PAD_B_RIGHT { B2, F7 }
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index b44059ee24..086f8907a9 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -4,6 +4,12 @@
         "pid": "0x7256",
         "device_version": "7.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2"},
+            {"pin_a": "F6", "pin_b": "F7"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D0"
     },
-- 
cgit v1.2.3