Data-Driven Keyboard Conversions: 0-9 (#23357)

2024-03-30 06:51:57 -07:00 · 2024-03-30 06:51:57 -07:00 · 76bd5142cf
commit 76bd5142cf
parent 831deac212
116 changed files with 630 additions and 1277 deletions
--- a/keyboards/4pplet/aekiso60/rev_b/keyboard.json
+++ b/keyboards/4pplet/aekiso60/rev_b/keyboard.json
@ -4,6 +4,13 @@
        "pid": "0x0011",
        "device_version": "0.0.2"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
--- a/keyboards/4pplet/aekiso60/rev_b/rules.mk
+++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk
@ -1,16 +1,2 @@
-# 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
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PIN A5
 #define WS2812_SPI_SCK_PAL_MODE 0

-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Indicator leds */
 #define LOCK_LIGHTS     TRUE
 #define DISPLAY_LAYERS  TRUE
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
@ -13,6 +13,22 @@
        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
    },
    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "dynamic_keymap": {
        "layer_count": 5
    },
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@ -1,15 +1,2 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underglow */
 #define WS2812_EXTERNAL_PULLUP

-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Indicator leds */
 #define LAYER_1             B14
 #define LAYER_2             B15
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
@ -13,6 +13,21 @@
        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
    },
    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "dynamic_keymap": {
        "layer_count": 5
    },
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
@ -1,15 +1,2 @@
-# 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 = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/steezy60/rev_a/keyboard.json
+++ b/keyboards/4pplet/steezy60/rev_a/keyboard.json
@ -36,7 +36,8 @@
        "extrakey": true,
        "mousekey": false,
        "nkro": true,
-        "rgblight": true
+        "rgblight": true,
+        "key_lock": true
    },
    "rgblight": {
        "led_count": 12,
--- a/keyboards/4pplet/steezy60/rev_a/rules.mk
+++ b/keyboards/4pplet/steezy60/rev_a/rules.mk
@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
--- a/keyboards/4pplet/steezy60/rev_b/keyboard.json
+++ b/keyboards/4pplet/steezy60/rev_b/keyboard.json
@ -32,7 +32,8 @@
        "extrakey": true,
        "mousekey": false,
        "nkro": true,
-        "rgblight": true
+        "rgblight": true,
+        "key_lock": true
    },
    "rgblight": {
        "led_count": 12,
--- a/keyboards/4pplet/steezy60/rev_b/rules.mk
+++ b/keyboards/4pplet/steezy60/rev_b/rules.mk
@ -1,8 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/unextended_std/rev_a/keyboard.json
+++ b/keyboards/4pplet/unextended_std/rev_a/keyboard.json
@ -22,7 +22,8 @@
        "console": false,
        "command": false,
        "nkro": true,
-        "rgblight": true
+        "rgblight": true,
+        "key_lock": true
    },
    "ws2812": {
        "pin": "A8"
--- a/keyboards/4pplet/unextended_std/rev_a/rules.mk
+++ b/keyboards/4pplet/unextended_std/rev_a/rules.mk
@ -1,8 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/waffling60/rev_d/keyboard.json
+++ b/keyboards/4pplet/waffling60/rev_d/keyboard.json
@ -8,6 +8,13 @@
        "pid": "0x000E",
        "device_version": "0.0.4"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
--- a/keyboards/4pplet/waffling60/rev_d/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d/rules.mk
@ -1,16 +1,2 @@
-# 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
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
@ -15,6 +15,12 @@
    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
@ -1,16 +1,2 @@
-# 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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
@ -15,6 +15,11 @@
    "diode_direction": "COL2ROW",
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
    "layout_aliases": {
        "LAYOUT": "LAYOUT_all"
    },
--- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
@ -1,16 +1,2 @@
-# 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
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/waffling80/rev_b/keyboard.json
+++ b/keyboards/4pplet/waffling80/rev_b/keyboard.json
@ -4,6 +4,13 @@
        "pid": "0x000F",
        "device_version": "0.0.2"
    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
--- a/keyboards/4pplet/waffling80/rev_b/rules.mk
+++ b/keyboards/4pplet/waffling80/rev_b/rules.mk
@ -1,16 +1,2 @@
-# 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
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@ -1,22 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
--- a/keyboards/4pplet/yakiimo/rev_a/keyboard.json
+++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
@ -16,6 +16,12 @@
        "mousekey": true,
        "nkro": true
    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
    "matrix_pins": {
        "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
        "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]