aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keyhive
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyhive')
-rw-r--r--keyboards/keyhive/absinthe/keyboard.json (renamed from keyboards/keyhive/absinthe/info.json)10
-rw-r--r--keyboards/keyhive/absinthe/rules.mk14
-rw-r--r--keyboards/keyhive/ergosaurus/keyboard.json (renamed from keyboards/keyhive/ergosaurus/info.json)8
-rw-r--r--keyboards/keyhive/ergosaurus/rules.mk12
-rwxr-xr-xkeyboards/keyhive/honeycomb/honeycomb.c12
-rwxr-xr-xkeyboards/keyhive/honeycomb/honeycomb.h12
-rw-r--r--keyboards/keyhive/honeycomb/keyboard.json (renamed from keyboards/keyhive/honeycomb/info.json)9
-rwxr-xr-xkeyboards/keyhive/honeycomb/rules.mk11
-rw-r--r--keyboards/keyhive/lattice60/keyboard.json (renamed from keyboards/keyhive/lattice60/info.json)5
-rw-r--r--keyboards/keyhive/lattice60/lattice60.c6
-rw-r--r--keyboards/keyhive/lattice60/rules.mk13
-rw-r--r--keyboards/keyhive/maypad/keyboard.json (renamed from keyboards/keyhive/maypad/info.json)8
-rw-r--r--keyboards/keyhive/maypad/rules.mk12
-rw-r--r--keyboards/keyhive/navi10/rev0/keyboard.json (renamed from keyboards/keyhive/navi10/rev0/info.json)7
-rw-r--r--keyboards/keyhive/navi10/rev0/rev0.c4
-rw-r--r--keyboards/keyhive/navi10/rev0/rules.mk12
-rw-r--r--keyboards/keyhive/navi10/rev2/keyboard.json (renamed from keyboards/keyhive/navi10/rev2/info.json)7
-rw-r--r--keyboards/keyhive/navi10/rev2/rev2.c4
-rw-r--r--keyboards/keyhive/navi10/rev2/rules.mk12
-rw-r--r--keyboards/keyhive/navi10/rev3/keyboard.json (renamed from keyboards/keyhive/navi10/rev3/info.json)7
-rw-r--r--keyboards/keyhive/navi10/rev3/rev3.c4
-rw-r--r--keyboards/keyhive/navi10/rev3/rules.mk12
-rw-r--r--keyboards/keyhive/opus/keyboard.json (renamed from keyboards/keyhive/opus/info.json)8
-rw-r--r--keyboards/keyhive/opus/rules.mk12
-rw-r--r--keyboards/keyhive/smallice/keyboard.json (renamed from keyboards/keyhive/smallice/info.json)9
-rw-r--r--keyboards/keyhive/smallice/rules.mk12
-rw-r--r--keyboards/keyhive/southpole/keyboard.json (renamed from keyboards/keyhive/southpole/info.json)8
-rw-r--r--keyboards/keyhive/southpole/rules.mk12
-rw-r--r--keyboards/keyhive/uno/rev1/keyboard.json (renamed from keyboards/keyhive/uno/rev1/info.json)6
-rw-r--r--keyboards/keyhive/uno/rev1/rules.mk12
-rw-r--r--keyboards/keyhive/uno/rev2/keyboard.jsono (renamed from keyboards/keyhive/uno/rev2/info.json)7
-rw-r--r--keyboards/keyhive/uno/rev2/rules.mk13
-rw-r--r--keyboards/keyhive/ut472/keyboard.json (renamed from keyboards/keyhive/ut472/info.json)9
-rw-r--r--keyboards/keyhive/ut472/rules.mk12
34 files changed, 129 insertions, 192 deletions
diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/keyboard.json
index 1496756d9a..2a58178bf1 100644
--- a/keyboards/keyhive/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/keyboard.json
@@ -23,6 +23,16 @@
"ws2812": {
"pin": "B0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"],
"rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/keyhive/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk
deleted file mode 100644
index 5d5924f767..0000000000
--- a/keyboards/keyhive/absinthe/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/keyboard.json
index 76d1988da0..bce4b9d0fe 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/keyboard.json
@@ -23,6 +23,14 @@
"static_gradient": true
}
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"],
"rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"]
diff --git a/keyboards/keyhive/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/keyhive/ergosaurus/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # 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/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c
index 6acc649e0d..b890ee08bf 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.c
+++ b/keyboards/keyhive/honeycomb/honeycomb.c
@@ -60,12 +60,12 @@ bool pointing_device_task(void){
}
void led_init(void) {
- setPinOutput(D1);
- writePinHigh(D1);
- setPinOutput(F4);
- writePinHigh(F4);
- setPinOutput(F5);
- writePinHigh(F5);
+ gpio_set_pin_output(D1);
+ gpio_write_pin_high(D1);
+ gpio_set_pin_output(F4);
+ gpio_write_pin_high(F4);
+ gpio_set_pin_output(F5);
+ gpio_write_pin_high(F5);
}
void matrix_init_kb(void) {
diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index 0418dee767..3551e4a3af 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
@@ -2,12 +2,12 @@
#include "quantum.h"
-#define RED_LED_OFF() writePinHigh(F6)
-#define RED_LED_ON() writePinLow(F6)
-#define BLU_LED_OFF() writePinHigh(F5)
-#define BLU_LED_ON() writePinLow(F5)
-#define GRN_LED_OFF() writePinHigh(D1)
-#define GRN_LED_ON() writePinLow(D1)
+#define RED_LED_OFF() gpio_write_pin_high(F6)
+#define RED_LED_ON() gpio_write_pin_low(F6)
+#define BLU_LED_OFF() gpio_write_pin_high(F5)
+#define BLU_LED_ON() gpio_write_pin_low(F5)
+#define GRN_LED_OFF() gpio_write_pin_high(D1)
+#define GRN_LED_ON() gpio_write_pin_low(D1)
#define SET_LED_OFF (RED_LED_OFF(); GRN_LED_OFF(); BLU_LED_OFF(); )
#define SET_LED_RED (RED_LED_ON(); GRN_LED_OFF(); BLU_LED_OFF(); )
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/keyboard.json
index 639edee28d..768f08275d 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/keyboard.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/keyboard.json
index 2c12fb6bfd..4afdd839d0 100644
--- a/keyboards/keyhive/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/keyboard.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/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c
index 7a5450a678..ab5f1880d5 100644
--- a/keyboards/keyhive/lattice60/lattice60.c
+++ b/keyboards/keyhive/lattice60/lattice60.c
@@ -21,8 +21,8 @@
void keyboard_pre_init_kb(void){
//init the LED pins as outputs
- setPinOutput(LED1_PIN);
- setPinOutput(LED2_PIN);
+ gpio_set_pin_output(LED1_PIN);
+ gpio_set_pin_output(LED2_PIN);
//call any user initialization code
keyboard_pre_init_user();
}
@@ -31,7 +31,7 @@ bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res){
//write the CAPS LOCK state on LED1
- writePin(LED1_PIN, led_state.caps_lock);
+ gpio_write_pin(LED1_PIN, led_state.caps_lock);
}
return res;
}
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/maypad/info.json b/keyboards/keyhive/maypad/keyboard.json
index 6f61b99df3..c4c39b0edd 100644
--- a/keyboards/keyhive/maypad/info.json
+++ b/keyboards/keyhive/maypad/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x4D50",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/keyhive/maypad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # 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/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/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index 1eefa5cd91..d8c0e81348 100644
--- a/keyboards/keyhive/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.c
@@ -20,9 +20,9 @@ void matrix_init_kb(void) {
// runs once when the firmware starts up
//set the indicator LED pin to Output
- setPinOutput(B5);
+ gpio_set_pin_output(B5);
//set HIGH for off.
- writePinHigh(B5);
+ gpio_write_pin_high(B5);
//call any user functions
matrix_init_user();
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/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index 1eefa5cd91..d8c0e81348 100644
--- a/keyboards/keyhive/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.c
@@ -20,9 +20,9 @@ void matrix_init_kb(void) {
// runs once when the firmware starts up
//set the indicator LED pin to Output
- setPinOutput(B5);
+ gpio_set_pin_output(B5);
//set HIGH for off.
- writePinHigh(B5);
+ gpio_write_pin_high(B5);
//call any user functions
matrix_init_user();
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/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 1eefa5cd91..d8c0e81348 100644
--- a/keyboards/keyhive/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.c
@@ -20,9 +20,9 @@ void matrix_init_kb(void) {
// runs once when the firmware starts up
//set the indicator LED pin to Output
- setPinOutput(B5);
+ gpio_set_pin_output(B5);
//set HIGH for off.
- writePinHigh(B5);
+ gpio_write_pin_high(B5);
//call any user functions
matrix_init_user();
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/opus/info.json b/keyboards/keyhive/opus/keyboard.json
index 5bef38ca0a..252958c0b9 100644
--- a/keyboards/keyhive/opus/info.json
+++ b/keyboards/keyhive/opus/keyboard.json
@@ -7,6 +7,14 @@
"pid": "0x4F50",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
"rows": ["B1", "B3", "B2", "B6"]
diff --git a/keyboards/keyhive/opus/rules.mk b/keyboards/keyhive/opus/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/keyhive/opus/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # 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/smallice/info.json b/keyboards/keyhive/smallice/keyboard.json
index fae716f820..f7118ed3cf 100644
--- a/keyboards/keyhive/smallice/info.json
+++ b/keyboards/keyhive/smallice/keyboard.json
@@ -29,6 +29,15 @@
"ws2812": {
"pin": "B7"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C7", "C6", "F7", "F6", "F5", "F4", "F1", "D4", "D6", "D7", "D0", "D1", "D2", "D3", "D5"],
"rows": ["B0", "B6", "B5", "B4"]
diff --git a/keyboards/keyhive/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk
deleted file mode 100644
index 2eba275490..0000000000
--- a/keyboards/keyhive/smallice/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/keyboard.json
index 8514a29986..aea03ffc60 100644
--- a/keyboards/keyhive/southpole/info.json
+++ b/keyboards/keyhive/southpole/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
"rows": ["D2", "D3", "C6", "C7", "D5"]
diff --git a/keyboards/keyhive/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk
deleted file mode 100644
index e3ebdd5cf3..0000000000
--- a/keyboards/keyhive/southpole/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-#AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
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
diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/keyboard.json
index 6c3dd26eef..340e521074 100644
--- a/keyboards/keyhive/ut472/info.json
+++ b/keyboards/keyhive/ut472/keyboard.json
@@ -28,6 +28,15 @@
"ws2812": {
"pin": "C6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"],
"rows": ["D1", "D2", "D3", "D4"]
diff --git a/keyboards/keyhive/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk
deleted file mode 100644
index 9ebb40efd6..0000000000
--- a/keyboards/keyhive/ut472/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes