From 69f96e1411bc786c49ef3de83d18d8bd226fd8ea Mon Sep 17 00:00:00 2001 From: James Young Date: Sun, 21 Apr 2024 17:53:31 -0700 Subject: Data-Driven Keyboard Conversions: K, Part 4 (#23567) --- keyboards/keyhive/honeycomb/info.json | 9 +++++++ keyboards/keyhive/honeycomb/rules.mk | 11 --------- keyboards/keyhive/lattice60/info.json | 5 ++++ keyboards/keyhive/lattice60/rules.mk | 13 ---------- keyboards/keyhive/navi10/rev0/info.json | 31 ----------------------- keyboards/keyhive/navi10/rev0/keyboard.json | 38 +++++++++++++++++++++++++++++ keyboards/keyhive/navi10/rev0/rules.mk | 12 --------- keyboards/keyhive/navi10/rev2/info.json | 31 ----------------------- keyboards/keyhive/navi10/rev2/keyboard.json | 38 +++++++++++++++++++++++++++++ keyboards/keyhive/navi10/rev2/rules.mk | 12 --------- keyboards/keyhive/navi10/rev3/info.json | 31 ----------------------- keyboards/keyhive/navi10/rev3/keyboard.json | 38 +++++++++++++++++++++++++++++ keyboards/keyhive/navi10/rev3/rules.mk | 12 --------- keyboards/keyhive/uno/rev1/info.json | 22 ----------------- keyboards/keyhive/uno/rev1/keyboard.json | 28 +++++++++++++++++++++ keyboards/keyhive/uno/rev1/rules.mk | 12 --------- keyboards/keyhive/uno/rev2/info.json | 27 -------------------- keyboards/keyhive/uno/rev2/keyboard.jsono | 34 ++++++++++++++++++++++++++ keyboards/keyhive/uno/rev2/rules.mk | 13 ---------- 19 files changed, 190 insertions(+), 227 deletions(-) delete mode 100644 keyboards/keyhive/navi10/rev0/info.json create mode 100644 keyboards/keyhive/navi10/rev0/keyboard.json delete mode 100644 keyboards/keyhive/navi10/rev0/rules.mk delete mode 100644 keyboards/keyhive/navi10/rev2/info.json create mode 100644 keyboards/keyhive/navi10/rev2/keyboard.json delete mode 100644 keyboards/keyhive/navi10/rev2/rules.mk delete mode 100644 keyboards/keyhive/navi10/rev3/info.json create mode 100644 keyboards/keyhive/navi10/rev3/keyboard.json delete mode 100644 keyboards/keyhive/navi10/rev3/rules.mk delete mode 100644 keyboards/keyhive/uno/rev1/info.json create mode 100644 keyboards/keyhive/uno/rev1/keyboard.json delete mode 100644 keyboards/keyhive/uno/rev1/rules.mk delete mode 100644 keyboards/keyhive/uno/rev2/info.json create mode 100644 keyboards/keyhive/uno/rev2/keyboard.jsono delete mode 100644 keyboards/keyhive/uno/rev2/rules.mk (limited to 'keyboards/keyhive') 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/info.json deleted file mode 100644 index 548d917667..0000000000 --- a/keyboards/keyhive/navi10/rev0/info.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "usb": { - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["D1", "D0", "F6"], - "rows": ["B6", "B2", "B3", "B4"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - - {"matrix": [2, 1], "x": 1, "y": 3}, - - {"matrix": [3, 0], "x": 0, "y": 4}, - {"matrix": [3, 1], "x": 1, "y": 4}, - {"matrix": [3, 2], "x": 2, "y": 4} - ] - } - } -} diff --git a/keyboards/keyhive/navi10/rev0/keyboard.json b/keyboards/keyhive/navi10/rev0/keyboard.json new file mode 100644 index 0000000000..092c2343ab --- /dev/null +++ b/keyboards/keyhive/navi10/rev0/keyboard.json @@ -0,0 +1,38 @@ +{ + "usb": { + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["D1", "D0", "F6"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } +} 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/info.json deleted file mode 100644 index 8db97e67b7..0000000000 --- a/keyboards/keyhive/navi10/rev2/info.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "usb": { - "device_version": "0.0.2" - }, - "matrix_pins": { - "cols": ["D4", "C6", "B1"], - "rows": ["B6", "B2", "B3", "B4"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - - {"matrix": [2, 1], "x": 1, "y": 3}, - - {"matrix": [3, 0], "x": 0, "y": 4}, - {"matrix": [3, 1], "x": 1, "y": 4}, - {"matrix": [3, 2], "x": 2, "y": 4} - ] - } - } -} diff --git a/keyboards/keyhive/navi10/rev2/keyboard.json b/keyboards/keyhive/navi10/rev2/keyboard.json new file mode 100644 index 0000000000..2c7b9972df --- /dev/null +++ b/keyboards/keyhive/navi10/rev2/keyboard.json @@ -0,0 +1,38 @@ +{ + "usb": { + "device_version": "0.0.2" + }, + "matrix_pins": { + "cols": ["D4", "C6", "B1"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } +} 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/info.json deleted file mode 100644 index 82df44e866..0000000000 --- a/keyboards/keyhive/navi10/rev3/info.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "usb": { - "device_version": "0.0.3" - }, - "matrix_pins": { - "cols": ["D4", "E6", "B1"], - "rows": ["B6", "B2", "B3", "B4"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - - {"matrix": [2, 1], "x": 1, "y": 3}, - - {"matrix": [3, 0], "x": 0, "y": 4}, - {"matrix": [3, 1], "x": 1, "y": 4}, - {"matrix": [3, 2], "x": 2, "y": 4} - ] - } - } -} diff --git a/keyboards/keyhive/navi10/rev3/keyboard.json b/keyboards/keyhive/navi10/rev3/keyboard.json new file mode 100644 index 0000000000..5e1b27f7ce --- /dev/null +++ b/keyboards/keyhive/navi10/rev3/keyboard.json @@ -0,0 +1,38 @@ +{ + "usb": { + "device_version": "0.0.3" + }, + "matrix_pins": { + "cols": ["D4", "E6", "B1"], + "rows": ["B6", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } +} 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/info.json deleted file mode 100644 index 61121267d7..0000000000 --- a/keyboards/keyhive/uno/rev1/info.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "keyboard_name": "Uno rev1", - "usb": { - "device_version": "0.0.1" - }, - "rgblight": { - "led_count": 1, - "animations": { - "rainbow_mood": true - } - }, - "ws2812": { - "pin": "F6" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "matrix_pins": { - "direct": [ - ["B6"] - ] - } -} diff --git a/keyboards/keyhive/uno/rev1/keyboard.json b/keyboards/keyhive/uno/rev1/keyboard.json new file mode 100644 index 0000000000..9eaf49c2fa --- /dev/null +++ b/keyboards/keyhive/uno/rev1/keyboard.json @@ -0,0 +1,28 @@ +{ + "keyboard_name": "Uno rev1", + "usb": { + "device_version": "0.0.1" + }, + "rgblight": { + "led_count": 1, + "animations": { + "rainbow_mood": true + } + }, + "ws2812": { + "pin": "F6" + }, + "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/info.json deleted file mode 100644 index 908c254bab..0000000000 --- a/keyboards/keyhive/uno/rev2/info.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "keyboard_name": "Uno rev2", - "usb": { - "device_version": "0.0.2" - }, - "rgblight": { - "led_count": 1, - "animations": { - "rainbow_mood": true - } - }, - "ws2812": { - "pin": "D1" - }, - "encoder": { - "rotary": [ - {"pin_a": "B2", "pin_b": "B3"} - ] - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "matrix_pins": { - "direct": [ - ["D0"] - ] - } -} diff --git a/keyboards/keyhive/uno/rev2/keyboard.jsono b/keyboards/keyhive/uno/rev2/keyboard.jsono new file mode 100644 index 0000000000..0283c2aa5b --- /dev/null +++ b/keyboards/keyhive/uno/rev2/keyboard.jsono @@ -0,0 +1,34 @@ +{ + "keyboard_name": "Uno rev2", + "usb": { + "device_version": "0.0.2" + }, + "rgblight": { + "led_count": 1, + "animations": { + "rainbow_mood": true + } + }, + "ws2812": { + "pin": "D1" + }, + "encoder": { + "rotary": [ + {"pin_a": "B2", "pin_b": "B3"} + ] + }, + "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 -- cgit v1.2.3