Merge branch 'develop' into comm_64

builddefs/build_keyboard.mk

@@ -521,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes)
     OPT_DEFS += -save-temps=obj
 endif
 
-# TODO: remove this bodge?
-PROJECT_DEFS := $(OPT_DEFS)
-PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
-PROJECT_CONFIG := $(CONFIG_H)
-
-CONFIG_H += $(POST_CONFIG_H)
-ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
-
 OUTPUTS := $(INTERMEDIATE_OUTPUT)
 $(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
-$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \
+$(INTERMEDIATE_OUTPUT)_DEFS := \
 	-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
 	-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
-	$(PROJECT_DEFS)
-$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC)
-$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG)
+	$(OPT_DEFS)
+$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
+$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H)
 
 # Default target.
 all: build check-size

builddefs/common_features.mk

@@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
     POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
-    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
     LIB8TION_ENABLE := yes

data/constants/keycodes/keycodes_0.0.4_lighting.hjson

@@ -0,0 +1,67 @@
+{
+    "keycodes": {
+        "0x7810": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_ON",
+            "aliases": [
+                "LM_ON"
+            ]
+        },
+        "0x7811": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_OFF",
+            "aliases": [
+                "LM_OFF"
+            ]
+        },
+        "0x7812": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_TOGGLE",
+            "aliases": [
+                "LM_TOGG"
+            ]
+        },
+        "0x7813": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_NEXT",
+            "aliases": [
+                "LM_NEXT"
+            ]
+        },
+        "0x7814": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_PREVIOUS",
+            "aliases": [
+                "LM_PREV"
+            ]
+        },
+        "0x7815": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_UP",
+            "aliases": [
+                "LM_BRIU"
+            ]
+        },
+        "0x7816": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN",
+            "aliases": [
+                "LM_BRID"
+            ]
+        },
+        "0x7817": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_UP",
+            "aliases": [
+                "LM_SPDU"
+            ]
+        },
+        "0x7818": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_DOWN",
+            "aliases": [
+                "LM_SPDD"
+            ]
+        }
+    }
+}

docs/feature_led_matrix.md

@@ -217,16 +217,17 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{
 
 ## Keycodes :id=keycodes
 
-All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md).
-
-| Key                     | Aliases   | Description                   |
-|-------------------------|-----------|-------------------------------|
-| `QK_BACKLIGHT_TOGGLE`   | `BL_TOGG` | Toggle LED Matrix on or off   |
-| `QK_BACKLIGHT_STEP`     | `BL_STEP` | Cycle through modes           |
-| `QK_BACKLIGHT_ON`       | `BL_ON`   | Turn on LED Matrix            |
-| `QK_BACKLIGHT_OFF`      | `BL_OFF`  | Turn off LED Matrix           |
-| `QK_BACKLIGHT_UP`       | `BL_UP`   | Increase the brightness level |
-| `QK_BACKLIGHT_DOWN`     | `BL_DOWN` | Decrease the brightness level |
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
 
 ## LED Matrix Effects :id=led-matrix-effects
 

docs/feature_split_keyboard.md

@@ -266,7 +266,7 @@ This enables syncing of the Host LED status (caps lock, num lock, etc) between b
 #define SPLIT_MODS_ENABLE
 ```
 
-This enables transmitting modifier state (normal, weak and oneshot) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen).
+This enables transmitting modifier state (normal, weak, oneshot and oneshot locked) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen).
 
 ```c
 #define SPLIT_WPM_ENABLE

docs/hand_wire.md

@@ -175,7 +175,7 @@ As you move along, be sure that the controller is staying in place - recutting a
 
 From here, you should have a working keyboard once you program a firmware.
 
-Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix).
+Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix)).
 
 Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware.  The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md).
 

docs/keycodes.md

@@ -398,6 +398,22 @@ See also: [Leader Key](feature_leader_key.md)
 |---------|------------------------|
 |`QK_LEAD`|Begins a leader sequence|
 
