12 files changed, 22 insertions, 172 deletions
diff --git a/keyboards/keyhive/uno/config.h b/keyboards/keyhive/uno/config.h
deleted file mode 100644
index 0128ee2d5d..0000000000
--- a/keyboards/keyhive/uno/config.h
+++ /dev/null
@@ -1,21 +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 "config_common.h"
-
-// See rev1/config.h and rev2/config.h to configure your uno.
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/config.h b/keyboards/keyhive/uno/rev1/config.h
index 58d3a58ec2..b706f26ce2 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -15,39 +15,10 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #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
 #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
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
index 69d6dfba0d..2fc258ee42 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -2,5 +2,12 @@
     "keyboard_name": "Uno rev1",
     "usb": {
         "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["B6"]
+        ]
     }
 }
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/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/config.h b/keyboards/keyhive/uno/rev2/config.h
index f53e38b617..e940f5fa05 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -15,27 +15,10 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 
-/* ENCODER */
-#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
 #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
index 787f306351..66e0ca20e0 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -2,5 +2,17 @@
     "keyboard_name": "Uno rev2",
     "usb": {
         "device_version": "0.0.2"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["D0"]
+        ]
     }
 }
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/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/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