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

.clangd

@@ -1,4 +1,4 @@
 CompileFlags:
   Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
-  Remove: [-W*, -mcall-prologues]
+  Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues]
   Compiler: clang

.github/workflows/ci_builds.yml

@@ -1,74 +0,0 @@
-name: CI Builds
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches: [master, develop]
-  workflow_dispatch:
-    inputs:
-      branch:
-        type: choice
-        description: 'Branch to build'
-        options: [master, develop]
-
-concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
-
-jobs:
-  ci_builds:
-    if: github.repository == 'qmk/qmk_firmware'
-    name: "CI Build"
-    runs-on: self-hosted
-    timeout-minutes: 1380
-
-    strategy:
-      fail-fast: false
-      matrix:
-        keymap: [default, via]
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        ref: ${{ github.event.inputs.branch || github.ref }}
-
-    - name: Install dependencies
-      run: pip3 install -r requirements.txt
-
-    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
-      run: |
-        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
-        # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
-        # Exit with failure if the compilation stage failed
-        [ ! -f .failed ] || exit 1
-
-    - name: 'Upload artifacts'
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
-        if-no-files-found: ignore
-        path: |
-          *.bin
-          *.hex
-          *.uf2
-          .build/failed.*
-
-    - name: 'CI Discord Notification'
-      if: always()
-      working-directory: util/ci/
-      env:
-        DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
-      run: |
-        python3 -m pip install -r requirements.txt
-        python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

data/constants/keycodes/extras/keycodes_czech_mac_ansi_0.0.1.hjson

