Data-Driven Keyboard Conversions: K, Part 4 (#23567)

14 files changed, 48 insertions, 85 deletions

diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index 639edee28d..768f08275d 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -10,6 +10,15 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "pointing_device": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk
index bfa5252a03..fd5fa4db1a 100755
--- a/keyboards/keyhive/honeycomb/rules.mk
+++ b/keyboards/keyhive/honeycomb/rules.mk
@@ -1,16 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-#MOUSEKEY_ENABLE = yes  # Mouse keys
-POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
 POINTING_DEVICE_DRIVER = custom
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = yes    # Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
 CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
 SRC += matrix.c
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index 2c12fb6bfd..4afdd839d0 100644
--- a/keyboards/keyhive/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
@@ -15,6 +15,11 @@
     "diode_direction": "ROW2COL",
     "processor": "atmega328p",
     "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true
+    },
     "community_layouts": ["60_hhkb"],
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/keyhive/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index b60fe3290a..7b45974829 100644
--- a/keyboards/keyhive/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 12000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-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
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/keyboard.json
index 548d917667..092c2343ab 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/keyboard.json
@@ -9,6 +9,13 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
deleted file mode 100644
index 27b0a2549e..0000000000
--- a/keyboards/keyhive/navi10/rev0/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-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
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/keyboard.json
index 8db97e67b7..2c7b9972df 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/keyboard.json
@@ -9,6 +9,13 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
deleted file mode 100644
index 27b0a2549e..0000000000
--- a/keyboards/keyhive/navi10/rev2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-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
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/keyboard.json
index 82df44e866..5e1b27f7ce 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/keyboard.json
@@ -9,6 +9,13 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/keyhive/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
deleted file mode 100644
index 27b0a2549e..0000000000
--- a/keyboards/keyhive/navi10/rev3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-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
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/keyboard.json
index 61121267d7..9eaf49c2fa 100644
--- a/keyboards/keyhive/uno/rev1/info.json
+++ b/keyboards/keyhive/uno/rev1/keyboard.json
@@ -14,6 +14,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
     "matrix_pins": {
         "direct": [
             ["B6"]
diff --git a/keyboards/keyhive/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
deleted file mode 100644
index 95667aacd7..0000000000
--- a/keyboards/keyhive/uno/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/keyboard.jsono
index 908c254bab..0283c2aa5b 100644
--- a/keyboards/keyhive/uno/rev2/info.json
+++ b/keyboards/keyhive/uno/rev2/keyboard.jsono
@@ -19,6 +19,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "encoder": true
+    },
     "matrix_pins": {
         "direct": [
             ["D0"]
diff --git a/keyboards/keyhive/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
deleted file mode 100644
index 98b5879d7b..0000000000
--- a/keyboards/keyhive/uno/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-ENCODER_ENABLE = yes