Merge remote-tracking branch 'upstream/develop' into cl_tkl_ijkl

keyboards/10bleoledhub/info.json

@@ -1,63 +0,0 @@
-{
-    "keyboard_name": "10bleoledhub",
-    "manufacturer": "haierwangwei2005",
-    "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
-    "maintainer": "haierwangwei2005",
-    "usb": {
-        "vid": "0x7C88",
-        "pid": "0x7C99",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "rgblight": {
-        "led_count": 4,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B5"],
-        "rows": ["F0", "F5", "F4", "F6"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C7", "pin_b": "F7"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3}
-            ]
-        }
-    }
-}

keyboards/10bleoledhub/keyboard.json

@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "10bleoledhub",
+    "manufacturer": "haierwangwei2005",
+    "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
+    "maintainer": "haierwangwei2005",
+    "usb": {
+        "vid": "0x7C88",
+        "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"
+    },
+    "rgblight": {
+        "led_count": 4,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5"],
+        "rows": ["F0", "F5", "F4", "F6"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C7", "pin_b": "F7"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
+            ]
+        }
+    }
+}

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

@@ -1,29 +0,0 @@
-{
-  "keyboard_name": "1K",
-  "manufacturer": "MakotoKurauchi",
-  "url": "",
-  "maintainer": "MakotoKurauchi",
-  "usb": {
-    "vid": "0x0009",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 1
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "direct": [
-      ["B0"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT_ortho_1x1": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]}
-      ]
-    }
-  }
-}

keyboards/1k/keyboard.json

@@ -0,0 +1,39 @@
+{
+  "keyboard_name": "1K",
+  "manufacturer": "MakotoKurauchi",
+  "url": "",
+  "maintainer": "MakotoKurauchi",
+  "usb": {
+    "vid": "0x0009",
+    "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
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "direct": [
+      ["B0"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT_ortho_1x1": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]}
+      ]
+    }
+  }
+}

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/rev1/info.json

@@ -1,56 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.8},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.2},
-                {"matrix": [0, 4], "x": 4, "y": 0.4},
-
-                {"matrix": [4, 0], "x": 8, "y": 0.4},
-                {"matrix": [4, 1], "x": 9, "y": 0.2},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.2},
-                {"matrix": [4, 4], "x": 12, "y": 0.8},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.8},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.2},
-                {"matrix": [1, 4], "x": 4, "y": 1.4},
-
-                {"matrix": [5, 0], "x": 8, "y": 1.4},
-                {"matrix": [5, 1], "x": 9, "y": 1.2},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.2},
-                {"matrix": [5, 4], "x": 12, "y": 1.8},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.8},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.2},
-                {"matrix": [2, 4], "x": 4, "y": 2.4},
-
-                {"matrix": [6, 0], "x": 8, "y": 2.4},
-                {"matrix": [6, 1], "x": 9, "y": 2.2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.2},
-                {"matrix": [6, 4], "x": 12, "y": 2.8},
-
-                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
-                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
-                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
-                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
-                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
-                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
-            ]
-        }
-    }
-}

keyboards/3w6/rev1/keyboard.json

@@ -0,0 +1,64 @@
+{
+    "usb": {
+        "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",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
+}

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/rev2/info.json

@@ -1,56 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.8},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.2},
-                {"matrix": [0, 4], "x": 4, "y": 0.4},
-
-                {"matrix": [4, 0], "x": 8, "y": 0.4},
-                {"matrix": [4, 1], "x": 9, "y": 0.2},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.2},
-                {"matrix": [4, 4], "x": 12, "y": 0.8},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.8},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.2},
-                {"matrix": [1, 4], "x": 4, "y": 1.4},
-
-                {"matrix": [5, 0], "x": 8, "y": 1.4},
-                {"matrix": [5, 1], "x": 9, "y": 1.2},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.2},
-                {"matrix": [5, 4], "x": 12, "y": 1.8},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.8},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.2},
-                {"matrix": [2, 4], "x": 4, "y": 2.4},
-
-                {"matrix": [6, 0], "x": 8, "y": 2.4},
-                {"matrix": [6, 1], "x": 9, "y": 2.2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.2},
-                {"matrix": [6, 4], "x": 12, "y": 2.8},
-
-                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
-                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
-                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
-                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
-                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
-                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
-            ]
-        }
-    }
-}