@@ -0,0 +1,580 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │ \ │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ ú │ ) │ ¨ │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+       "KC_GRV": {
+            "key": "CZ_BSLS",
+            "label": "\\",
+        }
+        "KC_1": {
+            "key": "CZ_PLUS",
+            "label": "+",
+        }
+        "KC_2": {
+            "key": "CZ_ECAR",
+            "label": "ě",
+        }
+        "KC_3": {
+            "key": "CZ_SCAR",
+            "label": "š",
+        }
+        "KC_4": {
+            "key": "CZ_CCAR",
+            "label": "č",
+        }
+        "KC_5": {
+            "key": "CZ_RCAR",
+            "label": "ř",
+        }
+        "KC_6": {
+            "key": "CZ_ZCAR",
+            "label": "ž",
+        }
+        "KC_7": {
+            "key": "CZ_YACU",
+            "label": "ý",
+        }
+        "KC_8": {
+            "key": "CZ_AACU",
+            "label": "á",
+        }
+        "KC_9": {
+            "key": "CZ_IACU",
+            "label": "í",
+        }
+        "KC_0": {
+            "key": "CZ_EACU",
+            "label": "é",
+        }
+        "KC_MINS": {
+            "key": "CZ_EQL",
+            "label": "=",
+        }
+        "KC_EQL": {
+            "key": "CZ_ACUT",
+            "label": "' (dead)",
+        }
+        "KC_Q": {
+            "key": "CZ_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "CZ_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "CZ_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "CZ_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "CZ_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "CZ_Z",
+            "label": "Z",
+        }
+        "KC_U": {
+            "key": "CZ_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "CZ_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "CZ_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "CZ_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "CZ_UACU",
+            "label": "ú",
+        }
+        "KC_RBRC": {
+            "key": "CZ_RPRN",
+            "label": ")",
+        }
+        "KC_NUHS": {
+            "key": "CZ_DIAE",
+            "label": "¨ (dead)",
+        }
+        "KC_A": {
+            "key": "CZ_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "CZ_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "CZ_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "CZ_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "CZ_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "CZ_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "CZ_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "CZ_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "CZ_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "CZ_URNG",
+            "label": "ů",
+        }
+        "KC_QUOT": {
+            "key": "CZ_SECT",
+            "label": "§",
+        }
+        "KC_Z": {
+            "key": "CZ_Y",
+            "label": "Y",
+        }
+        "KC_X": {
+            "key": "CZ_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "CZ_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "CZ_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "CZ_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "CZ_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "CZ_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "CZ_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "CZ_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "CZ_MINS",
+            "label": "-",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │ | │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ / │ ( │ ` │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │   │   │   │   │   │   │   │   │   │ " │ ! │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │   │   │   │   │   │ ? │ : │ _ │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(CZ_BSLS)": {
+            "key": "CZ_PIPE",
+            "label": "|",
+        }
+        "S(CZ_PLUS)": {
+            "key": "CZ_1",
+            "label": "1",
+        }
+        "S(CZ_ECAR)": {
+            "key": "CZ_2",
+            "label": "2",
+        }
+        "S(CZ_SCAR)": {
+            "key": "CZ_3",
+            "label": "3",
+        }
+        "S(CZ_CCAR)": {
+            "key": "CZ_4",
+            "label": "4",
+        }
+        "S(CZ_RCAR)": {
+            "key": "CZ_5",
+            "label": "5",
+        }
+        "S(CZ_ZCAR)": {
+            "key": "CZ_6",
+            "label": "6",
+        }
+        "S(CZ_YACU)": {
+            "key": "CZ_7",
+            "label": "7",
+        }
+        "S(CZ_AACU)": {
+            "key": "CZ_8",
+            "label": "8",
+        }
+        "S(CZ_IACU)": {
+            "key": "CZ_9",
+            "label": "9",
+        }
+        "S(CZ_EACU)": {
+            "key": "CZ_0",
+            "label": "0",
+        }
+        "S(CZ_EQL)": {
+            "key": "CZ_PERC",
+            "label": "%",
+        }
+        "S(CZ_ACUT)": {
+            "key": "CZ_CARN",
+            "label": "ˇ (dead)",
+        }
+        "S(CZ_UACU)": {
+            "key": "CZ_SLSH",
+            "label": "/",
+        }
+        "S(CZ_RPRN)": {
+            "key": "CZ_LPRN",
+            "label": "(",
+        }
+         "S(CZ_DIAE)": {
+            "key": "CZ_GRV",
+            "label": "`",
+        }
+        "S(CZ_URNG)": {
+            "key": "CZ_DQUO",
+            "label": "\"",
+        }
+        "S(CZ_SECT)": {
+            "key": "CZ_EXLM",
+            "label": "!",
+        }
+        "S(CZ_COMM)": {
+            "key": "CZ_QUES",
+            "label": "?",
+        }
+        "S(CZ_DOT)": {
+            "key": "CZ_COLN",
+            "label": ":",
+        }
+        "S(CZ_MINS)": {
+            "key": "CZ_UNDS",
+            "label": "_",
+        }
+/* Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │   │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ ė │ ę │ € │   │   │   │   │   │   │ [ │ ] │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ ą │ ß │ ∂ │   │   │ ‘ │ ’ │   │ ł │ ; │ ' │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │   │   │   │ ‚ │   │ < │ > │ – │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "A(CZ_ECAR)": {
+            "key": "CZ_AT",
+            "label": "@",
+        }
+        "A(CZ_SCAR)": {
+            "key": "CZ_HASH",
+            "label": "#",
+        }
+        "A(CZ_CCAR)": {
+            "key": "CZ_DLR",
+            "label": "$",
+        }
+        "A(CZ_RCAR)": {
+            "key": "CZ_TILD",
+            "label": "~",
+        }
+        "A(CZ_ZCAR)": {
+            "key": "CZ_CIRC",
+            "label": "^",
+        }
+        "A(CZ_YACU)": {
+            "key": "CZ_AMPR",
+            "label": "&",
+        }
+        "A(CZ_AACU)": {
+            "key": "CZ_ASTR",
+            "label": "*",
+        }
+        "A(CZ_IACU)": {
+            "key": "CZ_LCBR",
+            "label": "{",
+        }
+        "A(CZ_EACU)": {
+            "key": "CZ_RCBR",
+            "label": "}",
+        }
+        "A(CZ_EQL)": {
+            "key": "CZ_RNGA",
+            "label": "° (dead)",
+        }
+        "A(CZ_ACUT)": {
+            "key": "CZ_DCIR",
+            "label": "^ (dead)",
+        }
+        "A(CZ_W)": {
+            "key": "CZ_LEDT",
+            "label": "ė",
+        }
+        "A(CZ_E)": {
+            "key": "CZ_LEOG",
+            "label": "ę",
+        }
+        "A(CZ_R)": {
+            "key": "CZ_EURO",
+            "label": "€",
+        }
+        "A(CZ_Z)": {
+            "key": "CZ_LZDT",
+            "label": "ż",
+        }
+        "A(CZ_UACU)": {
+            "key": "CZ_LBRC",
+            "label": "[",
+        }
+        "A(CZ_RPRN)": {
+            "key": "CZ_RBRC",
+            "label": "]",
+        }
+        "A(CZ_A)": {
+            "key": "CZ_LAOG",
+            "label": "ą",
+        }
+        "A(CZ_S)": {
+            "key": "CZ_SS",
+            "label": "ß",
+        }
+        "A(CZ_D)": {
+            "key": "CZ_PDIF",
+            "label": "∂",
+        }
+        "A(CZ_H)": {
+            "key": "CZ_LSQU",
+            "label": "‘",
+        }
+        "A(CZ_J)": {
+            "key": "CZ_RSQU",
+            "label": "’",
+        }
+        "A(CZ_L)": {
+            "key": "CZ_LLST",
+            "label": "ł",
+        }
+        "A(CZ_URNG)": {
+            "key": "CZ_SCLN",
+            "label": ";",
+        }
+        "A(CZ_SECT)": {
+            "key": "CZ_QUOT",
+            "label": "'",
+        }
+        "A(CZ_N)": {
+            "key": "CZ_SLQU",
+            "label": "‚",
+        }
+        "A(CZ_COMM)": {
+            "key": "CZ_LABK",
+            "label": "<",
+        }
+        "A(CZ_DOT)": {
+            "key": "CZ_RABK",
+            "label": ">",
+        }
+        "A(CZ_MINS)": {
+            "key": "CZ_NDSH",
+            "label": "–",
+        }
+/* Shift+Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ Ė │ Ę │ ® │ ™ │ Ż │   │   │   │   │ ‹ │ › │ " │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │      │ Ą │ ∑ │ ∆ │   │   │ “ │ ” │   │ Ł │ … │ ~ │      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──────┤
+ * │        │   │   │ © │ √ │   │ „ │   │ ≤ │ ≥ │ — │        │
+ * ├─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(A(CZ_1))": {
+            "key": "CZ_NOT",
+            "label": "¬",
+        }
+        "S(A(CZ_2))": {
+            "key": "CZ_BULT",
+            "label": "•",
+        }
+        "S(A(CZ_3))": {
+            "key": "CZ_NEQL",
+            "label": "≠",
+        }
+        "S(A(CZ_4))": {
+            "key": "CZ_PND",
+            "label": "£",
+        }
+        "S(A(CZ_5))": {
+            "key": "CZ_LOZN",
+            "label": "◊",
+        }
+        "S(A(CZ_6))": {
+            "key": "CZ_DAGG",
+            "label": "†",
+        }
+        "S(A(CZ_7))": {
+            "key": "CZ_PARA",
+            "label": "¶",
+        }
+        "S(A(CZ_8))": {
+            "key": "CZ_DIV",
+            "label": "÷",
+        }
+        "S(A(CZ_9))": {
+            "key": "CZ_LDAQ",
+            "label": "«",
+        }
+        "S(A(CZ_0))": {
+            "key": "CZ_RDAQ",
+            "label": "»",
+        }
+        "S(A(CZ_EQL))": {
+            "key": "CZ_DCOM",
+            "label": ", (dead)",
+        }
+        "S(A(CZ_ACUT))": {
+            "key": "CZ_DHPN",
+            "label": "- (dead)",
+        }
+        "S(A(CZ_W))": {
+            "key": "CZ_CEDT",
+            "label": "Ė",
+        }
+        "S(A(CZ_E))": {
+            "key": "CZ_CEOG",
+            "label": "Ę",
+        }
+        "S(A(CZ_R))": {
+            "key": "CZ_REGD",
+            "label": "®",
+        }
+        "S(A(CZ_T))": {
+            "key": "CZ_TM",
+            "label": "™",
+        }
+        "S(A(CZ_Z))": {
+            "key": "CZ_CZDT",
+            "label": "Ż",
+        }
+        "S(A(CZ_UACU))": {
+            "key": "CZ_LSAQ",
+            "label": "‹",
+        }
+        "S(A(CZ_RPRN))": {
+            "key": "CZ_RSAQ",
+            "label": "›",
+        }
+        "S(A(CZ_DIAE))": {
+            "key": "CZ_DDQT",
+            "label": "\" (dead)",
+        }
+        "S(A(CZ_A))": {
+            "key": "CZ_CAOG",
+            "label": "Ą",
+        }
+        "S(A(CZ_S))": {
+            "key": "CZ_NARS",
+            "label": "∑",
+        }
+        "S(A(CZ_D))": {
+            "key": "CZ_INCR",
+            "label": "∆",
+        }
+        "S(A(CZ_H))": {
+            "key": "CZ_LDQU",
+            "label": "“",
+        }
+        "S(A(CZ_J))": {
+            "key": "CZ_RDQU",
+            "label": "”",
+        }
+        "S(A(CZ_L))": {
+            "key": "CZ_CLST",
+            "label": "Ł",
+        }
+        "S(A(CZ_URNG))": {
+            "key": "CZ_ELLP",
+            "label": "…",
+        }
+        "S(A(CZ_SECT))": {
+            "key": "CZ_DTIL",
+            "label": "~ (dead)",
+        }
+        "S(A(CZ_C))": {
+            "key": "CZ_COPY",
+            "label": "©",
+        }
+        "S(A(CZ_V))": {
+            "key": "CZ_SQRT",
+            "label": "√",
+        }
+        "S(A(CZ_N))": {
+            "key": "CZ_DLQU",
+            "label": "„",
+        }
+        "S(A(CZ_COMM))": {
+            "key": "CZ_LEQL",
+            "label": "≤",
+        }
+        "S(A(CZ_DOT))": {
+            "key": "CZ_GEQL",
+            "label": "≥",
+        }
+        "S(A(CZ_MINS))": {
+            "key": "CZ_MDSH",
+            "label": "—",
+        }
+    }
+}

data/constants/keycodes/extras/keycodes_czech_mac_iso_0.0.1.hjson

@@ -0,0 +1,580 @@
+{
+    "aliases": {
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ' │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "KC_1": {
+            "key": "CZ_PLUS",
+            "label": "+",
+        }
+        "KC_2": {
+            "key": "CZ_ECAR",
+            "label": "ě",
+        }
+        "KC_3": {
+            "key": "CZ_SCAR",
+            "label": "š",
+        }
+        "KC_4": {
+            "key": "CZ_CCAR",
+            "label": "č",
+        }
+        "KC_5": {
+            "key": "CZ_RCAR",
+            "label": "ř",
+        }
+        "KC_6": {
+            "key": "CZ_ZCAR",
+            "label": "ž",
+        }
+        "KC_7": {
+            "key": "CZ_YACU",
+            "label": "ý",
+        }
+        "KC_8": {
+            "key": "CZ_AACU",
+            "label": "á",
+        }
+        "KC_9": {
+            "key": "CZ_IACU",
+            "label": "í",
+        }
+        "KC_0": {
+            "key": "CZ_EACU",
+            "label": "é",
+        }
+        "KC_MINS": {
+            "key": "CZ_EQL",
+            "label": "=",
+        }
+        "KC_EQL": {
+            "key": "CZ_ACUT",
+            "label": "' (dead)",
+        }
+        "KC_Q": {
+            "key": "CZ_Q",
+            "label": "Q",
+        }
+        "KC_W": {
+            "key": "CZ_W",
+            "label": "W",
+        }
+        "KC_E": {
+            "key": "CZ_E",
+            "label": "E",
+        }
+        "KC_R": {
+            "key": "CZ_R",
+            "label": "R",
+        }
+        "KC_T": {
+            "key": "CZ_T",
+            "label": "T",
+        }
+        "KC_Y": {
+            "key": "CZ_Z",
+            "label": "Z",
+        }
+        "KC_U": {
+            "key": "CZ_U",
+            "label": "U",
+        }
+        "KC_I": {
+            "key": "CZ_I",
+            "label": "I",
+        }
+        "KC_O": {
+            "key": "CZ_O",
+            "label": "O",
+        }
+        "KC_P": {
+            "key": "CZ_P",
+            "label": "P",
+        }
+        "KC_LBRC": {
+            "key": "CZ_UACU",
+            "label": "ú",
+        }
+        "KC_RBRC": {
+            "key": "CZ_RPRN",
+            "label": ")",
+        }
+        "KC_A": {
+            "key": "CZ_A",
+            "label": "A",
+        }
+        "KC_S": {
+            "key": "CZ_S",
+            "label": "S",
+        }
+        "KC_D": {
+            "key": "CZ_D",
+            "label": "D",
+        }
+        "KC_F": {
+            "key": "CZ_F",
+            "label": "F",
+        }
+        "KC_G": {
+            "key": "CZ_G",
+            "label": "G",
+        }
+        "KC_H": {
+            "key": "CZ_H",
+            "label": "H",
+        }
+        "KC_J": {
+            "key": "CZ_J",
+            "label": "J",
+        }
+        "KC_K": {
+            "key": "CZ_K",
+            "label": "K",
+        }
+        "KC_L": {
+            "key": "CZ_L",
+            "label": "L",
+        }
+        "KC_SCLN": {
+            "key": "CZ_URNG",
+            "label": "ů",
+        }
+        "KC_QUOT": {
+            "key": "CZ_SECT",
+            "label": "§",
+        }
+        "KC_NUHS": {
+            "key": "CZ_DIAE",
+            "label": "¨ (dead)",
+        }
+        "KC_NUBS": {
+            "key": "CZ_BSLS",
+            "label": "\\",
+        }
+        "KC_Z": {
+            "key": "CZ_Y",
+            "label": "Y",
+        }
+        "KC_X": {
+            "key": "CZ_X",
+            "label": "X",
+        }
+        "KC_C": {
+            "key": "CZ_C",
+            "label": "C",
+        }
+        "KC_V": {
+            "key": "CZ_V",
+            "label": "V",
+        }
+        "KC_B": {
+            "key": "CZ_B",
+            "label": "B",
+        }
+        "KC_N": {
+            "key": "CZ_N",
+            "label": "N",
+        }
+        "KC_M": {
+            "key": "CZ_M",
+            "label": "M",
+        }
+        "KC_COMM": {
+            "key": "CZ_COMM",
+            "label": ",",
+        }
+        "KC_DOT": {
+            "key": "CZ_DOT",
+            "label": ".",
+        }
+        "KC_SLSH": {
+            "key": "CZ_MINS",
+            "label": "-",
+        }
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │ / │ ( │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │   │   │   │   │   │   │   │   │   │ " │ ! │ ` │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │ | │   │   │   │   │   │   │   │ ? │ : │ _ │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(CZ_PLUS)": {
+            "key": "CZ_1",
+            "label": "1",
+        }
+        "S(CZ_ECAR)": {
+            "key": "CZ_2",
+            "label": "2",
+        }
+        "S(CZ_SCAR)": {
+            "key": "CZ_3",
+            "label": "3",
+        }
+        "S(CZ_CCAR)": {
+            "key": "CZ_4",
+            "label": "4",
+        }
+        "S(CZ_RCAR)": {
+            "key": "CZ_5",
+            "label": "5",
+        }
+        "S(CZ_ZCAR)": {
+            "key": "CZ_6",
+            "label": "6",
+        }
+        "S(CZ_YACU)": {
+            "key": "CZ_7",
+            "label": "7",
+        }
+        "S(CZ_AACU)": {
+            "key": "CZ_8",
+            "label": "8",
+        }
+        "S(CZ_IACU)": {
+            "key": "CZ_9",
+            "label": "9",
+        }
+        "S(CZ_EACU)": {
+            "key": "CZ_0",
+            "label": "0",
+        }
+        "S(CZ_EQL)": {
+            "key": "CZ_PERC",
+            "label": "%",
+        }
+        "S(CZ_ACUT)": {
+            "key": "CZ_CARN",
+            "label": "ˇ (dead)",
+        }
+        "S(CZ_UACU)": {
+            "key": "CZ_SLSH",
+            "label": "/",
+        }
+        "S(CZ_RPRN)": {
+            "key": "CZ_LPRN",
+            "label": "(",
+        }
+        "S(CZ_URNG)": {
+            "key": "CZ_DQUO",
+            "label": "\"",
+        }
+        "S(CZ_SECT)": {
+            "key": "CZ_EXLM",
+            "label": "!",
+        }
+        "S(CZ_DIAE)": {
+            "key": "CZ_GRV",
+            "label": "`",
+        }
+        "S(CZ_BSLS)": {
+            "key": "CZ_PIPE",
+            "label": "|",
+        }
+        "S(CZ_COMM)": {
+            "key": "CZ_QUES",
+            "label": "?",
+        }
+        "S(CZ_DOT)": {
+            "key": "CZ_COLN",
+            "label": ":",
+        }
+        "S(CZ_MINS)": {
+            "key": "CZ_UNDS",
+            "label": "_",
+        }
+/* Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │   │ @ │ # │ $ │ ~ │ ^ │ & │ * │ { │ } │ ° │ ^ │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ ė │ ę │ € │   │ ż │   │   │   │   │ [ │ ] │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ ą │ ß │ ∂ │   │   │ ‘ │ ’ │   │ ł │ ; │ ' │   │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │   │   │   │   │   │   │ ‚ │   │ < │ > │ – │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "A(CZ_ECAR)": {
+            "key": "CZ_AT",
+            "label": "@",
+        }
+        "A(CZ_SCAR)": {
+            "key": "CZ_HASH",
+            "label": "#",
+        }
+        "A(CZ_CCAR)": {
+            "key": "CZ_DLR",
+            "label": "$",
+        }
+        "A(CZ_RCAR)": {
+            "key": "CZ_TILD",
+            "label": "~",
+        }
+        "A(CZ_ZCAR)": {
+            "key": "CZ_CIRC",
+            "label": "^",
+        }
+        "A(CZ_YACU)": {
+            "key": "CZ_AMPR",
+            "label": "&",
+        }
+        "A(CZ_AACU)": {
+            "key": "CZ_ASTR",
+            "label": "*",
+        }
+        "A(CZ_IACU)": {
+            "key": "CZ_LCBR",
+            "label": "{",
+        }
+        "A(CZ_EACU)": {
+            "key": "CZ_RCBR",
+            "label": "}",
+        }
+        "A(CZ_EQL)": {
+            "key": "CZ_RNGA",
+            "label": "° (dead)",
+        }
+        "A(CZ_ACUT)": {
+            "key": "CZ_DCIR",
+            "label": "^ (dead)",
+        }
+        "A(CZ_W)": {
+            "key": "CZ_LEDT",
+            "label": "ė",
+        }
+        "A(CZ_E)": {
+            "key": "CZ_LEOG",
+            "label": "ę",
+        }
+        "A(CZ_R)": {
+            "key": "CZ_EURO",
+            "label": "€",
+        }
+        "A(CZ_Z)": {
+            "key": "CZ_LZDT",
+            "label": "ż",
+        }
+        "A(CZ_UACU)": {
+            "key": "CZ_LBRC",
+            "label": "[",
+        }
+        "A(CZ_RPRN)": {
+            "key": "CZ_RBRC",
+            "label": "]",
+        }
+        "A(CZ_A)": {
+            "key": "CZ_LAOG",
+            "label": "ą",
+        }
+        "A(CZ_S)": {
+            "key": "CZ_SS",
+            "label": "ß",
+        }
+        "A(CZ_D)": {
+            "key": "CZ_PDIF",
+            "label": "∂",
+        }
+        "A(CZ_H)": {
+            "key": "CZ_LSQU",
+            "label": "‘",
+        }
+        "A(CZ_J)": {
+            "key": "CZ_RSQU",
+            "label": "’",
+        }
+        "A(CZ_L)": {
+            "key": "CZ_LLST",
+            "label": "ł",
+        }
+        "A(CZ_URNG)": {
+            "key": "CZ_SCLN",
+            "label": ";",
+        }
+        "A(CZ_SECT)": {
+            "key": "CZ_QUOT",
+            "label": "'",
+        }
+        "A(CZ_N)": {
+            "key": "CZ_SLQU",
+            "label": "‚",
+        }
+        "A(CZ_COMM)": {
+            "key": "CZ_LABK",
+            "label": "<",
+        }
+        "A(CZ_DOT)": {
+            "key": "CZ_RABK",
+            "label": ">",
+        }
+        "A(CZ_MINS)": {
+            "key": "CZ_NDSH",
+            "label": "–",
+        }
+/* Shift+Alted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │ ¬ │ • │ ≠ │ £ │ ◊ │ † │ ¶ │ ÷ │ « │ » │ , │ - │     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬───┤
+ * │     │   │ Ė │ Ę │ ® │ ™ │ Ż │   │   │   │   │ ‹ │ › │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐  │
+ * │      │ Ą │ ∑ │ ∆ │   │   │ “ │ ” │   │ Ł │ … │ ~ │ " │  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴──┤
+ * │    │   │   │   │ © │ √ │   │ „ │   │ ≤ │ ≥ │ — │        │
+ * ├────┴┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┼───┴─┬─┴──┬─────┤
+ * │     │    │     │                       │     │    │     │
+ * └─────┴────┴─────┴───────────────────────┴─────┴────┴─────┘
+ */
+        "S(A(CZ_1))": {
+            "key": "CZ_NOT",
+            "label": "¬",
+        }
+        "S(A(CZ_2))": {
+            "key": "CZ_BULT",
+            "label": "•",
+        }
+        "S(A(CZ_3))": {
+            "key": "CZ_NEQL",
+            "label": "≠",
+        }
+        "S(A(CZ_4))": {
+            "key": "CZ_PND",
+            "label": "£",
+        }
+        "S(A(CZ_5))": {
+            "key": "CZ_LOZN",
+            "label": "◊",
+        }
+        "S(A(CZ_6))": {
+            "key": "CZ_DAGG",
+            "label": "†",
+        }
+        "S(A(CZ_7))": {
+            "key": "CZ_PARA",
+            "label": "¶",
+        }
+        "S(A(CZ_8))": {
+            "key": "CZ_DIV",
+            "label": "÷",
+        }
+        "S(A(CZ_9))": {
+            "key": "CZ_LDAQ",
+            "label": "«",
+        }
+        "S(A(CZ_0))": {
+            "key": "CZ_RDAQ",
+            "label": "»",
+        }
+        "S(A(CZ_EQL))": {
+            "key": "CZ_DCOM",
+            "label": ", (dead)",
+        }
+        "S(A(CZ_ACUT))": {
+            "key": "CZ_DHPN",
+            "label": "- (dead)",
+        }
+        "S(A(CZ_W))": {
+            "key": "CZ_CEDT",
+            "label": "Ė",
+        }
+        "S(A(CZ_E))": {
+            "key": "CZ_CEOG",
+            "label": "Ę",
+        }
+        "S(A(CZ_R))": {
+            "key": "CZ_REGD",
+            "label": "®",
+        }
+        "S(A(CZ_T))": {
+            "key": "CZ_TM",
+            "label": "™",
+        }
+        "S(A(CZ_Z))": {
+            "key": "CZ_CZDT",
+            "label": "Ż",
+        }
+        "S(A(CZ_UACU))": {
+            "key": "CZ_LSAQ",
+            "label": "‹",
+        }
+        "S(A(CZ_RPRN))": {
+            "key": "CZ_RSAQ",
+            "label": "›",
+        }
+        "S(A(CZ_A))": {
+            "key": "CZ_CAOG",
+            "label": "Ą",
+        }
+        "S(A(CZ_S))": {
+            "key": "CZ_NARS",
+            "label": "∑",
+        }
+        "S(A(CZ_D))": {
+            "key": "CZ_INCR",
+            "label": "∆",
+        }
+        "S(A(CZ_H))": {
+            "key": "CZ_LDQU",
+            "label": "“",
+        }
+        "S(A(CZ_J))": {
+            "key": "CZ_RDQU",
+            "label": "”",
+        }
+        "S(A(CZ_L))": {
+            "key": "CZ_CLST",
+            "label": "Ł",
+        }
+        "S(A(CZ_URNG))": {
+            "key": "CZ_ELLP",
+            "label": "…",
+        }
+        "S(A(CZ_SECT))": {
+            "key": "CZ_DTIL",
+            "label": "~ (dead)",
+        }
+        "S(A(CZ_DIAE))": {
+            "key": "CZ_DDQT",
+            "label": "\" (dead)",
+        }
+        "S(A(CZ_C))": {
+            "key": "CZ_COPY",
+            "label": "©",
+        }
+        "S(A(CZ_V))": {
+            "key": "CZ_SQRT",
+            "label": "√",
+        }
+        "S(A(CZ_N))": {
+            "key": "CZ_DLQU",
+            "label": "„",
+        }
+        "S(A(CZ_COMM))": {
+            "key": "CZ_LEQL",
+            "label": "≤",
+        }
+        "S(A(CZ_DOT))": {
+            "key": "CZ_GEQL",
+            "label": "≥",
+        }
+        "S(A(CZ_MINS))": {
+            "key": "CZ_MDSH",
+            "label": "—",
+        }
+    }
+}