+## LED Matrix :id=led-matrix
+
+See also: [LED Matrix](feature_led_matrix.md)
+
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
+
 ## Magic Keycodes :id=magic-keycodes
 
 See also: [Magic Keycodes](keycodes_magic.md)

keyboards/10bleoledhub/info.json → keyboards/10bleoledhub/keyboard.json

@@ -8,6 +8,15 @@
         "pid": "0x7C99",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true
+    },
     "bluetooth": {
         "driver": "bluefruit_le"
     },

keyboards/10bleoledhub/rules.mk

@@ -1,18 +1,2 @@
 # 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 = 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
-BLUETOOTH_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes

keyboards/1k/info.json → keyboards/1k/keyboard.json

@@ -8,6 +8,16 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "processor": "attiny85",
+  "bootloader": "custom",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "grave_esc": false,
+    "magic": false,
+    "space_cadet": false
+  },
   "rgblight": {
     "led_count": 1
   },

keyboards/1k/rules.mk

@@ -1,26 +1,2 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
 BOOTLOADER_SIZE = 1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# 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 = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no

keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json

@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {

keyboards/1upkeyboards/pi40/rules.mk

@@ -1,3 +1 @@
-OLED_ENABLE     = yes
-
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0

keyboards/25keys/zinc/rules.mk

@@ -1,4 +1 @@
 DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c

keyboards/3w6/rev2/info.json → keyboards/3w6/rev1/keyboard.json

@@ -1,6 +1,14 @@
 {
     "usb": {
-        "device_version": "0.0.2"
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/3w6/rev1/rules.mk

@@ -1,19 +1,3 @@
-# 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes

keyboards/3w6/rev1/info.json → keyboards/3w6/rev2/keyboard.json

@@ -1,6 +1,14 @@
 {
     "usb": {
-        "device_version": "0.0.1"
+        "device_version": "0.0.2",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/3w6/rev2/rules.mk

@@ -1,19 +1,3 @@
-# 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes

keyboards/bacca70/config.h

@@ -1,25 +0,0 @@
-/*
-Copyright 2022 keebnewb
-
-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
-
-

keyboards/bacca70/keyboard.json

@@ -16,6 +16,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
         "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]

keyboards/baguette/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/baguette/keyboard.json

@@ -17,6 +17,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"],
     "rows": ["B3", "B2", "B1", "E6", "D6"]

keyboards/baion_808/info.json → keyboards/baion_808/keyboard.json

@@ -8,6 +8,12 @@
         "pid": "0x4238",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
     "matrix_pins": {
         "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
         "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
@@ -20,6 +26,7 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/baion_808/rules.mk

@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
-
-LAYOUTS = tkl_ansi tkl_ansi_tsangan tkl_ansi_split_bs_rshift tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift

keyboards/bajjak/config.h

@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 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
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \

keyboards/bajjak/info.json → keyboards/bajjak/keyboard.json

@@ -8,6 +8,21 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "unicode": true,
+        "swap_hands": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
     "tapping": {

keyboards/bajjak/rules.mk

@@ -3,22 +3,7 @@
 # details), include the following define:
 OPT_DEFS += -DLEFT_LEDS
 
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite        # Custom matrix file for the BAJJAK
-UNICODE_ENABLE = yes        # Unicode
-SWAP_HANDS_ENABLE = yes     # Allow swapping hands of keyboard
 
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no

keyboards/bandominedoni/info.json → keyboards/bandominedoni/keyboard.json

@@ -8,6 +8,16 @@
         "pid": "0xF4B5",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "midi": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
     "rgb_matrix": {
         "driver": "ws2812",
         "max_brightness": 50,
@@ -19,6 +29,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {

keyboards/bandominedoni/rules.mk

@@ -1,18 +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 = 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
-MIDI_ENABLE = yes           # MIDI support
-ENCODER_ENABLE = yes        # encoder on mute button
-SPLIT_KEYBOARD = yes        # Enables split keyboard support
-RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes

keyboards/bantam44/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/bantam44/keyboard.json

@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"],
     "rows": ["F0", "D6", "D4", "D5"]

keyboards/barleycorn_smd/config.h

@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/barleycorn_smd/info.json → keyboards/barleycorn_smd/keyboard.json

@@ -8,6 +8,18 @@
         "device_version": "0.0.1",
         "max_power": 400
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "indicators": {
         "caps_lock": "B2",
         "num_lock": "B3"

keyboards/barleycorn_smd/rules.mk

@@ -1,16 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c

keyboards/barracuda/config.h

@@ -1,22 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * 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

keyboards/barracuda/keyboard.json

@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
         "rows": ["C4", "C5", "C6", "D1", "D2", "D3"]

keyboards/basekeys/slice/rev1/config.h

@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-
-/* 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

keyboards/basekeys/slice/rev1/info.json → keyboards/basekeys/slice/rev1/keyboard.json

@@ -8,12 +8,24 @@
         "pid": "0xEC17",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
         "rows": ["D4", "C6", "D7", "E6", "B4"]
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",

keyboards/basekeys/slice/rev1/rules.mk

@@ -1,12 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# 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

keyboards/basekeys/slice/rev1_rgb/config.h

@@ -21,9 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
-/* 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
-
 #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"

keyboards/basekeys/slice/rev1_rgb/info.json → keyboards/basekeys/slice/rev1_rgb/keyboard.json

@@ -8,12 +8,29 @@
         "pid": "0xEC15",
         "device_version": "0.0.2"
     },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
         "rows": ["D4", "C6", "D7", "E6", "B4"]
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "ws2812": {

keyboards/basekeys/slice/rev1_rgb/rules.mk

@@ -1,16 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# 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
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
-LTO_ENABLE = yes

keyboards/basekeys/trifecta/config.h

@@ -1,23 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.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

keyboards/basekeys/trifecta/keyboard.json

@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
         "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
@@ -54,6 +60,7 @@
         }
     },
     "rgb_matrix": {
+        "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
         "speed_steps": 10,
@@ -102,7 +109,89 @@
             "multisplash": true,
             "solid_splash": true,
             "solid_multisplash": true
-        }
+        },
+        "layout": [
+            {"x": 218, "y": 7, "flags": 2},
+            {"x": 214, "y": 45, "flags": 2},
+            {"x": 180, "y": 47, "flags": 2},
+            {"x": 147, "y": 50, "flags": 2},
+            {"x": 94, "y": 62, "flags": 2},
+            {"x": 37, "y": 51, "flags": 2},
+            {"x": 4, "y": 8, "flags": 2},
+            {"x": 36, "y": 15, "flags": 2},
+            {"x": 62, "y": 18, "flags": 2},
+            {"x": 78, "y": 5, "flags": 2},
+            {"x": 119, "y": 7, "flags": 2},
+            {"x": 145, "y": 16, "flags": 2},
+            {"x": 166, "y": 3, "flags": 2},
+            {"x": 200, "y": 16, "flags": 2},
+            {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4},
+            {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4},
+            {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4},
+            {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4},
+            {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4},
+            {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4},
+            {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4},
+            {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4},
+            {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4},
+            {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4},
+            {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4},
+            {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4},
+            {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4},
+            {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4},
+            {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4},
+            {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4},
+            {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4},
+            {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4},
+            {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4},
+            {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4},
+            {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4},
+            {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4},
+            {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4},
+            {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4},
+            {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4},
+            {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4},
+            {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4},
+            {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4},
+            {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4},
+            {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4},
+            {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4},
+            {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4},
+            {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4},
+            {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4},
+            {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4},
+            {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4},
+            {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4},
+            {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4},
+            {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4},
+            {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4},
+            {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4},
+            {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4},
+            {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4},
+            {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4},
+            {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4},
+            {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4},
+            {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4},
+            {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4},
+            {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4},
+            {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4},
+            {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4},
+            {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4},
+            {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4},
+            {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4},
+            {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4},
+            {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4},
+            {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4},
+            {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4},
+            {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4},
+            {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4}
+        ]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/basekeys/trifecta/trifecta.c

@@ -1,61 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.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/>.
- */
-
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-led_config_t g_led_config = { {
-    { NO_LED, 70,     61,     52,     43, 34,     24,     14  },
-    {     79, 69,     60,     51,     42, 33,     23, NO_LED  },
-    { NO_LED, 71,     62,     53,     44, 35,     25,     15  },
-    {     78, 68,     59,     50,     41, 32,     22, NO_LED  },
-    {     77, 67,     58,     49,     40, 31, NO_LED,     16  },
-    { NO_LED, 72,     63,     54,     45, 36,     26, NO_LED  },
-    { NO_LED, 73,     64,     55,     46, 37,     27,     17  },
-    {     76, 66,     57,     48,     39, 30,     21, NO_LED  },
-    { NO_LED, 74,     56, NO_LED, NO_LED, 38,     28,     18  },
-    {     75, 65, NO_LED, NO_LED,     47, 29,     20,     19  }
-}, {
-	// Underglow
-    {  218,   7 },  { 214,  45 }, { 180,  47 }, {  147, 50 }, {  94,  62 }, {  37,  51 }, {   4,   8 }, {   36,  15 },
-    {  62,   18 },  {  78,   5 }, { 119,   7 }, {  145, 16 }, { 166,   3 }, { 200,  16 }, 
-    
-    //Per Key
-    { 185,  11 },  { 191,  22 }, { 188,  33 }, { 200,  46 }, { 200,  57 }, { 212,  57 }, { 188,  57 }, { 181,  44 },
-    { 176,  22 },  { 168,  11 }, { 155,  11 }, { 164,  22 }, { 169,  32 }, { 165,  44 }, { 172,  55 }, { 157,  54 }, 
-    { 153,  44 },  { 156,  33 }, { 153,  22 }, { 142,  12 }, { 130,  13 }, { 138,  23 }, { 143,  33 }, { 140,  45 }, 
-    { 137,  56 },  { 128,  47 }, { 132,  35 }, { 127,  25 }, { 119,  16 }, { 107,  17 }, { 115,  27 }, { 120,  37 }, 
-    { 116,  48 },  { 117,  59 }, { 104,  51 }, { 109,  39 }, { 104,  29 }, {  86,  19 }, {  74,  16 }, {  78,  28 }, 
-    {  79,  39 },  {  82,  50 }, {  73,  60 }, {  71,  48 }, {  67,  37 }, {  66,  26 }, {  63,  15 }, {  50,  12 }, 
-    {  55,  24 },  {  55,  35 }, {  59,  47 }, {  50,  56 }, {  47,  45 }, {  43,  33 }, {  43,  22 }, {  39,  10 }, 
-    {  25,  11 },  {  29,  22 }, {  30,  33 }, {  34,  44 }, {  24,  54 }, {   9,  55 }, {  15,  44 }, {  14,  33 }, 
-    {  14,  22 },  {  14,  11 }
-}, {
-    2, 2, 2, 2, 2, 2, 2, 2, 
-    2, 2, 2, 2, 2, 2, 
-
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4
-} };
-#endif

keyboards/basketweave/config.h

@@ -1,22 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * 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

keyboards/basketweave/info.json → keyboards/basketweave/keyboard.json

@@ -9,6 +9,12 @@
         "device_version": "0.0.1",
         "max_power": 100
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "encoder": true
+    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
         "rows": ["A6", "C6", "C7", "A7", "A5"]
@@ -20,7 +26,11 @@
         ]
     },
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "processor": "atmega32a",
     "bootloader": "usbasploader",

keyboards/basketweave/rules.mk

@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# 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
-ENCODER_ENABLE = yes

keyboards/bastardkb/charybdis/3x5/blackpill/info.json

@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {

keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk

@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",

keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk

@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 

keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json

@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"

keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x6/blackpill/info.json

@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {

keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",

keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 

keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json

@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"

keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk

@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/charybdis/4x6/blackpill/info.json

@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },