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/keyhive/navi10/keymaps/default/keymap.c    | 14 +++++++-------
 keyboards/keyhive/navi10/keymaps/devdev/keymap.c     | 14 +++++++-------
 keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c  | 14 +++++++-------
 keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c  |  2 +-
 keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
index 248e4d50ce..bbf51f56ff 100644
--- a/keyboards/keyhive/navi10/keymaps/default/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c
@@ -33,11 +33,11 @@ enum {
 };
 
 //function to handle all the tap dances
-int cur_dance(qk_tap_dance_state_t *state);
+int cur_dance(tap_dance_state_t *state);
 
 //functions for each tap dance
-void tk_finished(qk_tap_dance_state_t *state, void *user_data);
-void tk_reset(qk_tap_dance_state_t *state, void *user_data);
+void tk_finished(tap_dance_state_t *state, void *user_data);
+void tk_reset(tap_dance_state_t *state, void *user_data);
 
 #define INDICATOR_LED   B5
 
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 //determine the current tap dance state
-int cur_dance (qk_tap_dance_state_t *state){
+int cur_dance (tap_dance_state_t *state){
     if(state->count == 1){
         //if a tap was registered
         if(!state->pressed){
@@ -88,7 +88,7 @@ static tap tk_tap_state = {
 };
 
 //functions that control what our tap dance key does
-void tk_finished(qk_tap_dance_state_t *state, void *user_data){
+void tk_finished(tap_dance_state_t *state, void *user_data){
     tk_tap_state.state = cur_dance(state);
     switch(tk_tap_state.state){
         case SINGLE_TAP:
@@ -116,7 +116,7 @@ void tk_finished(qk_tap_dance_state_t *state, void *user_data){
     }
 }
 
-void tk_reset(qk_tap_dance_state_t *state, void *user_data){
+void tk_reset(tap_dance_state_t *state, void *user_data){
     //if held and released, leave the layer
     if(tk_tap_state.state == SINGLE_HOLD){
         layer_off(_FN0);
@@ -126,6 +126,6 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 }
 
 //associate the tap dance key with its functionality
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/keyhive/navi10/keymaps/devdev/keymap.c b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
index 0fc20cbbd4..36a76c50ce 100644
--- a/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
@@ -67,11 +67,11 @@ enum custom_keycodes { // git macros
 };
 
 //function to handle all the tap dances
-int cur_dance(qk_tap_dance_state_t *state);
+int cur_dance(tap_dance_state_t *state);
 
 //functions for each tap dance
-void tk_finished(qk_tap_dance_state_t *state, void *user_data);
-void tk_reset(qk_tap_dance_state_t *state, void *user_data);
+void tk_finished(tap_dance_state_t *state, void *user_data);
+void tk_reset(tap_dance_state_t *state, void *user_data);
 
 // define the macros in here 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 //determine the current tap dance state
-int cur_dance (qk_tap_dance_state_t *state){
+int cur_dance (tap_dance_state_t *state){
     if(state->count == 1)
     {
         //if a tap was registered
@@ -203,7 +203,7 @@ static tap tk_tap_state = {
 };
 
 //functions that control what our tap dance key does
-void tk_finished(qk_tap_dance_state_t *state, void *user_data){
+void tk_finished(tap_dance_state_t *state, void *user_data){
     tk_tap_state.state = cur_dance(state);
 	uint8_t val = rgblight_get_val();
     switch(tk_tap_state.state){
@@ -246,7 +246,7 @@ void tk_finished(qk_tap_dance_state_t *state, void *user_data){
     }
 }
 
-void tk_reset(qk_tap_dance_state_t *state, void *user_data){
+void tk_reset(tap_dance_state_t *state, void *user_data){
     //if held and released, leave the layer
     if(tk_tap_state.state == SINGLE_HOLD){
         layer_off(_GI4);
@@ -258,6 +258,6 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 }
 
 //associate the tap dance key with its functionality
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
index 11ac082392..4e15dc3c46 100644
--- a/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
@@ -34,11 +34,11 @@ enum {
 };
 
 //function to handle all the tap dances
-int cur_dance(qk_tap_dance_state_t *state);
+int cur_dance(tap_dance_state_t *state);
 
 //functions for each tap dance
-void tk_finished(qk_tap_dance_state_t *state, void *user_data);
-void tk_reset(qk_tap_dance_state_t *state, void *user_data);
+void tk_finished(tap_dance_state_t *state, void *user_data);
+void tk_reset(tap_dance_state_t *state, void *user_data);
 
 #define INDICATOR_LED   B5
 #define TX_LED          D5
@@ -85,7 +85,7 @@ void matrix_init_user(void) {
 }
 
 //determine the current tap dance state
-int cur_dance (qk_tap_dance_state_t *state){
+int cur_dance (tap_dance_state_t *state){
     if(state->count == 1){
         //if a tap was registered
         if(!state->pressed){
@@ -114,7 +114,7 @@ static tap tk_tap_state = {
 };
 
 //functions that control what our tap dance key does
-void tk_finished(qk_tap_dance_state_t *state, void *user_data){
+void tk_finished(tap_dance_state_t *state, void *user_data){
     tk_tap_state.state = cur_dance(state);
     switch(tk_tap_state.state){
         case SINGLE_TAP:
@@ -166,7 +166,7 @@ void tk_finished(qk_tap_dance_state_t *state, void *user_data){
     }
 }
 
-void tk_reset(qk_tap_dance_state_t *state, void *user_data){
+void tk_reset(tap_dance_state_t *state, void *user_data){
     //if held and released, leave the layer
     if(tk_tap_state.state == SINGLE_HOLD){
         layer_off(_FN0);
@@ -177,6 +177,6 @@ void tk_reset(qk_tap_dance_state_t *state, void *user_data){
 
 
 //associate the tap dance key with its functionality
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TAPPY_KEY] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tk_finished, tk_reset)
 };
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
index 6671cb43f8..28eda8e6b6 100644
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
@@ -89,6 +89,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      ),
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_PLAY_DO_NOT_DISTURB] = ACTION_TAP_DANCE_DOUBLE(KC_MPLY, KC_F6)
 };
\ No newline at end of file
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
index fbaf592d22..9d1780b161 100644
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
@@ -30,7 +30,7 @@ enum tapdance {
     TD_APP_CAPS_LOCK,
 };
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     [TD_SINGLE_QUOTE_DOUBLE_QUOTES] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO),
     [TD_APP_CAPS_LOCK]              = ACTION_TAP_DANCE_DOUBLE(KC_APP, KC_CAPS),
 };
-- 
cgit v1.2.3


From 801d2ff940a5f19ee4fa7df992e86d1fd1daf610 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 30 Dec 2022 11:48:05 +1100
Subject: Remove useless line continuations (#19399)

---
 .../keyhive/southpole/keymaps/foobeard/keymap.c      | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
index 356938cac6..3d8fda20a3 100644
--- a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
@@ -41,11 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
 	*/
     [_QWERTY] = LAYOUT( 
-		KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DELETE, KC_INS, \
-		KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_VOLU, \
-		KC_P4, KC_P5, KC_P6, KC_PENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_VOLD, \
-		KC_P1, KC_P2, KC_P3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MUTE, \
-		KC_P0, KC_PDOT,      KC_LCTL, KC_LGUI, KC_LALT,                              KC_SPC,              RAISE, KC_LEFT, KC_DOWN, KC_RGHT \
+		KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DELETE, KC_INS,
+		KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_VOLU,
+		KC_P4, KC_P5, KC_P6, KC_PENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_VOLD,
+		KC_P1, KC_P2, KC_P3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MUTE,
+		KC_P0, KC_PDOT,      KC_LCTL, KC_LGUI, KC_LALT,                              KC_SPC,              RAISE, KC_LEFT, KC_DOWN, KC_RGHT
 	),
 
 	/*layer 1, function layer
@@ -63,10 +63,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	*/
 
 	[_RAISE] = LAYOUT( 
-		QK_BOOT, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_CALC, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+		QK_BOOT, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_CALC,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 	)
 };
\ No newline at end of file
-- 
cgit v1.2.3


From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 10 Jan 2023 13:48:20 +1100
Subject: Migrate `LAYOUTS` to data driven (#19541)

* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
---
 keyboards/keyhive/ergosaurus/info.json | 1 +
 keyboards/keyhive/ergosaurus/rules.mk  | 2 --
 keyboards/keyhive/lattice60/info.json  | 1 +
 keyboards/keyhive/lattice60/rules.mk   | 2 --
 keyboards/keyhive/maypad/info.json     | 1 +
 keyboards/keyhive/maypad/rules.mk      | 2 --
 6 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index dba344f15c..5556c9127a 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -7,6 +7,7 @@
         "pid": "0xE590",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["alice_split_bs"],
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
diff --git a/keyboards/keyhive/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk
index a00db322a6..33d28b3a89 100644
--- a/keyboards/keyhive/ergosaurus/rules.mk
+++ b/keyboards/keyhive/ergosaurus/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = alice_split_bs
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index e7d22d1a77..81e125c5cb 100644
--- a/keyboards/keyhive/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
@@ -8,6 +8,7 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["60_hhkb"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index 8539f9f439..fc52b05ed7 100644
--- a/keyboards/keyhive/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
@@ -19,5 +19,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = 60_hhkb
diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json
index 3001bae5b5..638394f99b 100644
--- a/keyboards/keyhive/maypad/info.json
+++ b/keyboards/keyhive/maypad/info.json
@@ -8,6 +8,7 @@
         "pid": "0x4D50",
         "device_version": "0.0.1"
     },
+    "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk
index dac8a75963..33d28b3a89 100644
--- a/keyboards/keyhive/maypad/rules.mk
+++ b/keyboards/keyhive/maypad/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = ortho_5x4 numpad_5x4
-- 
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/keyhive/absinthe/config.h   | 4 ----
 keyboards/keyhive/ergosaurus/config.h | 4 ----
 keyboards/keyhive/maypad/config.h     | 6 ------
 3 files changed, 14 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index fbcb0766a0..8b4b3735bd 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -47,10 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 32
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 52df423539..60afa08957 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -46,10 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN B6
    #define RGBLED_NUM 32
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index ef8db88700..95bb478675 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
 //   #define RGBLED_NUM 16
@@ -67,8 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-- 
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/keyhive/absinthe/config.h    | 1 -
 keyboards/keyhive/ergosaurus/config.h  | 1 -
 keyboards/keyhive/honeycomb/config.h   | 1 -
 keyboards/keyhive/lattice60/config.h   | 1 -
 keyboards/keyhive/maypad/config.h      | 1 -
 keyboards/keyhive/navi10/rev0/config.h | 1 -
 keyboards/keyhive/navi10/rev2/config.h | 1 -
 keyboards/keyhive/navi10/rev3/config.h | 1 -
 keyboards/keyhive/opus/config.h        | 1 -
 keyboards/keyhive/smallice/config.h    | 1 -
 keyboards/keyhive/southpole/config.h   | 1 -
 keyboards/keyhive/uno/config.h         | 1 -
 keyboards/keyhive/uno/rev1/config.h    | 1 -
 keyboards/keyhive/uno/rev2/config.h    | 1 -
 keyboards/keyhive/ut472/config.h       | 1 -
 15 files changed, 15 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 8b4b3735bd..812cb241ec 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 9
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 60afa08957..b346b63025 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 9
diff --git a/keyboards/keyhive/honeycomb/config.h b/keyboards/keyhive/honeycomb/config.h
index 979d41f108..7db3b794e1 100755
--- a/keyboards/keyhive/honeycomb/config.h
+++ b/keyboards/keyhive/honeycomb/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 1
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index e72a6ab6b3..bdd81ccd69 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 8
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 95bb478675..72601ae201 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -14,7 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 3d64b02771..15a7a794e8 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 8d3217d65c..4908f26cfa 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 7336abb6d6..5bf73a520a 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index 5f7f279346..5c02821e94 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index ac1faede6d..0ec26f0503 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 57555fa95b..4de88c9311 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-//#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/keyhive/uno/config.h b/keyboards/keyhive/uno/config.h
index 0128ee2d5d..23393558de 100644
--- a/keyboards/keyhive/uno/config.h
+++ b/keyboards/keyhive/uno/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-#include "config_common.h"
 
 // See rev1/config.h and rev2/config.h to configure your uno.
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 58d3a58ec2..179a68e5e5 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -15,7 +15,6 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index f53e38b617..a393f5c75d 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -15,7 +15,6 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index dce99f3882..16b10e6932 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 4
-- 
cgit v1.2.3


From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 31 Jan 2023 07:45:41 +1100
Subject: Clean up Force NKRO in config.h (#19718)

---
 keyboards/keyhive/ergosaurus/config.h | 21 ---------------------
 keyboards/keyhive/lattice60/config.h  | 21 ---------------------
 keyboards/keyhive/maypad/config.h     | 21 ---------------------
 3 files changed, 63 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index b346b63025..0b1785ba83 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -86,27 +86,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
 
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index bdd81ccd69..f76456119c 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -51,27 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
 
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 72601ae201..dd1e433e27 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -72,27 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
 
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
-- 
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/keyhive/absinthe/config.h   | 3 ---
 keyboards/keyhive/ergosaurus/config.h | 3 ---
 keyboards/keyhive/maypad/config.h     | 3 ---
 keyboards/keyhive/smallice/config.h   | 3 ---
 keyboards/keyhive/ut472/config.h      | 3 ---
 5 files changed, 15 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 812cb241ec..b32caa0075 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -74,9 +74,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* 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/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 0b1785ba83..917605a351 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -73,9 +73,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* 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/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index dd1e433e27..993658ef30 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -59,9 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* 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/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 0ec26f0503..e0d03308ea 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -67,9 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 16b10e6932..6544a4d163 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-- 
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/keyhive/absinthe/config.h    | 3 ---
 keyboards/keyhive/ergosaurus/config.h  | 3 ---
 keyboards/keyhive/lattice60/config.h   | 3 ---
 keyboards/keyhive/maypad/config.h      | 3 ---
 keyboards/keyhive/navi10/rev0/config.h | 3 ---
 keyboards/keyhive/navi10/rev2/config.h | 3 ---
 keyboards/keyhive/navi10/rev3/config.h | 3 ---
 keyboards/keyhive/opus/config.h        | 3 ---
 keyboards/keyhive/smallice/config.h    | 3 ---
 keyboards/keyhive/southpole/config.h   | 3 ---
 keyboards/keyhive/uno/rev1/config.h    | 3 ---
 keyboards/keyhive/uno/rev2/config.h    | 3 ---
 keyboards/keyhive/ut472/config.h       | 3 ---
 13 files changed, 39 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index b32caa0075..58fea1d7ba 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -71,9 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 917605a351..a6b0b13758 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -70,9 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
  #endif
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index f76456119c..c63f55f463 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 993658ef30..72ab682b86 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -56,9 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 // #endif
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 15a7a794e8..61f46f5740 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 4908f26cfa..8cd6d1c850 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 5bf73a520a..0ec9c62173 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index 5c02821e94..1afb831f7d 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -27,9 +27,6 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* 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/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index e0d03308ea..c9a3ac1ff1 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -64,9 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 4de88c9311..9d4bad155c 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -12,9 +12,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 179a68e5e5..1d5b265ade 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -47,6 +47,3 @@
 //   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
 //   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 // #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index a393f5c75d..1a03c19ead 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -35,6 +35,3 @@
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 1
 #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 6544a4d163..7517d51d4e 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -29,9 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-- 
cgit v1.2.3


From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 6 Feb 2023 13:40:23 +1100
Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752)

---
 keyboards/keyhive/ergosaurus/config.h | 5 -----
 keyboards/keyhive/lattice60/config.h  | 5 -----
 keyboards/keyhive/maypad/config.h     | 5 -----
 3 files changed, 15 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index a6b0b13758..f352910e1d 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -75,11 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index c63f55f463..e7a690e7df 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 72ab682b86..af79e4594b 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -61,11 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
-- 
cgit v1.2.3


From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 7 Feb 2023 11:05:37 +1100
Subject: Remove unused Bootmagic row/col defines from config.h (#19761)

---
 keyboards/keyhive/ergosaurus/config.h | 4 ----
 keyboards/keyhive/maypad/config.h     | 4 ----
 keyboards/keyhive/smallice/config.h   | 4 ----
 3 files changed, 12 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index f352910e1d..d43bfac458 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -90,7 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index af79e4594b..cd18abb2d0 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -76,7 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-// #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index c9a3ac1ff1..f95cb45444 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -63,7 +63,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
 //#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-- 
cgit v1.2.3


From 8d6bf19fc78fe372cd42486718d753f342895d2f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 8 Feb 2023 01:46:51 +1100
Subject: Remove unused `SOFT_SERIAL_PIN` from config.h (#19768)

---
 keyboards/keyhive/absinthe/config.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index 58fea1d7ba..d67bc09240 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
 #define RGB_DI_PIN B0
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 32
-- 
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/keyhive/absinthe/info.json    | 2 ++
 keyboards/keyhive/absinthe/rules.mk     | 6 ------
 keyboards/keyhive/ergosaurus/info.json  | 2 ++
 keyboards/keyhive/ergosaurus/rules.mk   | 6 ------
 keyboards/keyhive/honeycomb/info.json   | 2 ++
 keyboards/keyhive/honeycomb/rules.mk    | 6 ------
 keyboards/keyhive/lattice60/info.json   | 2 ++
 keyboards/keyhive/lattice60/rules.mk    | 6 ------
 keyboards/keyhive/maypad/info.json      | 2 ++
 keyboards/keyhive/maypad/rules.mk       | 6 ------
 keyboards/keyhive/navi10/rev0/info.json | 4 +++-
 keyboards/keyhive/navi10/rev0/rules.mk  | 6 ------
 keyboards/keyhive/navi10/rev2/info.json | 4 +++-
 keyboards/keyhive/navi10/rev2/rules.mk  | 6 ------
 keyboards/keyhive/navi10/rev3/info.json | 4 +++-
 keyboards/keyhive/navi10/rev3/rules.mk  | 6 ------
 keyboards/keyhive/opus/info.json        | 2 ++
 keyboards/keyhive/opus/rules.mk         | 6 ------
 keyboards/keyhive/smallice/info.json    | 2 ++
 keyboards/keyhive/smallice/rules.mk     | 6 ------
 keyboards/keyhive/southpole/info.json   | 2 ++
 keyboards/keyhive/southpole/rules.mk    | 6 ------
 keyboards/keyhive/uno/rev1/info.json    | 4 +++-
 keyboards/keyhive/uno/rev1/rules.mk     | 6 ------
 keyboards/keyhive/uno/rev2/info.json    | 4 +++-
 keyboards/keyhive/uno/rev2/rules.mk     | 6 ------
 keyboards/keyhive/ut472/info.json       | 2 ++
 keyboards/keyhive/ut472/rules.mk        | 6 ------
 28 files changed, 33 insertions(+), 89 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index ed20471a3e..7739f4f171 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -8,6 +8,8 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/keyhive/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk
index 5b1bf3cdf3..5d5924f767 100644
--- a/keyboards/keyhive/absinthe/rules.mk
+++ b/keyboards/keyhive/absinthe/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/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 5556c9127a..872ba2d76b 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -7,6 +7,8 @@
         "pid": "0xE590",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "community_layouts": ["alice_split_bs"],
     "layouts": {
         "LAYOUT_alice_split_bs": {
diff --git a/keyboards/keyhive/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk
index 33d28b3a89..309e55c9f4 100644
--- a/keyboards/keyhive/ergosaurus/rules.mk
+++ b/keyboards/keyhive/ergosaurus/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/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index e4be081425..693b836ede 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -8,6 +8,8 @@
         "pid": "0xACC8",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk
index 420e409e43..040710a460 100755
--- a/keyboards/keyhive/honeycomb/rules.mk
+++ b/keyboards/keyhive/honeycomb/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/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index 81e125c5cb..345bd4b8e1 100644
--- a/keyboards/keyhive/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
@@ -8,6 +8,8 @@
         "pid": "0x27DB",
         "device_version": "0.0.1"
     },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
     "community_layouts": ["60_hhkb"],
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index fc52b05ed7..b60fe3290a 100644
--- a/keyboards/keyhive/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Processor frequency
 F_CPU = 12000000
 
diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json
index 638394f99b..be72cb07f9 100644
--- a/keyboards/keyhive/maypad/info.json
+++ b/keyboards/keyhive/maypad/info.json
@@ -8,6 +8,8 @@
         "pid": "0x4D50",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "community_layouts": ["ortho_5x4", "numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk
index 33d28b3a89..309e55c9f4 100644
--- a/keyboards/keyhive/maypad/rules.mk
+++ b/keyboards/keyhive/maypad/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/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
index 90ac25f360..e1dda21feb 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -1,5 +1,7 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
index 52a1cbb711..27b0a2549e 100644
--- a/keyboards/keyhive/navi10/rev0/rules.mk
+++ b/keyboards/keyhive/navi10/rev0/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/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
index e557e4d307..1b44b7d70f 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -1,5 +1,7 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
index 52a1cbb711..27b0a2549e 100644
--- a/keyboards/keyhive/navi10/rev2/rules.mk
+++ b/keyboards/keyhive/navi10/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/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
index b377cdff00..2d7d9f1f84 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -1,5 +1,7 @@
 {
     "usb": {
         "device_version": "0.0.3"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
index 52a1cbb711..27b0a2549e 100644
--- a/keyboards/keyhive/navi10/rev3/rules.mk
+++ b/keyboards/keyhive/navi10/rev3/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/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json
index 422ede053f..f3ce5cec58 100644
--- a/keyboards/keyhive/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
@@ -7,6 +7,8 @@
         "pid": "0x4F50",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/opus/rules.mk b/keyboards/keyhive/opus/rules.mk
index 515ca5621f..ab2c49da70 100644
--- a/keyboards/keyhive/opus/rules.mk
+++ b/keyboards/keyhive/opus/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/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 5eb8d0a42d..39bdd4d09a 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
@@ -8,6 +8,8 @@
         "pid": "0x5341",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"V+", "x":0.5, "y":0}, {"label":"Tab", "x":1.75, "y":0}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"[ {", "x":13.25, "y":0}, {"label":"] }", "x":14.25, "y":0}, {"label":"Bcsp", "x":15.25, "y":0}, {"label":"V-", "x":0.25, "y":1}, {"label":"Caps", "x":1.5, "y":1, "w":1.25}, {"label":"A", "x":2.75, "y":1}, {"label":"S", "x":3.75, "y":1}, {"label":"D", "x":4.75, "y":1}, {"label":"F", "x":5.75, "y":1}, {"label":"G", "x":6.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":": ;", "x":12.75, "y":1}, {"label":", \"", "x":13.75, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.75}, {"label":"V-", "x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.5, "y":2}, {"label":"N", "x":9.5, "y":2}, {"label":"M", "x":10.5, "y":2}, {"label":"<", "x":11.5, "y":2}, {"label":">", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"label":"Up", "x":14.75, "y":2}, {"label":"?", "x":15.75, "y":2}, {"label":"Ctrl", "x":1.25, "y":3}, {"label":"Alt", "x":3, "y":3, "w":1.25}, {"x":4.25, "y":3, "w":2}, {"label":"Win", "x":6.25, "y":3}, {"x":9.5, "y":3, "w":2.75}, {"label":"Fn", "x":12.25, "y":3}, {"label":"left", "x":13.75, "y":3}, {"label":"down", "x":14.75, "y":3}, {"label":"right", "x":15.75, "y":3}]
diff --git a/keyboards/keyhive/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk
index 1f52c37154..2eba275490 100644
--- a/keyboards/keyhive/smallice/rules.mk
+++ b/keyboards/keyhive/smallice/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/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json
index 1091c51911..0c06a2be3b 100644
--- a/keyboards/keyhive/southpole/info.json
+++ b/keyboards/keyhive/southpole/info.json
@@ -8,6 +8,8 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/keyhive/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk
index 278ee36f23..e3ebdd5cf3 100644
--- a/keyboards/keyhive/southpole/rules.mk
+++ b/keyboards/keyhive/southpole/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = halfkay
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 69d6dfba0d..6038321e52 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Uno rev1",
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
index 7180be7497..95667aacd7 100644
--- a/keyboards/keyhive/uno/rev1/rules.mk
+++ b/keyboards/keyhive/uno/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/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 787f306351..811d052ac3 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "Uno rev2",
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
index 1ce2738442..98b5879d7b 100644
--- a/keyboards/keyhive/uno/rev2/rules.mk
+++ b/keyboards/keyhive/uno/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/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json
index e1ea825650..de93aeef6d 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
@@ -8,6 +8,8 @@
     "pid": "0x0472",
     "device_version": "0.0.2"
   },
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}]
diff --git a/keyboards/keyhive/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk
index 9c7d75a344..9ebb40efd6 100644
--- a/keyboards/keyhive/ut472/rules.mk
+++ b/keyboards/keyhive/ut472/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u2
-
-# 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/keyhive/ergosaurus/config.h |  5 -----
 keyboards/keyhive/maypad/config.h     |  5 -----
 keyboards/keyhive/uno/config.h        | 20 --------------------
 3 files changed, 30 deletions(-)
 delete mode 100644 keyboards/keyhive/uno/config.h

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index d43bfac458..a55c877bc3 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -40,11 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN B6
    #define RGBLED_NUM 32
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index cd18abb2d0..72fa093e9c 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -35,11 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
 //   #define RGBLED_NUM 16
diff --git a/keyboards/keyhive/uno/config.h b/keyboards/keyhive/uno/config.h
deleted file mode 100644
index 23393558de..0000000000
--- a/keyboards/keyhive/uno/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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
-
-
-// See rev1/config.h and rev2/config.h to configure your uno.
-- 
cgit v1.2.3


From 11d49d00e74618500e5c51e4c7f858eb906ccea8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 11 Feb 2023 03:47:17 +0000
Subject: Remove matrix_init_quantum/matrix_scan_quantum (#19806)

---
 keyboards/keyhive/honeycomb/matrix.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c
index c8a7992ec5..64008228af 100755
--- a/keyboards/keyhive/honeycomb/matrix.c
+++ b/keyboards/keyhive/honeycomb/matrix.c
@@ -53,16 +53,6 @@ static matrix_row_t matrix[MATRIX_ROWS];
 //extern int8_t encoderValue;
 int8_t encoderValue = 0;
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -93,7 +83,7 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
 
-    matrix_init_quantum();
+    matrix_init_kb();
     uart_init(1000000);
 }
 
@@ -168,7 +158,7 @@ uint8_t matrix_scan(void)
         xprintf("\r\nRequested packet, data 3 was %d",uart_data[3]);
     }
 
-    matrix_scan_quantum();
+    matrix_scan_kb();
     return 1;
 }
 
-- 
cgit v1.2.3


From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 14 Feb 2023 18:39:41 +1100
Subject: Migrate `DIRECT_PINS` to data driven (#19826)

---
 keyboards/keyhive/uno/rev1/config.h  | 9 ---------
 keyboards/keyhive/uno/rev1/info.json | 7 ++++++-
 keyboards/keyhive/uno/rev2/config.h  | 9 ---------
 keyboards/keyhive/uno/rev2/info.json | 7 ++++++-
 4 files changed, 12 insertions(+), 20 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 1d5b265ade..7c5e60fdc8 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -18,15 +18,6 @@
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { B6 } \
-}
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN F6
 #define RGBLED_NUM 1
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 6038321e52..2fc258ee42 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -4,5 +4,10 @@
         "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["B6"]
+        ]
+    }
 }
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 1a03c19ead..b9e3a70286 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -22,15 +22,6 @@
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { D0 } \
-}
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 1
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 811d052ac3..2ea14e8aeb 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -4,5 +4,10 @@
         "device_version": "0.0.2"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D0"]
+        ]
+    }
 }
-- 
cgit v1.2.3


From 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 08:13:41 +1100
Subject: Remove unused RGBLight defines from config.h (#19859)

---
 keyboards/keyhive/absinthe/config.h   |  6 ------
 keyboards/keyhive/ergosaurus/config.h |  6 ------
 keyboards/keyhive/maypad/config.h     | 16 ----------------
 keyboards/keyhive/smallice/config.h   |  6 ------
 keyboards/keyhive/uno/rev1/config.h   | 16 ----------------
 5 files changed, 50 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index d67bc09240..dcdcaaa12b 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -58,12 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index a55c877bc3..4f3bb7681f 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -57,12 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //   #define RGBLIGHT_EFFECT_RGB_TEST
 //   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
  #endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index 72fa093e9c..bae033cb36 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -35,22 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
-
 /* 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/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index f95cb45444..7edff95279 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -56,10 +56,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_RGB_TEST
 #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 7c5e60fdc8..b706f26ce2 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -22,19 +22,3 @@
 #define RGB_DI_PIN F6
 #define RGBLED_NUM 1
 #endif
-
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 32
-//   #define RGBLIGHT_SAT_STEP 32
-//   #define RGBLIGHT_VAL_STEP 32
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
-- 
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/keyhive/absinthe/config.h    | 4 ----
 keyboards/keyhive/ergosaurus/config.h  | 4 ----
 keyboards/keyhive/lattice60/config.h   | 4 ----
 keyboards/keyhive/maypad/config.h      | 4 ----
 keyboards/keyhive/navi10/rev0/config.h | 4 ----
 keyboards/keyhive/navi10/rev2/config.h | 4 ----
 keyboards/keyhive/navi10/rev3/config.h | 4 ----
 keyboards/keyhive/opus/config.h        | 4 ----
 keyboards/keyhive/smallice/config.h    | 4 ----
 keyboards/keyhive/southpole/config.h   | 4 ----
 keyboards/keyhive/ut472/config.h       | 4 ----
 11 files changed, 44 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index dcdcaaa12b..e8e33187d9 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 9
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 4f3bb7681f..6bd579b332 100644
--- a/keyboards/keyhive/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/keyhive/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index e7a690e7df..345dfa5c2e 100644
--- a/keyboards/keyhive/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index bae033cb36..2922e9ef12 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -15,10 +15,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 61f46f5740..d6129ce2ed 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
-
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS \
     { B6, B2, B3, B4 }
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 8cd6d1c850..0b7c4cf002 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
-
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS \
     { B6, B2, B3, B4 }
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 0ec9c62173..93ce1cdc42 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
-
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS \
     { B6, B2, B3, B4 }
diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index 1afb831f7d..42cc507df9 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* PCB pin-out */
 #define MATRIX_ROW_PINS {B1, B3, B2, B6}
 #define MATRIX_COL_PINS {D1, D0, D4, C6, D7, E6, B4, B5, F4, F5, F6, F7}
diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 7edff95279..b3114e4011 100644
--- a/keyboards/keyhive/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 15
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 9d4bad155c..91718d741f 100644
--- a/keyboards/keyhive/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 20
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D3, C6, C7, D5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, E6 }
diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h
index 7517d51d4e..5e00d17106 100644
--- a/keyboards/keyhive/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C4, C5, B7, B6, B5, B4, B3, B2, B1, B0, D6, D5 }
-- 
cgit v1.2.3


From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 19 Feb 2023 18:55:12 +1100
Subject: Move layouts for direct_pins boards to data driven (#19872)

---
 keyboards/keyhive/uno/info.json   |  4 +++-
 keyboards/keyhive/uno/rev1/rev1.h | 25 -------------------------
 keyboards/keyhive/uno/rev2/rev2.h | 25 -------------------------
 keyboards/keyhive/uno/uno.c       | 17 -----------------
 keyboards/keyhive/uno/uno.h       | 25 -------------------------
 5 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 keyboards/keyhive/uno/rev1/rev1.h
 delete mode 100644 keyboards/keyhive/uno/rev2/rev2.h
 delete mode 100644 keyboards/keyhive/uno/uno.c
 delete mode 100644 keyboards/keyhive/uno/uno.h

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/uno/info.json b/keyboards/keyhive/uno/info.json
index 9d39163a1b..9c239fc5ea 100644
--- a/keyboards/keyhive/uno/info.json
+++ b/keyboards/keyhive/uno/info.json
@@ -8,7 +8,9 @@
     },
     "layouts": {
       "LAYOUT": {
-        "layout": [ {"x": 0, "y": 0 }]
+        "layout": [
+          {"x": 0, "y": 0, "matrix": [0, 0]}
+        ]
       }
     }
   }
diff --git a/keyboards/keyhive/uno/rev1/rev1.h b/keyboards/keyhive/uno/rev1/rev1.h
deleted file mode 100644
index 691bdd1dc3..0000000000
--- a/keyboards/keyhive/uno/rev1/rev1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00  \
-) { \
-  { K00 } \
-}
diff --git a/keyboards/keyhive/uno/rev2/rev2.h b/keyboards/keyhive/uno/rev2/rev2.h
deleted file mode 100644
index 691bdd1dc3..0000000000
--- a/keyboards/keyhive/uno/rev2/rev2.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K00  \
-) { \
-  { K00 } \
-}
diff --git a/keyboards/keyhive/uno/uno.c b/keyboards/keyhive/uno/uno.c
deleted file mode 100644
index 5ffb28865b..0000000000
--- a/keyboards/keyhive/uno/uno.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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/>.
- */
-
-#include "uno.h"
diff --git a/keyboards/keyhive/uno/uno.h b/keyboards/keyhive/uno/uno.h
deleted file mode 100644
index e25dc25f73..0000000000
--- a/keyboards/keyhive/uno/uno.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Snipeye
- *
- * 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
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_keyhive_uno_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_keyhive_uno_rev2)
-#    include "rev2.h"
-#endif
-- 
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/keyhive/absinthe/config.h  | 3 ---
 keyboards/keyhive/absinthe/info.json | 5 +++++
 keyboards/keyhive/uno/rev2/config.h  | 4 ----
 keyboards/keyhive/uno/rev2/info.json | 5 +++++
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'keyboards/keyhive')

diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index e8e33187d9..0c7fe33f6b 100644
--- a/keyboards/keyhive/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { D2, D1, B6, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 }
 
-#define ENCODERS_PAD_A { B7 }
-#define ENCODERS_PAD_B { D5 }
-
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index 7739f4f171..336707f239 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
@@ -8,6 +8,11 @@
         "pid": "0xFEED",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B7", "pin_b": "D5"}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index b9e3a70286..e940f5fa05 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -18,10 +18,6 @@
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
-/* ENCODER */
-#define ENCODERS_PAD_A { B2 }
-#define ENCODERS_PAD_B { B3 }
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D1
 #define RGBLED_NUM 1
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 2ea14e8aeb..66e0ca20e0 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {
-- 
cgit v1.2.3