data/mappings/info_config.hjson

@@ -164,7 +164,6 @@
     "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"},
     "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"},
     "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"},
-    "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"},
 
     // Secure
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
@@ -215,6 +214,7 @@
     "WS2812_DI_PIN": {"info_key": "ws2812.pin"},
     "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"},
     "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"},
+    "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"},
 
     "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
 
@@ -229,6 +229,7 @@
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
     "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
+    "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"},
     "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
     "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true},
     "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true},

data/mappings/info_rules.hjson

@@ -11,6 +11,7 @@
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
 
+    "AUDIO_DRIVER": {"info_key": "audio.driver"},
     "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
     "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
     "BOARD": {"info_key": "board"},
@@ -44,7 +45,7 @@
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
     "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
     "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
-    "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+    "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"},
     "WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"},
     "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 

data/schemas/keyboard.jsonschema

@@ -133,6 +133,10 @@
                         "clicky": {"type": "boolean"}
                     }
                 },
+                "driver": {
+                    "type": "string",
+                    "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"]
+                },
                 "macro_beep": {"type": "boolean"},
                 "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                 "power_control": {
@@ -657,7 +661,10 @@
                     "$ref": "qmk.definitions.v1#/mcu_pin",
                     "$comment": "Deprecated: use ws2812.pin instead"
                 },