keyboards/3w6/rev2/keyboard.json

@@ -0,0 +1,64 @@
+{
+    "usb": {
+        "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",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
+}

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/bastardkb/charybdis/3x5/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported.
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

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

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 POINTING_DEVICE_ENABLE = yes # Enable trackball

keyboards/bastardkb/scylla/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/scylla/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/skeletyl/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/skeletyl/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/tbk/info.json

@@ -1,102 +0,0 @@
-{
-    "keyboard_name": "The Bastard Keyboard",
-    "url": "https://bastardkb.com/",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x1828"
-    },
-    "rgblight": {
-        "led_count": 38,
-        "split_count": [19, 19],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["D7", "B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_split_4x6_5": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 1], "x": 15, "y": 0},
-                {"matrix": [5, 0], "x": 16, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1},
-                {"matrix": [6, 1], "x": 15, "y": 1},
-                {"matrix": [6, 0], "x": 16, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2},
-                {"matrix": [7, 1], "x": 15, "y": 2},
-                {"matrix": [7, 0], "x": 16, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-                {"matrix": [4, 3], "x": 5, "y": 4},
-                {"matrix": [4, 4], "x": 6, "y": 4},
-                {"matrix": [4, 1], "x": 7, "y": 4},
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-                {"matrix": [4, 5], "x": 6, "y": 5},
-                {"matrix": [4, 2], "x": 7, "y": 5},
-                {"matrix": [9, 2], "x": 9, "y": 5},
-                {"matrix": [9, 5], "x": 10, "y": 5}
-            ]
-        }
-    }
-}

keyboards/bastardkb/tbk/keyboard.json

@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "The Bastard Keyboard",
+    "url": "https://bastardkb.com/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1828"
+    },
+    "rgblight": {
+        "led_count": 38,
+        "split_count": [19, 19],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_split_4x6_5": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 1], "x": 15, "y": 1},
+                {"matrix": [6, 0], "x": 16, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 0], "x": 16, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+                {"matrix": [4, 3], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [4, 1], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 5},
+                {"matrix": [4, 2], "x": 7, "y": 5},
+                {"matrix": [9, 2], "x": 9, "y": 5},
+                {"matrix": [9, 5], "x": 10, "y": 5}
+            ]
+        }
+    }
+}

keyboards/bastardkb/tbk/rules.mk

@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

keyboards/bastardkb/tbkmini/blackpill/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint

keyboards/bastardkb/tbkmini/v1/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/elitec/rules.mk

@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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 (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk

@@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 AUDIO_SUPPORTED = no        # Audio is not supported
-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
 
 SERIAL_DRIVER = usart

keyboards/biacco42/ergo42/info.json

@@ -1,5 +0,0 @@
-{
-    "split": {
-        "enabled": true
-    }
-}

keyboards/boston_meetup/2019/info.json

@@ -1,49 +0,0 @@
-{
-    "usb": {
-        "device_version": "20.1.9"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "nkro": true,
-        "audio": true,
-        "haptic": true,
-        "oled": true
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["A7", "A8", "B2", "B10"],
-        "rows": ["A3", "B8", "B9", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B13", "pin_b": "B14"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 6
-}

keyboards/boston_meetup/2019/keyboard.json

@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "Boston Meetup Board",
+    "manufacturer": "ishtob",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0xFB30",
+      "pid": "0x26BE",
+      "device_version": "20.1.9"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "haptic": true,
+        "oled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "A8", "B2", "B10"],
+        "rows": ["A3", "B8", "B9", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B13", "pin_b": "B14"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "debounce": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}

keyboards/boston_meetup/info.json

@@ -1,32 +0,0 @@
-{
-  "keyboard_name": "Boston Meetup Board",
-  "manufacturer": "ishtob",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFB30",
-    "pid": "0x26BE"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3}
-      ]
-    }
-  }
-}

keyboards/boston_meetup/rules.mk

@@ -1,2 +1 @@
-
 DEFAULT_FOLDER = boston_meetup/2019