Merge remote-tracking branch 'origin/develop' into xap

2024-12-05 01:15:19 +00:00 · 2024-04-20 08:21:03 +00:00 · 2024-04-20 08:21:03 +00:00 · 75832e13c1
commit 75832e13c1
parent 21cb1fbfc4 7b96e54e8c
31 changed files with 132 additions and 154 deletions
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@ -12,7 +12,8 @@
        "command": true,
        "mousekey": true,
        "extrakey": true,
-        "nkro": true
+        "nkro": true,
+        "sleep_led": true
    },
    "indicators": {
        "caps_lock": "E6",
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/rules.mk
@ -1,7 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-
-SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = lite
 SRC += matrix.c
--- a/keyboards/kiwikey/borderland/keyboard.json
+++ b/keyboards/kiwikey/borderland/keyboard.json
@ -6,7 +6,8 @@
    "usb": {
        "vid": "0x4B57",
        "pid": "0x424C",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
    },
    "matrix_pins": {
        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
@ -43,6 +44,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kiwikey/borderland/rules.mk
+++ b/keyboards/kiwikey/borderland/rules.mk
@ -1,14 +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
-ENCODER_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
--- a/keyboards/kiwikey/kawii9/keyboard.json
+++ b/keyboards/kiwikey/kawii9/keyboard.json
@ -6,7 +6,8 @@
    "usb": {
        "vid": "0x4B57",
        "pid": "0x0303",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "no_startup_check": true
    },
    "rgblight": {
        "saturation_steps": 8,
@ -35,6 +36,12 @@
    "diode_direction": "COL2ROW",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT_ortho_3x3": {
            "layout": [
--- a/keyboards/kiwikey/kawii9/rules.mk
+++ b/keyboards/kiwikey/kawii9/rules.mk
@ -1,13 +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
-NO_USB_STARTUP_CHECK = yes
--- a/keyboards/kmini/info.json
+++ b/keyboards/kmini/info.json
@ -10,6 +10,13 @@
  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "nkro": true
+  },
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/kmini/rules.mk
+++ b/keyboards/kmini/rules.mk
@ -1,18 +1,7 @@
 # Processor frequency
 F_CPU = 8000000

-# 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
 CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output

 # Project specific files
 SRC = matrix.c
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@ -83,6 +83,16 @@
    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
    "debounce": 3,
    "layouts": {
        "LAYOUT_60_ansi_arrow": {
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@ -1,17 +1,3 @@
-# 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
-LTO_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
 WS2812_DRIVER_REQUIRED = yes

 COMMON_VPATH += $(DRIVER_PATH)/led/issi
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@ -91,6 +91,16 @@
    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
    "debounce": 3,
    "layouts": {
        "LAYOUT_60_iso_arrow": {
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@ -1,20 +1,3 @@
-# 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
-LTO_ENABLE = yes
-
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@ -87,6 +87,16 @@
    "diode_direction": "ROW2COL",
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@ -1,19 +1,3 @@
-# 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
-LTO_ENABLE = yes
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
 # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
 # normally done by common_features.mk for both of these drivers need to be done
 # here manually.
--- a/keyboards/kumaokobo/kudox/columner/keyboard.json
+++ b/keyboards/kumaokobo/kudox/columner/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox/info.json
+++ b/keyboards/kumaokobo/kudox/info.json
@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}
--- a/keyboards/kumaokobo/kudox/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox/rev3/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox/rules.mk
+++ b/keyboards/kumaokobo/kudox/rules.mk
@ -1,14 +1 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = kumaokobo/kudox/rev3
--- a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
@ -36,6 +36,17 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "unicode": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox_full/rev1/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
@ -1 +0,0 @@
-OLED_ENABLE = yes
--- a/keyboards/kumaokobo/kudox_full/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
@ -1,16 +1 @@
-# 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
-UNICODE_ENABLE = yes        # Unicode
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
--- a/keyboards/kumaokobo/kudox_game/info.json
+++ b/keyboards/kumaokobo/kudox_game/info.json
@ -3,14 +3,6 @@
    "manufacturer": "Kumao Kobo",
    "url": "",
    "maintainer": "Kumao Kobo",
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
    "usb": {
        "vid": "0xABBA",
        "pid": "0x9696"
--- a/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
@ -27,6 +27,14 @@
        "rows": ["D4", "D7", "E6", "B4", "B5"]
    },
    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox_game/rev2/keyboard.json
@ -27,6 +27,15 @@
        "rows": ["D4", "D7", "E6", "B4", "B5"]
    },
    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/kudox_game/rev2/rules.mk
+++ b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
--- a/keyboards/kumaokobo/pico/65keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/65keys/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/pico/70keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/70keys/keyboard.json
@ -14,6 +14,7 @@
    },
    "diode_direction": "COL2ROW",
    "split": {
+        "enabled": true,
        "soft_serial_pin": "D0"
    },
    "rgblight": {
@ -38,6 +39,13 @@
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "rgblight": true
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/kumaokobo/pico/info.json
+++ b/keyboards/kumaokobo/pico/info.json
@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}
--- a/keyboards/kumaokobo/pico/rules.mk
+++ b/keyboards/kumaokobo/pico/rules.mk
@ -1,14 +1 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = kumaokobo/pico/65keys