-                "rgbw": {"type": "boolean"},
+                "rgbw": {
+                    "type": "boolean",
+                    "$comment": "Deprecated: use ws2812.rgbw instead"
+                },
                 "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sleep": {"type": "boolean"},
                 "split": {"type": "boolean"},
@@ -894,7 +901,7 @@
                     }
                 },
                 "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "wait_for": {"type": "boolean"}
+                "wait_for_enumeration": {"type": "boolean"}
             }
         },
         "qmk": {
@@ -933,6 +940,7 @@
                     "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"]
                 },
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "rgbw": {"type": "boolean"},
                 "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"},
                 "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
             }

docs/ChangeLog/20240526/PR23309.md

@@ -0,0 +1,35 @@
+# MechKeys ACR60 Layout Updates
+
+This PR removed and changed some of the layouts that were configured for
+the ACR60. If you use one of the following layouts, you will need to
+update your keymap:
+
+- [`LAYOUT_hhkb`](#layout-hhkb)
+- [`LAYOUT_true_hhkb`](#layout-true-hhkb)
+- [`LAYOUT_directional`](#layout-directional)
+- [`LAYOUT_mitchsplit`](#layout-mitchsplit)
+
+## `LAYOUT_hhkb` :id=layout-hhkb
+
+1. Change your layout macro to `LAYOUT_60_hhkb`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+
+## `LAYOUT_true_hhkb` :id=layout-true-hhkb
+
+1. Change your layout macro to `LAYOUT_60_true_hhkb`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+
+## `LAYOUT_directional` :id=layout-directional
+
+1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`.
+2. Remove any keycodes for the key between Left Shift and QWERTY Z.
+3. Remove any keycodes for the keys immediately before *and* after the
+1.25u key of Split Spacebar.
+
+If you need split spacebars, you may implement
+`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to
+it, removing the keycode between Left Shift and QWERTY Z.
+
+## `LAYOUT_mitchsplit` :id=layout-mitchsplit
+
+1. Use `LAYOUT_60_ansi_split_space_split_rshift`.

docs/config_options.md

@@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in
   * units to step when in/decreasing saturation
 * `#define RGBLIGHT_VAL_STEP 12`
   * units to step when in/decreasing value (brightness)
-* `#define RGBW`
+* `#define WS2812_RGBW`
   * Enables RGBW LED support
 
 ## Mouse Key Options
@@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab
   * Allows replacing the standard matrix scanning routine with a custom one.
 * `DEBOUNCE_TYPE`
   * Allows replacing the standard key debouncing routine with an alternative or custom one.
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * Forces the keyboard to wait for a USB connection to be established before it starts up
 * `NO_USB_STARTUP_CHECK`
   * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.

docs/feature_rgblight.md

@@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo
 
 Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard.
 
-Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported):
+Currently QMK supports the following addressable LEDs:
 
  * WS2811, WS2812, WS2812B, WS2812C, etc.
  * SK6812, SK6812MINI, SK6805

docs/ja/config_options.md

@@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * 標準マトリックス走査ルーチンを独自のものに置き換えることができます。
 * `DEBOUNCE_TYPE`
   * 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます
 * `NO_USB_STARTUP_CHECK`
   * キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。

docs/reference_info_json.md

@@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature.
         * `clicky`
             * The default audio clicky enabled state.
             * Default: `true`
+    * `driver`
+        * The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`.
     * `macro_beep`
         * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
         * Default: `false`
@@ -586,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature.
     * `max_brightness`
         * The maximum value which the HSV "V" component is scaled to, from 0 to 255.
         * Default: `255`
-    * `rgbw`
-        * Enable RGBW LEDs.
-        * Default: `false`
     * `saturation_steps`
         * The number of saturation adjustment steps.
         * Default: `17`
@@ -833,7 +832,7 @@ Configures the [Stenography](feature_stenography.md) feature.
     * `suspend_wakeup_delay`
         * The amount of time to wait after sending a wakeup packet, in milliseconds.
         * Default: `0` (disabled)
-    * `wait_for`
+    * `wait_for_enumeration`
         * Force the keyboard to wait for USB enumeration before starting up.
         * Default: `false`
 
@@ -853,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver.
     * `i2c_timeout`
         * The I²C timeout in milliseconds (`i2c` driver only).
         * Default: `100` (100 ms)
+    * `rgbw`
+        * Enable RGBW LEDs.
+        * Default: `false`

docs/reference_keymap_extras.md

@@ -23,6 +23,8 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
 |Canadian Multilingual (CSA)      |`keymap_canadian_multilingual.h` |`sendstring_canadian_multilingual.h`|
 |Croatian                         |`keymap_croatian.h`              |`sendstring_croatian.h`             |
 |Czech                            |`keymap_czech.h`                 |`sendstring_czech.h`                |
+|Czech (macOS, ANSI)              |`keymap_czech_mac_ansi.h`        |`sendstring_czech_mac_ansi.h`       |
+|Czech (macOS, ISO)               |`keymap_czech_mac_iso.h`         |`sendstring_czech_mac_iso.h`        |
 |Danish                           |`keymap_danish.h`                |`sendstring_danish.h`               |
 |Dutch (Belgium)                  |`keymap_belgian.h`               |`sendstring_belgian.h`              |
 |English (Ireland)                |`keymap_irish.h`                 |                                    |

docs/ws2812_driver.md

@@ -33,6 +33,7 @@ Add the following to your `config.h`:
 |`WS2812_T0H`       |`350`                  |The length of a "0" bit's high phase in nanoseconds                                             |
 |`WS2812_TRST_US`   |`280`                  |The length of the reset phase in microseconds                                                   |
 |`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data                                                                  |
+|`WS2812_RGBW`      |*Not defined*          |Enables RGBW support (except `i2c` driver)                                                      |
 
 ### Timing Adjustment :id=timing-adjustment
 
@@ -58,6 +59,27 @@ Where the byte order may be one of:
 |`RGB`     |WS2812B-2020                |
 |`BGR`     |TM1812                      |
 
+### RGBW Support :id=rgbw-support
+
+Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed.
+
+QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel:
+
+```
+w = min(r, g, b)
+r -= w
+g -= w
+b -= w
+```
+
+Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`).
+
+To enable RGBW conversion, add the following to your `config.h`:
+
+```c
+#define WS2812_RGBW
+```
+
 ## Driver Configuration :id=driver-configuration
 
 Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers.

keyboards/40percentclub/ut47/led.c

@@ -25,16 +25,14 @@ bool led_update_kb(led_t led_state)
     if (res) {
         if (led_state.caps_lock) {
             // output low
-            DDRB |= (1<<0);
-            PORTB &= ~(1<<0);
-            DDRD |= (1<<5);
-            PORTD &= ~(1<<5);
+            gpio_set_pin_output(B0);
+            gpio_write_pin_low(B0);
+            gpio_set_pin_output(D5);
+            gpio_write_pin_low(D5);
         } else {
             // Hi-Z
-            DDRB &= ~(1<<0);
-            PORTB &= ~(1<<0);
-            DDRD &= ~(1<<5);
-            PORTD &= ~(1<<5);
+            gpio_set_pin_input(B0);
+            gpio_set_pin_input(D5);
         }
     }
     return false;

keyboards/40percentclub/ut47/matrix.c

@@ -126,14 +126,18 @@ void matrix_print(void)
 static void  init_cols(void)
 {
     // Input with pull-up(DDR:0, PORT:1)
-    DDRF  &= ~(1<<4 | 1<<5 | 1<<6 | 1<<7);
-    PORTF |=  (1<<4 | 1<<5 | 1<<6 | 1<<7);
-    DDRE  &= ~(1<<6);
-    PORTE |=  (1<<6);
-    DDRD  &= ~(1<<7);
-    PORTD |=  (1<<7);
-    DDRB  &= ~(1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6);
-    PORTB |=  (1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6);
+    gpio_set_pin_input_high(F4);
+    gpio_set_pin_input_high(F5);
+    gpio_set_pin_input_high(F6);
+    gpio_set_pin_input_high(F7);
+    gpio_set_pin_input_high(E6);
+    gpio_set_pin_input_high(D7);
+    gpio_set_pin_input_high(B1);
+    gpio_set_pin_input_high(B2);
+    gpio_set_pin_input_high(B3);
+    gpio_set_pin_input_high(B4);
+    gpio_set_pin_input_high(B5);
+    gpio_set_pin_input_high(B6);
 }
 
 static matrix_row_t read_cols(void)
@@ -160,10 +164,10 @@ static matrix_row_t read_cols(void)
 static void unselect_rows(void)
 {
     // Hi-Z(DDR:0, PORT:0) to unselect
-    DDRD  &= ~0b00010011;
-    PORTD &= ~0b00010011;
-    DDRC  &= ~0b01000000;
-    PORTC &= ~0b01000000;
+    gpio_set_pin_input(C6);
+    gpio_set_pin_input(D0);
+    gpio_set_pin_input(D1);
+    gpio_set_pin_input(D4);
 }
 
 static void select_row(uint8_t row)
@@ -171,20 +175,20 @@ static void select_row(uint8_t row)
     // Output low(DDR:1, PORT:0) to select
     switch (row) {
         case 0:
-            DDRD  |= (1<<1);
-            PORTD &= ~(1<<1);
+            gpio_set_pin_output(D1);
+            gpio_write_pin_low(D1);
             break;
         case 1:
-            DDRD  |= (1<<0);
-            PORTD &= ~(1<<0);
+            gpio_set_pin_output(D0);
+            gpio_write_pin_low(D0);
             break;
         case 2:
-            DDRD  |= (1<<4);
-            PORTD &= ~(1<<4);
+            gpio_set_pin_output(D4);
+            gpio_write_pin_low(D4);
             break;
         case 3:
-            DDRC  |= (1<<6);
-            PORTC &= ~(1<<6);
+            gpio_set_pin_output(C6);
+            gpio_write_pin_low(C6);
             break;
     }
 }

keyboards/adafruit/macropad/keyboard.json

@@ -19,6 +19,7 @@
         "oled": true
     },
     "audio": {
+        "driver": "pwm_hardware",
         "power_control": {
             "pin": "GP14"
         }

keyboards/adafruit/macropad/rules.mk

@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 OLED_TRANSPORT = spi

keyboards/amjkeyboard/amj96/matrix.c

@@ -65,8 +65,8 @@ void matrix_init(void)
 #endif
 
     // 85 REST
-    DDRD |= _BV(PD7);
-    PORTD |= _BV(PD7);
+    gpio_set_pin_output(D7);
+    gpio_write_pin_high(D7);
 
     // initialize row and col
     init_rows();
@@ -143,36 +143,35 @@ static void  init_cols(void)
     DDRD &= 0b00011100;
     PORTD |= 0b11100011;
 
-    DDRB &= ~(_BV(PB6) | _BV(PB7)| _BV(PB0));
-    PORTB |= (_BV(PB6) | _BV(PB7)| _BV(PB0));
+    gpio_set_pin_input_high(B0);
+    gpio_set_pin_input_high(B6);
+    gpio_set_pin_input_high(B7);
 
-    DDRE &= ~_BV(PE6);
-    PORTE |= _BV(PE6);
+    gpio_set_pin_input_high(E6);
 
-    DDRC &= ~_BV(PC7);
-    PORTC |= _BV(PC7);
+    gpio_set_pin_input_high(C7);
 
 }
 
 static matrix_row_t read_cols(void)
 {
 
-    return (PINF&_BV(PF7) ? 0 : (1<<0)) |
-           (PINF&_BV(PF6) ? 0 : (1<<1)) |
-           (PINF&_BV(PF5) ? 0 : (1<<2)) |
-           (PINF&_BV(PF4) ? 0 : (1<<3)) |
-           (PINF&_BV(PF1) ? 0 : (1<<4)) |
-           (PINF&_BV(PF0) ? 0 : (1<<5)) |
-           (PINE&_BV(PE6) ? 0 : (1<<6)) |
-           (PIND&_BV(PD7) ? 0 : (1<<7)) |
-           (PIND&_BV(PD6) ? 0 : (1<<8)) |
-           (PIND&_BV(PD5) ? 0 : (1<<9)) |
-           (PIND&_BV(PD1) ? 0 : (1<<10)) |
-           (PIND&_BV(PD0) ? 0 : (1<<11)) |
-           (PINB&_BV(PB7) ? 0 : (1<<12)) |
-           (PINB&_BV(PB6) ? 0 : (1<<13)) |
-           (PINB&_BV(PB0) ? 0 : (1<<14)) |
-           (PINC&_BV(PC7) ? 0 : (1<<15));
+    return (gpio_read_pin(F7) ? 0 : (1<<0)) |
+           (gpio_read_pin(F6) ? 0 : (1<<1)) |
+           (gpio_read_pin(F5) ? 0 : (1<<2)) |
+           (gpio_read_pin(F4) ? 0 : (1<<3)) |
+           (gpio_read_pin(F1) ? 0 : (1<<4)) |
+           (gpio_read_pin(F0) ? 0 : (1<<5)) |
+           (gpio_read_pin(E6) ? 0 : (1<<6)) |
+           (gpio_read_pin(D7) ? 0 : (1<<7)) |
+           (gpio_read_pin(D6) ? 0 : (1<<8)) |
+           (gpio_read_pin(D5) ? 0 : (1<<9)) |
+           (gpio_read_pin(D1) ? 0 : (1<<10)) |
+           (gpio_read_pin(D0) ? 0 : (1<<11)) |
+           (gpio_read_pin(B7) ? 0 : (1<<12)) |
+           (gpio_read_pin(B6) ? 0 : (1<<13)) |
+           (gpio_read_pin(B0) ? 0 : (1<<14)) |
+           (gpio_read_pin(C7) ? 0 : (1<<15));
 }
 
 /* Row pin configuration
@@ -184,21 +183,23 @@ static matrix_row_t read_cols(void)
 
 static void init_rows(void)
 {
-     DDRB  |= (1<<PB1 | 1<<PB2 | 1<<PB3);
+    gpio_set_pin_input(B1);
+    gpio_set_pin_input(B2);
+    gpio_set_pin_input(B3);
 }
 
 static void unselect_rows(void)
 {
     // Hi-Z(DDR:0, PORT:0) to unselect
-    PORTB |= (1<<PB1);
-    PORTB |= (1<<PB2);
-    PORTB |= (1<<PB3);
+    gpio_write_pin_high(B1);
+    gpio_write_pin_high(B2);
+    gpio_write_pin_high(B3);
 }
 
 static void select_row(uint8_t row)
 {
     // Output low(DDR:1, PORT:0) to select
-    (row & (1<<0)) ? (PORTB |= (1<<PB3)) : (PORTB &= ~(1<<PB3));
-    (row & (1<<1)) ? (PORTB |= (1<<PB2)) : (PORTB &= ~(1<<PB2));
-    (row & (1<<2)) ? (PORTB |= (1<<PB1)) : (PORTB &= ~(1<<PB1));
+    gpio_write_pin(B3, row & (1<<0));
+    gpio_write_pin(B2, row & (1<<1));
+    gpio_write_pin(B1, row & (1<<2));
 }

keyboards/arrowmechanics/wings/keyboard.json

@@ -17,6 +17,9 @@
         "mousekey": true,
         "rgb_matrix": true
     },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
         "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]

keyboards/arrowmechanics/wings/rules.mk

@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-AUDIO_DRIVER = pwm_hardware

keyboards/bajjak/bajjak.c

@@ -54,15 +54,13 @@ void matrix_init_kb(void) {
     TCCR1B = 0b00001001;  // set and configure fast PWM
 
     // (tied to Vcc for hardware convenience)
-    DDRB  &= ~(1<<4);  // set B(4) as input
-    PORTB &= ~(1<<4);  // set B(4) internal pull-up disabled
+    gpio_set_pin_input(B4); // set B(4) as input, internal pull-up disabled
 
     // unused pins - D4, D5, E6
     // set as input with internal pull-up enabled
-    DDRD  &= ~(1<<5 | 1<<4);
-    DDRE  &= ~(1<<6);
-    PORTD |=  (1<<5 | 1<<4);
-    PORTE |=  (1<<6);
+    gpio_set_pin_input_high(D4);
+    gpio_set_pin_input_high(D5);
+    gpio_set_pin_input_high(E6);
 
     keyboard_config.raw = eeconfig_read_kb();
     bajjak_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );

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

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "eeprom": {
         "driver": "spi"

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

@@ -1,22 +1,5 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
-
 SERIAL_DRIVER = usart

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

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

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

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

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

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

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

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

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

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis Nano (3x5) STeMCell",
     "usb": {
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "rgb_matrix": {
         "driver": "ws2812"

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

@@ -1,22 +1,6 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

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

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "eeprom": {
         "driver": "spi"

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

@@ -1,22 +1,6 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

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

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

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

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

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

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

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

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

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

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis Mini (3x6) STeMCell",
     "usb": {
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "rgb_matrix": {
         "driver": "ws2812"

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

@@ -1,22 +1,6 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

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

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis (4x6) Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "eeprom": {
         "driver": "spi"

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

@@ -1,22 +1,6 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json → keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json → keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json

@@ -3,6 +3,16 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
+    "build": {
+        "lto": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,23 +1,4 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported.
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-# Enable link-time optimization by default.  The Charybdis packs a lot of
-# features (RGB, Via, trackball) in a small atmega32u4 package.
-LTO_ENABLE = yes

keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json → keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json → keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json

@@ -3,6 +3,13 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,20 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json → keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json

@@ -1,7 +1,17 @@
 {
     "keyboard_name": "Charybdis (4x6) STeMCell",
     "usb": {
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "rgb_matrix": {
         "driver": "ws2812"

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

@@ -1,22 +1,6 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/dilemma/3x5_2/assembled/info.json → keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json

@@ -1,5 +1,11 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Assembled",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "pointing_device": true
+    },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
         "rows": ["GP4", "GP5", "GP28", "GP26"]

keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk

@@ -1,22 +1,7 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.

keyboards/bastardkb/dilemma/3x5_2/splinky/info.json → keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json

@@ -1,5 +1,11 @@
 {
     "keyboard_name": "Dilemma (3x5+2) Splinky",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "pointing_device": true
+    },
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
         "rows": ["GP4", "GP5", "GP28", "GP26"]

keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk

@@ -1,22 +1,7 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = no   # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = no     # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no      # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.

keyboards/bastardkb/dilemma/3x5_3/info.json → keyboards/bastardkb/dilemma/3x5_3/keyboard.json

@@ -38,6 +38,7 @@
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true,
+        "pointing_device": true,
         "caps_word": true,
         "tri_layer": true
     },

keyboards/bastardkb/dilemma/3x5_3/rules.mk

@@ -1,4 +1,3 @@
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi

keyboards/bastardkb/dilemma/4x6_4/info.json → keyboards/bastardkb/dilemma/4x6_4/keyboard.json

@@ -38,6 +38,7 @@
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true,
+        "pointing_device": true,
         "caps_word": true,
         "tri_layer": true
     },

keyboards/bastardkb/dilemma/4x6_4/rules.mk

@@ -1,4 +1,3 @@
 SERIAL_DRIVER = vendor
 
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi

keyboards/bastardkb/scylla/blackpill/info.json → keyboards/bastardkb/scylla/blackpill/keyboard.json

@@ -1,7 +1,16 @@
 {
     "keyboard_name": "Scylla Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
     },
     "eeprom": {
         "driver": "spi"

keyboards/bastardkb/scylla/blackpill/rules.mk

@@ -1,20 +1,5 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/scylla/v1/elitec/info.json → keyboards/bastardkb/scylla/v1/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D2"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/elitec/info.json → keyboards/bastardkb/scylla/v2/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/scylla/v2/splinky_2/info.json → keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/splinky_3/info.json → keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/scylla/v2/stemcell/info.json → keyboards/bastardkb/scylla/v2/stemcell/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/skeletyl/blackpill/info.json → keyboards/bastardkb/skeletyl/blackpill/keyboard.json

@@ -1,7 +1,16 @@
 {
     "keyboard_name": "Skeletyl Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
     },
     "eeprom": {
         "driver": "spi"

keyboards/bastardkb/skeletyl/blackpill/rules.mk

@@ -1,20 +1,5 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/skeletyl/v1/elitec/info.json → keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D2"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/elitec/info.json → keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/skeletyl/v2/splinky_2/info.json → keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/splinky_3/info.json → keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/skeletyl/v2/stemcell/info.json → keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/tbkmini/blackpill/info.json → keyboards/bastardkb/tbkmini/blackpill/keyboard.json

@@ -1,7 +1,16 @@
 {
     "keyboard_name": "TBK Mini Blackpill",
     "usb": {
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
     },
     "eeprom": {
         "driver": "spi"

keyboards/bastardkb/tbkmini/blackpill/rules.mk

@@ -1,20 +1,5 @@
-# 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
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart

keyboards/bastardkb/tbkmini/v1/elitec/info.json → keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D2"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/elitec/info.json → keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "ws2812": {
         "pin": "D3"
     },

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

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)

keyboards/bastardkb/tbkmini/v2/splinky_2/info.json → keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor

keyboards/bastardkb/tbkmini/v2/splinky_3/info.json → keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json

@@ -3,6 +3,12 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 AUDIO_SUPPORTED = no        # Audio is not supported
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
 SERIAL_DRIVER = vendor