using data/mappings for processing

.clangd

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

.editorconfig

@@ -4,40 +4,39 @@
 root = true
 
 [*]
-end_of_line = lf
 indent_style = space
 indent_size = 4
+
+# We recommend you to keep these unchanged
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
- # To match GitHub Actions formatting
-[*.{yaml,yml}]
-indent_size = 2
-
 [*.md]
 trim_trailing_whitespace = false
+indent_size = 4
 
-[{Makefile,*.mk}]
+[{qmk,*.py}]
+charset = utf-8
+max_line_length = 200
+
+# Make these match what we have in .gitattributes
+[*.mk]
+end_of_line = lf
 indent_style = tab
 
-# Don't override anything in `lib/`...
-[lib/**]
-indent_style = unset
-indent_size = unset
-tab_width = unset
-end_of_line = unset
-charset = unset
-spelling_language = unset
-trim_trailing_whitespace = unset
-insert_final_newline = unset
-
-# ...except QMK's `lib/python`.
-[{*.py,lib/python/**.py}]
+[Makefile]
 end_of_line = lf
-indent_style = space
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 200
+indent_style = tab
+
+[*.sh]
+end_of_line = lf
+
+# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
+
+
+# We don't have gitattributes properly for these
+# So if the user have for example core.autocrlf set to true
+# the line endings would be wrong.
+[lib/**]
+end_of_line = unset

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: QMK Discord
-    url: https://discord.gg/qmk
+    url: https://discord.gg/Uq7gcHh
     about: Ask questions, discuss issues and features. Chill.
   - name: OLKB Subreddit
     url: https://www.reddit.com/r/olkb

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,6 @@
 <!--- Provide a general summary of your changes in the title above. -->
 
+<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
 <!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
 
 ## Description
@@ -14,7 +15,7 @@
 - [ ] New feature
 - [ ] Enhancement/optimization
 - [ ] Keyboard (addition or update)
-- [ ] Keymap/layout (addition or update)
+- [ ] Keymap/layout/userspace (addition or update)
 - [ ] Documentation
 
 ## Issues Fixed or Closed by This PR

.github/labeler.yml

@@ -1,56 +1,42 @@
 core:
-  - changed-files:
-    - any-glob-to-any-file:
-      - quantum/**
-      - tmk_core/**
-      - drivers/**
-      - tests/**
-      - util/**
-      - platforms/**
-      - builddefs/*.mk
-      - Makefile
-      - '*.mk'
+  - quantum/**/*
+  - tmk_core/**/*
+  - drivers/**/*
+  - tests/**/*
+  - util/**/*
+  - platforms/**/*
+  - builddefs/**/*
+  - Makefile
+  - '*.mk'
 dependencies:
-  - changed-files:
-    - all-globs-to-any-file:
-      - lib/**
-      - '!lib/python/**'
+  - any:
+    - 'lib/**/*'
+    - '!lib/python/**/*'
 keyboard:
-  - changed-files:
-    - all-globs-to-any-file:
-      - keyboards/**
-      - '!keyboards/**/keymaps/**'
+  - any:
+    - 'keyboards/**/*'
+    - '!keyboards/**/keymaps/**/*'
 keymap:
-  - changed-files:
-    - any-glob-to-any-file:
-      - users/**
-      - layouts/**
-      - keyboards/**/keymaps/**
+  - users/**/*
+  - layouts/**/*
+  - keyboards/**/keymaps/**/*
 via:
-  - changed-files:
-    - any-glob-to-any-file:
-      - keyboards/**/keymaps/via/*
+  - keyboards/**/keymaps/via/*
 cli:
-  - changed-files:
-    - any-glob-to-any-file:
-      - requirements.txt
-      - lib/python/**
+  - requirements.txt
+  - lib/python/**/*
 python:
-  - changed-files:
-    - any-glob-to-any-file:
-      - '**/*.py'
+  - '**/*.py'
 documentation:
-  - changed-files:
-    - any-glob-to-any-file:
-      - docs/**
-      - builddefs/docsgen/**
+  - docs/**/*
+translation:
+  - docs/fr-fr/**/*
+  - docs/es/**/*
+  - docs/ja/**/*
+  - docs/he-il/**/*
+  - docs/pt-br/**/*
+  - docs/zh-cn/**/*
+  - docs/de/**/*
+  - docs/ru-ru/**/*
 CI:
-  - changed-files:
-    - any-glob-to-any-file:
-      - .github/**
-dd:
-  - changed-files:
-    - any-glob-to-any-file:
-      - data/constants/**
-      - data/mappings/**
-      - data/schemas/**
+  - .github/**/*

.github/workflows/api.yml

@@ -19,13 +19,13 @@ on:
 jobs:
   api_data:
     runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
         persist-credentials: false

.github/workflows/auto_approve.yml

@@ -13,8 +13,8 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: zvecr/automatic-approve-action@safe_files
+    - uses: mheap/automatic-approve-action@v1
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
-        workflows: "labeler.yml,lint.yml,docs.yml"
-        safe_files: "keyboards/,docs/"
+        workflows: "format.yml,lint.yml,unit_test.yml"
+        dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"

.github/workflows/auto_tag.yml

@@ -4,7 +4,6 @@ permissions:
   contents: write
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - master
@@ -27,12 +26,12 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.66.0
+      uses: anothrNick/github-tag-action@1.61.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

.github/workflows/ci_build_major_branch.yml

@@ -1,139 +0,0 @@
-name: CI Build Major Branch
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  push:
-    branches: [master, develop]
-  workflow_dispatch:
-    inputs:
-      branch:
-        type: choice
-        description: "Branch to build"
-        options: [master, develop]
-
-env:
-  # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits
-  # We've decreased it from 20 to 15 to allow for other GHA to run unimpeded
-  CONCURRENT_JOBS: 15
-
-# Ensure we only have one build running at a time, cancelling any active builds if a new commit is pushed to the respective branch
-concurrency:
-  group: ci_build-${{ github.event.inputs.branch || github.ref_name }}
-  cancel-in-progress: true
-
-jobs:
-  determine_concurrency:
-    name: "Determine concurrency"
-    if: github.repository == 'qmk/qmk_firmware'
-    runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
-
-    outputs:
-      slice_length: ${{ steps.generate_slice_length.outputs.slice_length }}
-
-    steps:
-      - name: Install prerequisites
-        run: |
-          apt-get update
-          apt-get install -y jq
-
-      - name: Disable safe.directory check
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v4
-
-      - name: Determine concurrency
-        id: generate_slice_length
-        run: |
-          target_count=$( {
-            qmk find -km default 2>/dev/null
-            # qmk find -km xap 2>/dev/null
-          } | sort | uniq | wc -l)
-          slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution
-          echo "slice_length=$slice_length" >> $GITHUB_OUTPUT
-
-  build_targets:
-    name: "Compile keymap ${{ matrix.keymap }}"
-    needs: determine_concurrency
-    strategy:
-      fail-fast: false
-      matrix:
-        keymap: [default]
-        # keymap: [default, xap]
-    uses: ./.github/workflows/ci_build_major_branch_keymap.yml
-    with:
-      branch: ${{ inputs.branch || github.ref_name }}
-      keymap: ${{ matrix.keymap }}
-      slice_length: ${{ needs.determine_concurrency.outputs.slice_length }}
-    secrets: inherit
-
-  rollup_tasks:
-    name: "Consolidation"
-    needs: build_targets
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Disable safe.directory check
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Download firmwares
-        uses: actions/download-artifact@v4
-        with:
-          pattern: firmware-*
-          path: .
-          merge-multiple: true
-
-      - name: Generate index page
-        run: |
-          python3 -m pip install -r ./util/ci/requirements.txt
-          ./util/ci/index_generator.py > index.html
-          ./util/ci/firmware_list_generator.py > firmware_list.json
-
-      - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/${{ github.sha }}
-        uses: jakejarvis/s3-sync-action@master
-        with:
-          args: --acl public-read --follow-symlinks --delete --exclude '*' --include 'index.html' --include 'firmware_list.json' --include '*.hex' --include '*.bin' --include '*.uf2'
-        env:
-          AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }}
-          AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }}
-          AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }}
-          SOURCE_DIR: .
-          DEST_DIR: ${{ inputs.branch || github.ref_name }}/${{ github.sha }}
-
-      - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/latest
-        uses: jakejarvis/s3-sync-action@master
-        with:
-          args: --acl public-read --follow-symlinks --delete --exclude '*' --include 'index.html' --include 'firmware_list.json' --include '*.hex' --include '*.bin' --include '*.uf2'
-        env:
-          AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }}
-          AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }}
-          AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }}
-          SOURCE_DIR: .
-          DEST_DIR: ${{ inputs.branch || github.ref_name }}/latest
-
-      - name: Check if failure marker file exists
-        id: check_failure_marker
-        uses: andstor/file-existence-action@v3
-        with:
-          files: ./.failed
-
-      - name: Fail build if needed
-        if: steps.check_failure_marker.outputs.files_exists == 'true'
-        run: |
-          # Exit with failure if the compilation stage failed
-          exit 1

.github/workflows/ci_build_major_branch_keymap.yml

@@ -1,181 +0,0 @@
-name: CI Build Major Branch Keymap
-
-permissions:
-  contents: read
-  actions: write
-
-on:
-  workflow_call:
-    inputs:
-      branch:
-        type: string
-        required: true
-      keymap:
-        type: string
-        required: true
-      slice_length:
-        type: string
-        required: true
-
-jobs:
-  generate_targets:
-    name: "Generate targets (${{ inputs.keymap }})"
-    runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
-
-    outputs:
-      targets: ${{ steps.generate_targets.outputs.targets }}
-
-    steps:
-      - name: Install prerequisites
-        run: |
-          apt-get update
-          apt-get install -y jq
-
-      - name: Disable safe.directory check
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v4
-
-      - name: Generate build targets
-        id: generate_targets
-        run: |
-          { # Intentionally use `shuf` here so that we share manufacturers across all build groups -- some have a lot of ARM-based boards which inherently take longer
-            counter=0
-            echo -n '{'
-            qmk find -km ${{ inputs.keymap }} 2>/dev/null | sort | uniq | shuf | xargs -L${{ inputs.slice_length }} | while IFS=$'\n' read target ; do
-                if [ $counter -gt 0 ]; then
-                    echo -n ','
-                fi
-                counter=$((counter+1))
-                printf "\"group %02d\":{" $counter
-                echo -n '"targets":"'
-                echo $target | tr ' ' '\n' | sort | uniq | xargs echo -n
-                echo -n '"}'
-            done
-            echo -n '}'
-          } | sed -e 's@\n@@g' > targets.json
-
-          # Output the target keys as a variable
-          echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT
-
-      - name: Upload targets json
-        uses: actions/upload-artifact@v4
-        with:
-          name: targets-${{ inputs.keymap }}
-          path: targets.json
-
-  build_targets:
-    name: "Compile ${{ matrix.target }} (${{ inputs.keymap }})"
-    needs: generate_targets
-    runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
-    continue-on-error: true
-
-    strategy:
-      matrix:
-        target: ${{ fromJson(needs.generate_targets.outputs.targets) }}
-
-    steps:
-      - name: Install prerequisites
-        run: |
-          apt-get update
-          apt-get install -y jq
-
-      - name: Disable safe.directory check
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v4
-
-      - name: Get target definitions
-        uses: actions/download-artifact@v4
-        with:
-          name: targets-${{ inputs.keymap }}
-          path: .
-
-      - name: Deploy submodules
-        run: |
-          qmk git-submodule -f
-
-      - name: Dump targets
-        run: |
-          jq -r '.["${{ matrix.target }}"].targets' targets.json | tr ' ' '\n' | sort
-
-      - name: Build targets
-        continue-on-error: true
-        run: |
-          export NCPUS=$(( $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -1 ))
-          qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed
-
-      - name: Upload binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-${{ inputs.keymap }}-${{ matrix.target }}
-          if-no-files-found: ignore
-          path: |
-            *.bin
-            *.hex
-            *.uf2
-            .build/failed.*
-            .failed
-
-      - name: Fail build if any group failed
-        run: |
-          # Exit with failure if the compilation stage failed
-          [ ! -f .failed ] || exit 1
-
-  repack_firmware:
-    if: always()
-    name: "Repack artifacts"
-    needs: build_targets
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v4
-
-      - name: Download firmwares
-        uses: actions/download-artifact@v4
-        with:
-          pattern: firmware-${{ inputs.keymap }}-*
-          path: .
-          merge-multiple: true
-
-      - name: Upload all firmwares
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-${{ inputs.keymap }}
-          if-no-files-found: ignore
-          path: |
-            *.bin
-            *.hex
-            *.uf2
-            .build/failed.*
-            .failed
-
-      - name: Generate output logs
-        run: |
-          # 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
-
-      - name: Delete temporary build artifacts
-        uses: geekyeggo/delete-artifact@v5
-        with:
-          name: |
-            firmware-${{ inputs.keymap }}-*
-            targets-${{ inputs.keymap }}
-
-      - name: 'CI Discord Notification'
-        if: always() && !cancelled()
-        working-directory: util/ci/
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
-        run: |
-          python3 -m pip install -r requirements.txt
-          python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --sha $(git rev-parse HEAD) --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/ci_builds.yml

@@ -0,0 +1,60 @@
+name: CI Builds
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0,12 * * *'
+
+jobs:
+  ci_builds:
+    name: "CI Build"
+    runs-on: self-hosted
+    timeout-minutes: 1380
+
+    if: github.repository == 'qmk/qmk_firmware'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: [master, develop]
+        keymap: [default, via]
+
+    container: qmkfm/qmk_cli
+
+    steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        ref: ${{ matrix.branch }}
+
+    - 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@v3
+      if: always()
+      with:
+        name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }}
+        if-no-files-found: ignore
+        path: |
+          *.bin
+          *.hex
+          *.uf2
+          .build/failed.*

.github/workflows/cli.yml

@@ -18,13 +18,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/develop_update.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/docs.yml

@@ -8,58 +8,39 @@ on:
     branches:
     - master
     paths:
-    - 'builddefs/docsgen/**'
     - 'tmk_core/**'
     - 'quantum/**'
     - 'platforms/**'
     - 'docs/**'
     - '.github/workflows/docs.yml'
-  pull_request:
-    paths:
-    - 'builddefs/docsgen/**'
-    - 'docs/**'
-    - '.github/workflows/docs.yml'
-
-defaults:
-  run:
-    shell: bash
 
 jobs:
   generate:
     runs-on: ubuntu-latest
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
+
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
 
     - name: Install dependencies
       run: |
-        apt-get update && apt-get install -y rsync doxygen
-        # install nvm
-        touch $HOME/.bashrc
-        wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-
-    - name: Install node
-      run: |
-        source $HOME/.bashrc
-        nvm install 20
-        nvm use 20
-        corepack enable
+        apt-get update && apt-get install -y rsync nodejs npm doxygen
+        npm install -g moxygen
 
     - name: Build docs
       run: |
-        source $HOME/.bashrc
-        nvm use 20
         qmk --verbose generate-docs
 
     - name: Deploy
-      if: ${{ github.event_name == 'push' && github.repository == 'qmk/qmk_firmware' }}
-      uses: JamesIves/github-pages-deploy-action@v4.6.4
+      uses: JamesIves/github-pages-deploy-action@v4.4.1
       with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: .build/docs
-          git-config-name: QMK Bot
-          git-config-email: hello@qmk.fm
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BASE_BRANCH: master
+        BRANCH: gh-pages
+        FOLDER: .build/docs
+        GIT_CONFIG_EMAIL: hello@qmk.fm

.github/workflows/feature_branch_update.yml

@@ -18,10 +18,9 @@ jobs:
       matrix:
         branch:
         - xap
-        - riot
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/format.yml

@@ -19,13 +19,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -35,9 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v45
-      with:
-        use_rest_api: true
+      uses: tj-actions/changed-files@v35
 
     - name: Run qmk formatters
       shell: 'bash {0}'

.github/workflows/format_push.yml

@@ -13,13 +13,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -47,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
+      uses: peter-evans/create-pull-request@v4
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/labeler.yml

@@ -1,13 +1,18 @@
 name: "Pull Request Labeler"
 
+permissions:
+  contents: read
+  pull-requests: write
+
 on:
-- pull_request_target
+  pull_request_target:
+    types: [opened, synchronize, reopened, ready_for_review, locked]
 
 jobs:
   triage:
-    permissions:
-      contents: read
-      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@main
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: '.github/labeler.yml'

.github/workflows/lint.yml

@@ -12,13 +12,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -27,9 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v45
-      with:
-        use_rest_api: true
+      uses: tj-actions/changed-files@v35
 
     - name: Print info
       run: |
@@ -38,7 +36,6 @@ jobs:
         echo '${{ steps.file_changes.outputs.all_changed_files}}'
 
     - name: Run qmk lint
-      if: always()
       shell: 'bash {0}'
       run: |
         QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.all_changed_files}}' | sed 's/ /\n/g')
@@ -64,12 +61,10 @@ jobs:
 
         qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
         for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
-          if [[ -f $file ]]; then
-            if ! git diff --quiet $file; then
-              echo "File '${file}' Requires Formatting"
-              echo "::error file=${file}::Requires Formatting"
-              exit_code=$(($exit_code + 1))
-            fi
+          if ! git diff --quiet $file; then
+            echo "File '${file}' Requires Formatting"
+            echo "::error file=${file}::Requires Formatting"
+            exit_code=$(($exit_code + 1))
           fi
         done
 
@@ -77,11 +72,3 @@ jobs:
             exit 255
         fi
         exit $exit_code
-
-    - name: Verify keyboard aliases
-      if: always()
-      shell: 'bash {0}'
-      run: |
-        git reset --hard
-        git clean -xfd
-        qmk ci-validate-aliases

.github/workflows/regen.yml

@@ -13,13 +13,13 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Run qmk generators
       run: |

.github/workflows/regen_push.yml

@@ -13,13 +13,13 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Run qmk generators
       run: |
@@ -34,7 +34,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7
+      uses: peter-evans/create-pull-request@v4
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/stale.yml

@@ -3,7 +3,6 @@ name: 'Close stale issues and PRs'
 permissions:
   issues: write
   pull-requests: write
-  actions: write
 
 on:
   schedule:
@@ -14,7 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@main
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/unit_test.yml

@@ -23,13 +23,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: ghcr.io/qmk/qmk_cli
+    container: qmkfm/qmk_cli
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
     - name: Run tests
-      run: qmk test-c
+      run: make test:all

.gitignore

@@ -18,15 +18,8 @@
 *.lst
 *.map
 *.o
-*.a
-*.so
-*.dylib
-*.dll
-*.la
 *.stackdump
 *.sym
-index.html
-firmware_list.json
 
 # QMK-specific
 api_data/v1
@@ -37,10 +30,6 @@ quantum/version.h
 *.qmk
 *.uf2
 
-# DD config at wrong location
-/keyboards/**/keymaps/*/info.json
-/keyboards/**/keymaps/*/keyboard.json
-
 # Old-style QMK Makefiles
 /keyboards/**/Makefile
 
@@ -56,15 +45,19 @@ quantum/version.h
 .idea/
 .project
 .settings/
+.vagrant/
 
 # ?
 .dep
 .history/
 build/
 cmake-build-debug
-CMakeLists.txt
+# CMakeLists.txt
 *.pdf
 
+# cmake toolchain downloads
+/toolchains
+
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
 .stfolder
@@ -103,7 +96,6 @@ secrets.tar
 # Python things
 __pycache__
 .python-version
-.venv
 
 # Prerequisites for updating ChibiOS
 /util/fmpp*
@@ -116,7 +108,5 @@ compile_commands.json
 .clangd/
 .cache/
 
-# VIA(L) files that don't belong in QMK repo
+# VIA(L) json files that don't belong in QMK repo
 via*.json
-/keyboards/**/keymaps/via/*
-/keyboards/**/keymaps/vial/*

.vscode/cmake-kits.json

@@ -0,0 +1,9 @@
+[
+    {
+        "name": "AVR GCC",
+        "compilers": {
+            "CC": "C:\\QMK_MSYS\\mingw64\\bin\\avr-gcc.exe",
+            "CXX": "C:\\QMK_MSYS\\mingw64\\bin\\avr-g++.exe"
+        }
+    }
+]

.vscode/extensions.json

@@ -3,7 +3,7 @@
   "recommendations": [
     "EditorConfig.EditorConfig",
     "xaver.clang-format",
-    "llvm-vs-code-extensions.vscode-clangd",
+    "ms-vscode.cpptools",
     "bierner.github-markdown-preview",
     "donjayamanne.git-extension-pack"
   ]

.vscode/settings.json

@@ -5,8 +5,8 @@
     // Configure glob patterns for excluding files and folders.
     "files.exclude": {
         "**/.build": true,
-        "**/*.hex": true,
-        "**/*.bin": true,
+        // "**/*.hex": true,
+        // "**/*.bin": true,
         "**/*.uf2": true
     },
     "files.associations": {
@@ -26,9 +26,6 @@
     },
     "python.formatting.provider": "yapf",
     "[json]": {
-        "editor.formatOnSave": false
-    },
-    "clangd.arguments": [
-        "--header-insertion=never"
-    ]
+	    "editor.formatOnSave": false
+    }
 }

.vscode/tasks.json

@@ -0,0 +1,114 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Load Keyboard",
+            "dependsOrder": "sequence",
+            "dependsOn":[
+                "Only Load Keyboard",
+                "Configure CMake"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Only Load Keyboard",
+            "type": "shell",
+            "command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -D QMK_KEYMAP_FOLDER=\"${input:keyboard_keymap}\" -P ${workspaceFolder}/cmake/ConfigureKeyboard.cmake",
+            "problemMatcher": []
+        },
+        {
+            "label": "Configure CMake",
+            "type": "cmake",
+            "command": "configure"
+        },
+        {
+            "label": "Build",
+            "problemMatcher": [
+                {
+                    "base": "$gcc",
+                    "fileLocation": ["relative", "${workspaceFolder}/build"]
+                },
+            ],
+            "options": {
+                "environment": {
+                    "CLICOLOR_FORCE": "1"
+                }
+            },
+            "type": "cmake",
+            "command": "build",
+            "targets":[
+                "${input:keyboard_target}"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+        },
+        // {
+        //     "label": "Rebuild",
+        //     "problemMatcher": [
+        //         {
+        //             "base": "$gcc",
+        //             "fileLocation": ["relative", "${workspaceFolder}/build"]
+        //         },
+        //     ],
+        //     "options": {
+        //         "environment": {
+        //             "CLICOLOR_FORCE": "1"
+        //         }
+        //     },
+        //     "type": "cmake",
+        //     "command": "cleanRebuild",
+        //     "targets":[
+        //         "${input:keyboard_target}"
+        //     ],
+        //     "group": {
+        //         "kind": "build",
+        //         "isDefault": true
+        //     },
+        // }
+    ],
+    "inputs": [
+        {
+            "id": "keyboard_target",
+            "type": "command",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "type build\\targets",
+                "description": "Target:",
+                "fieldSeparator": "|"
+            },
+        },
+        {
+            "id": "all_keyboards",
+            "type": "command",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "type build\\all_keyboards",
+                "description": "Keyboard:",
+                "default": ""
+            },
+        },
+        {
+            "id": "keymap",
+            "description": "Keymap:",
+            "type": "pickString",
+            "options":[
+                "default"
+            ]
+        },
+        {
+            "id": "keyboard_keymap",
+            "type": "command",
+            "command": "shellCommand.execute",
+            "args": {
+                "command": "cmake -D QMK_KEYBOARD_FOLDER=\"${input:all_keyboards}\" -P ${workspaceFolder}/cmake/GetKeymaps.cmake && type build\\keyboard_keymaps",
+                "description": "Keymap:",
+                "default": ""
+            },
+        },
+    ]
+}

CMakeLists.txt

@@ -0,0 +1,97 @@
+cmake_minimum_required(VERSION 3.20)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+include(UpdateSubmodule)
+include(ResolveKeyboard)
+include(ValidateJson)
+include(ProcessKeyboard)
+
+set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
+
+function(_get_all_cmake_targets out_var current_dir)
+    get_property(targets DIRECTORY ${current_dir} PROPERTY BUILDSYSTEM_TARGETS)
+    get_property(subdirs DIRECTORY ${current_dir} PROPERTY SUBDIRECTORIES)
+
+    foreach(subdir ${subdirs})
+        _get_all_cmake_targets(subdir_targets ${subdir})
+        list(APPEND targets ${subdir_targets})
+    endforeach()
+
+    set(${out_var} ${targets} PARENT_SCOPE)
+endfunction()
+
+if(NOT DEFINED QMK_KEYBOARD)
+    # configure step - populate targets
+    project(qmk_firmware)
+
+    add_subdirectory(keyboards)
+
+else()
+    # build step
+    if(NOT DEFINED QMK_KEYMAP_FOLDER)
+        set(QMK_KEYMAP_FOLDER "default")
+    endif()
+
+    resolve_keyboard(${QMK_KEYBOARD_FOLDER} QMK_KEYBOARD_FOLDER_ABS)
+    cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${QMK_KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
+    resolve_config_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_CONFIG_H)
+    process_keyboard()
+    resolve_keyboard_h(${QMK_KEYBOARD_FOLDER_ABS} QMK_KEYBOARD_H)
+    resolve_keymap_c(${QMK_KEYBOARD_FOLDER_ABS} ${QMK_KEYMAP_FOLDER} QMK_KEYMAP_C)
+
+    message(STATUS "config.h: ${QMK_KEYBOARD_CONFIG_H}")
+    message(STATUS "keyboard.h: ${QMK_KEYBOARD_H}")
+    message(STATUS "keymap.c: ${QMK_KEYMAP_C}")
+
+
+    project(${QMK_KEYBOARD}
+        LANGUAGES C CXX ASM
+        HOMEPAGE_URL ${URL}
+        VERSION ${DEVICE_VER})
+
+    # add_compile_options(
+    # -include ${QMK_KEYBOARD_CONFIG_H}
+    # )
+    add_compile_definitions(
+        QMK_KEYBOARD_H="${QMK_KEYBOARD_H}"
+        KEYBOARD_${QMK_KEYBOARD}
+        KEYMAP_C="${QMK_KEYMAP_C}"
+        MATRIX_ROWS=8
+        MATRIX_COLS=6
+    )
+
+    if(DEFINED DIODE_DIRECTION)
+        add_compile_definitions(DIODE_DIRECTION=${DIODE_DIRECTION})
+    endif()
+
+    include_directories(${CMAKE_SOURCE_DIR})
+
+    # if(EXISTS ${QMK_KEYBOARD_FOLDER_ABS}/CMakeLists.txt)
+    # add_subdirectory(${QMK_KEYBOARD_FOLDER_ABS})
+    # else()
+    file(GLOB KEYBOARD_SRC "${QMK_KEYBOARD_FOLDER_ABS}/*.c")
+    list(REMOVE_ITEM KEYBOARD_SRC "${QMK_KEYMAP_C}")
+    add_qmk_executable(${TARGET_NAME} ${KEYBOARD_SRC})
+
+    # endif()
+    # add_library(qmk)
+
+    target_precompile_headers(qmk PUBLIC
+        ${QMK_KEYBOARD_CONFIG_H}
+    )
+
+    resolve_keyboard_includes(${QMK_KEYBOARD_FOLDER_ABS})
+
+    add_subdirectory(quantum)
+    add_subdirectory(platforms)
+    add_subdirectory(tmk_core/protocol)
+
+    include(features/oled)
+    include(features/backlight)
+    include(features/eeprom)
+    include(features/matrix)
+    include(features/fnv)
+endif()

Dockerfile

@@ -0,0 +1,6 @@
+FROM qmkfm/qmk_cli
+
+VOLUME /qmk_firmware
+WORKDIR /qmk_firmware
+
+CMD qmk compile -kb all -km default

Doxyfile

@@ -21,7 +21,7 @@ DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "QMK Firmware"
 PROJECT_NUMBER         = https://github.com/qmk/qmk_firmware
 PROJECT_BRIEF          = "Keyboard controller firmware for Atmel AVR and ARM USB families"
-OUTPUT_DIRECTORY       = .build/docs/static/doxygen
+OUTPUT_DIRECTORY       = .build/doxygen
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -40,8 +40,8 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        =
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
 QT_AUTOBRIEF           = NO
@@ -49,13 +49,13 @@ MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 4
-ALIASES                =
-TCL_SUBST              =
+ALIASES                = 
+TCL_SUBST              = 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      =
+EXTENSION_MAPPING      = 
 MARKDOWN_SUPPORT       = YES
 TOC_INCLUDE_HEADINGS   = 2
 AUTOLINK_SUPPORT       = YES
@@ -104,14 +104,14 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
+ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    =
-LAYOUT_FILE            =
-CITE_BIB_FILES         =
+FILE_VERSION_FILTER    = 
+LAYOUT_FILE            = 
+CITE_BIB_FILES         = 
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -124,7 +124,7 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
+WARN_LOGFILE           = 
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -143,19 +143,19 @@ FILE_PATTERNS          = *.c \
                          *.hpp \
                          *.h++
 RECURSIVE              = YES
-EXCLUDE                =
+EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */protocol/arm_atsam/*
-EXCLUDE_SYMBOLS        =
-EXAMPLE_PATH           =
+EXCLUDE_SYMBOLS        = 
+EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
-INPUT_FILTER           =
-FILTER_PATTERNS        =
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE =
+FILTER_SOURCE_PATTERNS = 
+USE_MDFILE_AS_MAINPAGE = 
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -177,7 +177,7 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = 
 
 #---------------------------------------------------------------------------
 # Configuration options related to disabled outputs
@@ -207,18 +207,18 @@ ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
 PREDEFINED             = __DOXYGEN__ PROGMEM
-EXPAND_AS_DEFINED      =
+EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES               =
-GENERATE_TAGFILE       =
+TAGFILES               = 
+GENERATE_TAGFILE       = 
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
@@ -229,14 +229,14 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 
 CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
-DIA_PATH               =
+MSCGEN_PATH            = 
+DIA_PATH               = 
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
 DOT_NUM_THREADS        = 0
 DOT_FONTNAME           = Helvetica
 DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
+DOT_FONTPATH           = 
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
@@ -251,13 +251,13 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
-DOT_PATH               =
-DOTFILE_DIRS           =
-MSCFILE_DIRS           =
-DIAFILE_DIRS           =
-PLANTUML_JAR_PATH      =
-PLANTUML_CFG_FILE      =
-PLANTUML_INCLUDE_PATH  =
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MSCFILE_DIRS           = 
+DIAFILE_DIRS           = 
+PLANTUML_JAR_PATH      = 
+PLANTUML_CFG_FILE      = 
+PLANTUML_INCLUDE_PATH  = 
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = NO

Makefile

@@ -38,11 +38,6 @@ $(info QMK Firmware $(QMK_VERSION))
 endif
 endif
 
-# Try to determine userspace from qmk config, if set.
-ifeq ($(QMK_USERSPACE),)
-    QMK_USERSPACE = $(shell qmk config -ro user.overlay_dir | cut -d= -f2 | sed -e 's@^None$$@@g')
-endif
-
 # Determine which qmk cli to use
 QMK_BIN := qmk
 
@@ -196,20 +191,9 @@ define PARSE_KEYBOARD
     KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
     KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
 
-    ifneq ($(QMK_USERSPACE),)
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
-    endif
-
     KEYBOARD_LAYOUTS := $(shell $(QMK_BIN) list-layouts --keyboard $1)
     LAYOUT_KEYMAPS :=
     $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
-    ifneq ($(QMK_USERSPACE),)
-        $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/layouts/$$(LAYOUT)/*/.)))))
-    endif
 
     KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
 
@@ -316,18 +300,17 @@ endef
 define BUILD_TEST
     TEST_PATH := $1
     TEST_NAME := $$(notdir $$(TEST_PATH))
-    TEST_FULL_NAME := $$(subst /,_,$$(patsubst $$(ROOT_DIR)tests/%,%,$$(TEST_PATH)))
     MAKE_TARGET := $2
     COMMAND := $1
     MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_test.mk $$(MAKE_TARGET)
-    MAKE_VARS := TEST=$$(TEST_NAME) TEST_OUTPUT=$$(TEST_FULL_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
+    MAKE_VARS := TEST=$$(TEST_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
     MAKE_MSG := $$(MSG_MAKE_TEST)
     $$(eval $$(call BUILD))
     ifneq ($$(MAKE_TARGET),clean)
-        TEST_EXECUTABLE := $$(TEST_OUTPUT_DIR)/$$(TEST_FULL_NAME).elf
-        TESTS += $$(TEST_FULL_NAME)
+        TEST_EXECUTABLE := $$(TEST_OUTPUT_DIR)/$$(TEST_NAME).elf
+        TESTS += $$(TEST_NAME)
         TEST_MSG := $$(MSG_TEST)
-        $$(TEST_FULL_NAME)_COMMAND := \
+        $$(TEST_NAME)_COMMAND := \
             printf "$$(TEST_MSG)\n"; \
             $$(TEST_EXECUTABLE); \
             if [ $$$$? -gt 0 ]; \
@@ -337,12 +320,6 @@ define BUILD_TEST
     endif
 endef
 
-define LIST_TEST
-    include $(BUILDDEFS_PATH)/testlist.mk
-    FOUND_TESTS := $$(patsubst ./tests/%,%,$$(TEST_LIST))
-    $$(info $$(FOUND_TESTS))
-endef
-
 define PARSE_TEST
     TESTS :=
     TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
@@ -351,7 +328,7 @@ define PARSE_TEST
     ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
-        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(patsubst ./tests/%,%,$$(TEST)x)), $$(TEST),))
+        MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME), $$(notdir $$(TEST))), $$(TEST),))
     endif
     $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
 endef
@@ -436,10 +413,6 @@ git-submodules: git-submodule
 list-keyboards:
 	$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
 
-.PHONY: list-tests
-list-tests:
-	$(eval $(call LIST_TEST))
-
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
 	$(QMK_BIN) list-keyboards --no-resolve-defaults
@@ -450,33 +423,8 @@ clean:
 	rm -rf $(BUILD_DIR)
 	echo 'done.'
 
-.PHONY: distclean distclean_qmk
-distclean: distclean_qmk
-distclean_qmk: clean
+.PHONY: distclean
+distclean: clean
 	echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
 	rm -f *.bin *.hex *.uf2
 	echo 'done.'
-
-ifneq ($(QMK_USERSPACE),)
-.PHONY: distclean_userspace
-distclean: distclean_userspace
-distclean_userspace: clean
-	echo -n 'Deleting userspace *.bin, *.hex, and *.uf2 ... '
-	rm -f $(QMK_USERSPACE)/*.bin $(QMK_USERSPACE)/*.hex $(QMK_USERSPACE)/*.uf2
-	echo 'done.'
-endif
-
-# Extra targets for formatting and/or pytest, running within the qmk/qmk_cli container to match GHA.
-CONTAINER_PREAMBLE := export HOME="/tmp"; export PATH="/tmp/.local/bin:\$$PATH"; python3 -m pip install --upgrade pip; python3 -m pip install -r requirements-dev.txt
-
-.PHONY: format-core
-format-core:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a"
-
-.PHONY: pytest
-pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk pytest"
-
-.PHONY: format-and-pytest
-format-and-pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a && qmk pytest"

Vagrantfile

@@ -0,0 +1,95 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  # define a name instead of just 'default'
+  config.vm.define "qmk_firmware"
+
+  # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit
+  config.vm.box = "generic/debian10"
+  
+  config.vm.synced_folder '.', '/vagrant'
+
+  # This section allows you to customize the Virtualbox VM
+  # settings, ie showing the GUI or upping the memory
+  # or cores if desired
+  config.vm.provider "virtualbox" do |vb|
+    # Hide the VirtualBox GUI when booting the machine
+    vb.gui = false
+    # Uncomment the below lines if you want to program
+    # your Teensy via the VM rather than your host OS
+    #vb.customize ['modifyvm', :id, '--usb', 'on']
+    #vb.customize ['usbfilter', 'add', '0',
+    #         '--target', :id,
+    #         '--name', 'teensy',
+    #         '--vendorid', '0x16c0',
+    #         '--productid','0x0478'
+    #        ]
+    # Customize the amount of memory on the VM:
+    vb.memory = "512"
+    # Uncomment the below lines if you have time sync
+    # issues with make and incremental builds
+    #vb.customize [ "guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 1000 ]
+  end
+
+  # This section allows you to customize the VMware VM
+  # settings, ie showing the GUI or upping the memory
+  # or cores if desired
+  config.vm.provider "vmware_workstation" do |vmw|
+    # Hide the VMware GUI when booting the machine
+    vmw.gui = false
+
+    # Customize the amount of memory on the VM:
+    vmw.memory = "512"
+  end
+
+  config.vm.provider "vmware_fusion" do |vmf|
+    # Hide the vmfare GUI when booting the machine
+    vmf.gui = false
+
+    # Customize the amount of memory on the VM:
+    vmf.memory = "512"
+  end
+
+  # Docker provider pulls from hub.docker.com respecting docker.image if
+  # config.vm.box is nil. In this case, we adhoc build util/vagrant/Dockerfile.
+  # Note that this bind-mounts from the current dir to
+  # /vagrant in the guest, so unless your UID is 1000 to match vagrant in the
+  # image, you'll need to: chmod -R a+rw .
+  config.vm.provider "docker" do |docker, override|
+    override.vm.box = nil
+    docker.build_dir = "util/vagrant"
+    docker.has_ssh = true
+  end
+
+  # Unless we are running the docker container directly
+  #   1. run container detached on vm
+  #   2. attach on 'vagrant ssh'
+  ["virtualbox", "vmware_workstation", "vmware_fusion"].each do |type|
+    config.vm.provider type do |virt, override|
+      override.vm.provision "docker" do |d|
+        d.run "qmkfm/qmk_cli",
+          cmd: "tail -f /dev/null",
+          args: "--privileged -v /dev:/dev -v '/vagrant:/vagrant'"
+      end
+
+      override.vm.provision "shell", inline: <<-SHELL
+        echo 'docker restart qmkfm-qmk_cli && exec docker exec -it qmkfm-qmk_cli /bin/bash -l' >> ~vagrant/.bashrc
+      SHELL
+    end
+  end
+
+  config.vm.post_up_message = <<-EOT
+
+  Log into the environment using 'vagrant ssh'. QMK directory synchronized with
+  host is located at /vagrant
+  To compile the .hex files use make command inside this directory, e.g.
+     cd /vagrant
+     make <keyboard>:default
+
+  Examples:
+     make planck/rev4:default:dfu
+     make planck/rev4:default
+
+  EOT
+end

builddefs/build_full_test.mk

@@ -13,10 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$(TEST_OUTPUT)_INC := \
+$(TEST)_INC := \
 	tests/test_common/common_config.h
 
-$(TEST_OUTPUT)_SRC := \
+$(TEST)_SRC := \
+	$(TMK_COMMON_SRC) \
 	$(QUANTUM_SRC) \
 	$(SRC) \
 	$(QUANTUM_PATH)/keymap_introspection.c \
@@ -30,8 +31,8 @@ $(TEST_OUTPUT)_SRC := \
 	tests/test_common/test_logger.cpp \
 	$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
 
-$(TEST_OUTPUT)_DEFS := $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
+$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
 
-$(TEST_OUTPUT)_CONFIG := $(TEST_PATH)/config.h
+$(TEST)_CONFIG := $(TEST_PATH)/config.h
 
 VPATH += $(TOP_DIR)/tests/test_common

builddefs/build_json.mk

@@ -1,36 +1,17 @@
 # Look for a json keymap file
 ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","")
     KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_5)
+    KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
 else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","")
     KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_4)
+    KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
 else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","")
     KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_3)
+    KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
 else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","")
     KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_2)
+    KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
 else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","")
     KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_1)
-endif
-
-ifneq ($(QMK_USERSPACE),)
-    ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json
-        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json
-        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json
-        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json
-        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json
-        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
-    endif
+    KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
 endif

builddefs/build_keyboard.mk

@@ -27,6 +27,7 @@ QMK_BIN ?= qmk
 # Set the filename for the final firmware binary
 KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
+KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
 
 ifeq ($(strip $(DUMP_CI_METADATA)),yes)
     $(info CI Metadata: KEYBOARD=$(KEYBOARD))
@@ -34,19 +35,16 @@ ifeq ($(strip $(DUMP_CI_METADATA)),yes)
 endif
 
 # Force expansion
-override TARGET := $(TARGET)
+TARGET := $(TARGET)
 
 ifneq ($(FORCE_LAYOUT),)
-    override TARGET := $(TARGET)_$(FORCE_LAYOUT)
-endif
-ifneq ($(CONVERT_TO),)
-    override TARGET := $(TARGET)_$(CONVERT_TO)
+    TARGET := $(TARGET)_$(FORCE_LAYOUT)
 endif
 
 # Object files and generated keymap directory
 #     To put object files in current directory, use a dot (.), do NOT make
 #     this an empty or blank macro!
-INTERMEDIATE_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
+KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
 
 ifdef SKIP_VERSION
     OPT_DEFS += -DSKIP_VERSION
@@ -61,6 +59,9 @@ ifdef SKIP_GIT
 VERSION_H_FLAGS += --skip-git
 endif
 
+# Generate the board's version.h file.
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h)
+
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
 KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))
@@ -119,8 +120,8 @@ MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 
-# Pull in rules from DD keyboard config
-INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
+# Pull in rules from info.json
+INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
 # Check for keymap.json first, so we can regenerate keymap.c
@@ -129,107 +130,68 @@ include $(BUILDDEFS_PATH)/build_json.mk
 # Pull in keymap level rules.mk
 ifeq ("$(wildcard $(KEYMAP_PATH))", "")
     # Look through the possible keymap folders until we find a matching keymap.c
-    ifneq ($(QMK_USERSPACE),)
-        ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
-        endif
-    endif
-    ifeq ($(KEYMAP_PATH),)
-        ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_1)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_2)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_3)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_4)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_5)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
-        else ifneq ($(LAYOUTS),)
-            # If we haven't found a keymap yet fall back to community layouts
-            include $(BUILDDEFS_PATH)/build_layout.mk
-        else ifeq ("$(wildcard $(KEYMAP_JSON_PATH))", "") # Not finding keymap.c is fine if we found a keymap.json
-            $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
-            # this state should never be reached
-        endif
+    ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_1)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_2)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_3)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_4)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_5)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
+    else ifneq ($(LAYOUTS),)
+        # If we haven't found a keymap yet fall back to community layouts
+        include $(BUILDDEFS_PATH)/build_layout.mk
+    else
+        $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
+        # this state should never be reached
     endif
 endif
 
 # Have we found a keymap.json?
 ifneq ("$(wildcard $(KEYMAP_JSON))", "")
-    ifneq ("$(wildcard $(KEYMAP_C))", "")
-        $(call WARNING_MESSAGE,Keymap is specified as both keymap.json and keymap.c -- keymap.json file wins.)
-    endif
-
-    KEYMAP_PATH := $(KEYMAP_JSON_PATH)
-
-    KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
-    KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
+    KEYMAP_C := $(KEYMAP_OUTPUT)/src/keymap.c
+    KEYMAP_H := $(KEYMAP_OUTPUT)/src/config.h
 
     # Load the keymap-level rules.mk if exists
     -include $(KEYMAP_PATH)/rules.mk
 
     # Load any rules.mk content from keymap.json
-    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
+    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
-$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
+$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON)
+$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/keymap.h: $(KEYMAP_JSON)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keymap-h --quiet --output $(INTERMEDIATE_OUTPUT)/src/keymap.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/keymap.c $(INTERMEDIATE_OUTPUT)/src/keymap.h
+generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
 endif
 
 include $(BUILDDEFS_PATH)/converters.mk
 
-# Generate the board's version.h file.
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
-
 MCU_ORIG := $(MCU)
 include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk)
 
-# PLATFORM_KEY should be detected in DD keyboard config via key 'processor' (or rules.mk 'MCU')
+# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU')
 ifeq ($(PLATFORM_KEY),)
     $(call CATASTROPHIC_ERROR,Platform not defined)
 endif
@@ -343,68 +305,43 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
 endif
 
-# Create dependencies on DD keyboard config - structure validated elsewhere
-DD_CONFIG_FILES :=
+# Pull in stuff from info.json
+INFO_JSON_FILES :=
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
+    INFO_JSON_FILES += $(KEYBOARD_PATH_1)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
+    INFO_JSON_FILES += $(KEYBOARD_PATH_2)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
+    INFO_JSON_FILES += $(KEYBOARD_PATH_3)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
+    INFO_JSON_FILES += $(KEYBOARD_PATH_4)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
+    INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
 endif
 
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
-endif
+CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
+KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
 
-CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
-KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
-
-$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(DD_CONFIG_FILES)
+$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h)
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h)
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(DD_CONFIG_FILES)
+$(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.c)
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(DD_CONFIG_FILES)
+$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
 	@$(BUILD_CMD)
 
-generated-files: $(INTERMEDIATE_OUTPUT)/src/info_config.h $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h
-
-generated-files: $(INTERMEDIATE_OUTPUT)/src/info_deps.d
-
-$(INTERMEDIATE_OUTPUT)/src/info_deps.d:
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(INTERMEDIATE_OUTPUT)/src/info_deps.d)
-	@$(BUILD_CMD)
-
--include $(INTERMEDIATE_OUTPUT)/src/info_deps.d
+generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 
 .INTERMEDIATE : generated-files
 
@@ -414,16 +351,6 @@ ifeq ("$(USER_NAME)","")
 endif
 USER_PATH := users/$(USER_NAME)
 
-# If we have userspace, then add it to the lookup VPATH
-ifneq ($(wildcard $(QMK_USERSPACE)),)
-    VPATH += $(QMK_USERSPACE)
-endif
-
-# If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo
-ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
-    USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
-endif
-
 # Pull in user level rules.mk
 -include $(USER_PATH)/rules.mk
 ifneq ("$(wildcard $(USER_PATH)/config.h)","")
@@ -464,10 +391,6 @@ ifneq ("$(KEYMAP_H)","")
     CONFIG_H += $(KEYMAP_H)
 endif
 
-ifeq ($(KEYMAP_C),)
-    $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
-endif
-
 OPT_DEFS += -DKEYMAP_C=\"$(KEYMAP_C)\"
 
 # If a keymap or userspace places their keymap array in another file instead, allow for it to be included
@@ -491,7 +414,8 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
-VPATH += $(INTERMEDIATE_OUTPUT)/src
+VPATH += $(KEYBOARD_OUTPUT)/src
+VPATH += $(KEYMAP_OUTPUT)/src
 
 include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
@@ -500,17 +424,19 @@ include $(PLATFORM_PATH)/common.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
+SRC += $(TMK_COMMON_SRC)
+OPT_DEFS += $(TMK_COMMON_DEFS)
+EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
 
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
 
 ifneq ($(strip $(PROTOCOL)),)
-PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]'))
+    include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
 else
-PROTOCOL_KEY = $(PLATFORM_KEY)
+    include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
 endif
-include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk
 
 # Setup definitions based on the selected MCU
 $(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))
@@ -519,24 +445,26 @@ $(eval $(call add_qmk_prefix_defs,MCU_PORT_NAME,MCU_PORT_NAME))
 $(eval $(call add_qmk_prefix_defs,MCU_FAMILY,MCU_FAMILY))
 $(eval $(call add_qmk_prefix_defs,MCU_SERIES,MCU_SERIES))
 $(eval $(call add_qmk_prefix_defs,BOARD,BOARD))
-$(eval $(call add_qmk_prefix_defs,OPT,OPT))
 
-# Control whether intermediate file listings are generated
-# e.g.:
-#    make handwired/onekey/blackpill_f411:default KEEP_INTERMEDIATES=yes
-#    cat .build/obj_handwired_onekey_blackpill_f411_default/quantum/quantum.i | sed -e 's@^#.*@@g' -e 's@^\s*//.*@@g' -e '/^\s*$/d' | clang-format
-ifeq ($(strip $(KEEP_INTERMEDIATES)), yes)
-    OPT_DEFS += -save-temps=obj
-endif
+# TODO: remove this bodge?
+PROJECT_DEFS := $(OPT_DEFS)
+PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
+PROJECT_CONFIG := $(CONFIG_H)
 
-OUTPUTS := $(INTERMEDIATE_OUTPUT)
-$(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
-$(INTERMEDIATE_OUTPUT)_DEFS := \
-	-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
-	-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
-	$(OPT_DEFS)
-$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
-$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H)
+CONFIG_H += $(POST_CONFIG_H)
+ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
+
+OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
+$(KEYMAP_OUTPUT)_SRC := $(SRC)
+$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
+-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
+-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
+$(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
+$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
+$(KEYBOARD_OUTPUT)_SRC := $(PLATFORM_SRC)
+$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)
+$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC)
+$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
 
 # Default target.
 all: build check-size
@@ -557,10 +485,10 @@ check-size: top-symbols
 top-symbols: build
 	echo "###########################################"
 	echo "# Highest flash usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [RrTt] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 	echo "# Highest RAM usage:"
-	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [BbCDdGgSs] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
+	$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000#       #g' -e 's#^000000#      #g' -e 's#^00000#     #g' -e 's#^0000#    #g' -e 's#^000#   #g' -e 's#^00#  #g' -e 's#^0# #g'
 	echo "###########################################"
 endif
 

builddefs/build_layout.mk

@@ -1,10 +1,6 @@
 LAYOUTS_PATH := layouts
 LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
 
-ifneq ($(QMK_USERSPACE),)
-    LAYOUTS_REPOS += $(patsubst %/,%,$(QMK_USERSPACE)/$(LAYOUTS_PATH))
-endif
-
 define SEARCH_LAYOUTS_REPO
     LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
     LAYOUT_KEYMAP_JSON := $$(LAYOUT_KEYMAP_PATH)/keymap.json

builddefs/build_test.mk

@@ -9,13 +9,13 @@ OPT = g
 include paths.mk
 include $(BUILDDEFS_PATH)/message.mk
 
-TARGET=test/$(TEST_OUTPUT)
+TARGET=test/$(TEST)
 
 GTEST_OUTPUT = $(BUILD_DIR)/gtest
 
 TEST_OBJ = $(BUILD_DIR)/test_obj
 
-OUTPUTS := $(TEST_OBJ)/$(TEST_OUTPUT) $(GTEST_OUTPUT)
+OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT)
 
 GTEST_INC := \
 	$(LIB_PATH)/googletest/googletest/include \
@@ -47,8 +47,7 @@ PLATFORM:=TEST
 PLATFORM_KEY:=test
 BOOTLOADER_TYPE:=none
 
-DEBUG ?= 0
-ifneq ($(strip $(DEBUG)), 0)
+ifeq ($(strip $(DEBUG)), 1)
 CONSOLE_ENABLE = yes
 endif
 
@@ -72,18 +71,14 @@ ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include $(BUILDDEFS_PATH)/build_full_test.mk
 endif
 
-$(TEST_OUTPUT)_SRC += \
+$(TEST)_SRC += \
 	tests/test_common/main.cpp \
 	$(QUANTUM_PATH)/logging/print.c
 
-ifneq ($(strip $(INTROSPECTION_KEYMAP_C)),)
-$(TEST_OUTPUT)_DEFS += -DINTROSPECTION_KEYMAP_C=\"$(strip $(INTROSPECTION_KEYMAP_C))\"
-endif
-
-$(TEST_OBJ)/$(TEST_OUTPUT)_SRC := $($(TEST_OUTPUT)_SRC)
-$(TEST_OBJ)/$(TEST_OUTPUT)_INC := $($(TEST_OUTPUT)_INC) $(VPATH) $(GTEST_INC)
-$(TEST_OBJ)/$(TEST_OUTPUT)_DEFS := $($(TEST_OUTPUT)_DEFS)
-$(TEST_OBJ)/$(TEST_OUTPUT)_CONFIG := $($(TEST_OUTPUT)_CONFIG)
+$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
+$(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
+$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
+$(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
 
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 include $(BUILDDEFS_PATH)/common_rules.mk

builddefs/common_features.mk

@@ -75,7 +75,10 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(SEQUENCER_ENABLE)), yes)
+    OPT_DEFS += -DSEQUENCER_ENABLE
     MUSIC_ENABLE = yes
+    SRC += $(QUANTUM_DIR)/sequencer/sequencer.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_sequencer.c
 endif
 
 ifeq ($(strip $(MIDI_ENABLE)), yes)
@@ -91,6 +94,11 @@ ifeq ($(strip $(MIDI_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
 endif
 
+MUSIC_ENABLE ?= no
+ifeq ($(MUSIC_ENABLE), yes)
+    SRC += $(QUANTUM_DIR)/process_keycode/process_music.c
+endif
+
 VALID_STENO_PROTOCOL_TYPES := geminipr txbolt all
 STENO_PROTOCOL ?= all
 ifeq ($(strip $(STENO_ENABLE)), yes)
@@ -116,11 +124,17 @@ ifeq ($(strip $(STENO_ENABLE)), yes)
     endif
 endif
 
-ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
-    MOUSE_ENABLE := yes
+ifeq ($(strip $(VIRTSER_ENABLE)), yes)
+    OPT_DEFS += -DVIRTSER_ENABLE
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
+ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
+    OPT_DEFS += -DMOUSEKEY_ENABLE
+    MOUSE_ENABLE := yes
+    SRC += $(QUANTUM_DIR)/mousekey.c
+endif
+
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3360 pmw3389 pimoroni_trackball custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
@@ -137,26 +151,30 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         endif
         OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(POINTING_DEVICE_DRIVER))
         ifeq ($(strip $(POINTING_DEVICE_DRIVER)), adns9800)
-            SPI_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
+            QUANTUM_LIB_SRC += spi_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), analog_joystick)
-            ANALOG_DRIVER_REQUIRED = yes
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), azoteq_iqs5xx)
-            I2C_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_ADC -DHAL_USE_ADC=TRUE
+            LIB_SRC += analog.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_i2c)
-            I2C_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
             SRC += drivers/sensors/cirque_pinnacle_gestures.c
             SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
+            QUANTUM_LIB_SRC += i2c_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi)
-            SPI_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
             SRC += drivers/sensors/cirque_pinnacle.c
             SRC += drivers/sensors/cirque_pinnacle_gestures.c
             SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
+            QUANTUM_LIB_SRC += spi_master.c
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
-            I2C_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE
+            QUANTUM_LIB_SRC += i2c_master.c
         else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
-            SPI_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
             SRC += drivers/sensors/pmw33xx_common.c
+            QUANTUM_LIB_SRC += spi_master.c
         endif
     endif
 endif
@@ -186,19 +204,19 @@ else
   else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
     # External I2C EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-    I2C_DRIVER_REQUIRED = yes
+    QUANTUM_LIB_SRC += i2c_master.c
     SRC += eeprom_driver.c eeprom_i2c.c
   else ifeq ($(strip $(EEPROM_DRIVER)), spi)
     # External SPI EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-    SPI_DRIVER_REQUIRED = yes
+    QUANTUM_LIB_SRC += spi_master.c
     SRC += eeprom_driver.c eeprom_spi.c
   else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
     # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
     COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
     COMMON_VPATH += $(DRIVER_PATH)/flash
-    SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+    SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
   else ifeq ($(strip $(EEPROM_DRIVER)), transient)
     # Transient EEPROM implementation -- no data storage but provides runtime area for it
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
@@ -282,26 +300,31 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
   endif
 endif
 
-VALID_FLASH_DRIVER_TYPES := spi custom
+VALID_FLASH_DRIVER_TYPES := spi
 FLASH_DRIVER ?= none
 ifneq ($(strip $(FLASH_DRIVER)), none)
     ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid FLASH_DRIVER,FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid flash driver)
     else
-        OPT_DEFS += -DFLASH_ENABLE -DFLASH_DRIVER -DFLASH_DRIVER_$(strip $(shell echo $(FLASH_DRIVER) | tr '[:lower:]' '[:upper:]'))
-		COMMON_VPATH += $(DRIVER_PATH)/flash
+        OPT_DEFS += -DFLASH_ENABLE
         ifeq ($(strip $(FLASH_DRIVER)),spi)
+            OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
+            COMMON_VPATH += $(DRIVER_PATH)/flash
             SRC += flash_spi.c
-            SPI_DRIVER_REQUIRED = yes
+            QUANTUM_LIB_SRC += spi_master.c
         endif
     endif
 endif
 
 RGBLIGHT_ENABLE ?= no
-VALID_RGBLIGHT_TYPES := ws2812 apa102 custom
+VALID_RGBLIGHT_TYPES := WS2812 APA102 custom
+
+ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
+    RGBLIGHT_DRIVER ?= custom
+endif
 
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-    RGBLIGHT_DRIVER ?= ws2812
+    RGBLIGHT_DRIVER ?= WS2812
 
     ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGBLIGHT_DRIVER,RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
@@ -309,253 +332,190 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
         COMMON_VPATH += $(QUANTUM_DIR)/rgblight
         POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h
         OPT_DEFS += -DRGBLIGHT_ENABLE
-        OPT_DEFS += -DRGBLIGHT_$(strip $(shell echo $(RGBLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]'))
         SRC += $(QUANTUM_DIR)/color.c
         SRC += $(QUANTUM_DIR)/rgblight/rgblight.c
-        SRC += $(QUANTUM_DIR)/rgblight/rgblight_drivers.c
         CIE1931_CURVE := yes
         RGB_KEYCODES_ENABLE := yes
     endif
 
-    ifeq ($(strip $(RGBLIGHT_DRIVER)), ws2812)
+    ifeq ($(strip $(RGBLIGHT_DRIVER)), WS2812)
         WS2812_DRIVER_REQUIRED := yes
     endif
 
-    ifeq ($(strip $(RGBLIGHT_DRIVER)), apa102)
+    ifeq ($(strip $(RGBLIGHT_DRIVER)), APA102)
         APA102_DRIVER_REQUIRED := yes
     endif
 
-    ifeq ($(strip $(VELOCIKEY_ENABLE)), yes)
-        OPT_DEFS += -DVELOCIKEY_ENABLE
+    ifeq ($(strip $(RGBLIGHT_DRIVER)), custom)
+        OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER
     endif
 endif
 
-# Deprecated driver names - do not use
-ifeq ($(strip $(LED_MATRIX_DRIVER)), aw20216)
-LED_MATRIX_DRIVER := aw20216s
-endif
-ifeq ($(strip $(LED_MATRIX_DRIVER)), ckled2001)
-LED_MATRIX_DRIVER := snled27351
-endif
-
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
+VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 custom
+# TODO: IS31FL3733 IS31FL3737 IS31FL3741
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid LED_MATRIX_DRIVER,LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DLED_MATRIX_ENABLE
-    OPT_DEFS += -DLED_MATRIX_$(strip $(shell echo $(LED_MATRIX_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
+ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
+    # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
+    OPT_DEFS += -DLIB8_ATTINY
+endif
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
-    POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
-    SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
-    LIB8TION_ENABLE := yes
+    SRC += $(LIB_PATH)/lib8tion/lib8tion.c
     CIE1931_CURVE := yes
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3218)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)
+        OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3218-mono.c
+        SRC += is31fl3731-simple.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3236)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3236-mono.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3729)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3729-mono.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3731)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3731-mono.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3733)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3733-mono.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3736)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3736-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3737)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3737-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3741)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3741-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3742a)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3742a-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3743a)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3743a-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3745)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3745-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3746a)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3746a-mono.c
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_DRIVER)), snled27351)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), CKLED2001)
+        OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
-        SRC += snled27351-mono.c
+        SRC += ckled2001-simple.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
 endif
 
-# Deprecated driver names - do not use
-ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216)
-RGB_MATRIX_DRIVER := aw20216s
-endif
-ifeq ($(strip $(RGB_MATRIX_DRIVER)), ckled2001)
-RGB_MATRIX_DRIVER := snled27351
-endif
-
 RGB_MATRIX_ENABLE ?= no
 
-VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
+VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 WS2812 custom
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DRGB_MATRIX_ENABLE
-    OPT_DEFS += -DRGB_MATRIX_$(strip $(shell echo $(RGB_MATRIX_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
+ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
+    # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
+    OPT_DEFS += -DLIB8_ATTINY
+endif
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
-    POST_CONFIG_H += $(QUANTUM_DIR)/rgb_matrix/post_config.h
     SRC += $(QUANTUM_DIR)/color.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
-    LIB8TION_ENABLE := yes
+    SRC += $(LIB_PATH)/lib8tion/lib8tion.c
     CIE1931_CURVE := yes
     RGB_KEYCODES_ENABLE := yes
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216s)
-        SPI_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), AW20216)
+        OPT_DEFS += -DAW20216 -DSTM32_SPI -DHAL_USE_SPI=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
-        SRC += aw20216s.c
+        SRC += aw20216.c
+        QUANTUM_LIB_SRC += spi_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3218)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3218.c
-    endif
-
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3236)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3236.c
-    endif
-
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3729)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3729.c
-    endif
-
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3731)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3731)
+        OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3731.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3733)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3733)
+        OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3733.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3736)
-        I2C_DRIVER_REQUIRED = yes
-        COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3736.c
-    endif
-
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3737)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3737)
+        OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3737.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3741)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3741)
+        OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
         SRC += is31fl3741.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3742a)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3742a.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3743a)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3743a.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3745)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3745.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3746a)
-        I2C_DRIVER_REQUIRED = yes
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31fl3746a.c
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), snled27351)
-        I2C_DRIVER_REQUIRED = yes
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), CKLED2001)
+        OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
-        SRC += snled27351.c
+        SRC += ckled2001.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), ws2812)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), WS2812)
+        OPT_DEFS += -DWS2812
         WS2812_DRIVER_REQUIRED := yes
     endif
 
-    ifeq ($(strip $(RGB_MATRIX_DRIVER)), apa102)
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), APA102)
+        OPT_DEFS += -DAPA102
         APA102_DRIVER_REQUIRED := yes
     endif
 
@@ -598,23 +558,55 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     endif
 
     COMMON_VPATH += $(QUANTUM_DIR)/backlight
-    COMMON_VPATH += $(DRIVER_PATH)/backlight
     SRC += $(QUANTUM_DIR)/backlight/backlight.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
     OPT_DEFS += -DBACKLIGHT_ENABLE
-    OPT_DEFS += -DBACKLIGHT_$(strip $(shell echo $(BACKLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]'))
 
-    ifneq ($(strip $(BACKLIGHT_DRIVER)), custom)
+    ifeq ($(strip $(BACKLIGHT_DRIVER)), custom)
+        OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
+    else
         SRC += $(QUANTUM_DIR)/backlight/backlight_driver_common.c
-
-        ifeq ($(strip $(BACKLIGHT_DRIVER)), software)
-            SRC += $(DRIVER_PATH)/backlight/backlight_software.c
+        ifeq ($(strip $(BACKLIGHT_DRIVER)), pwm)
+            SRC += $(QUANTUM_DIR)/backlight/backlight_$(PLATFORM_KEY).c
         else
-            SRC += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/backlight_$(strip $(BACKLIGHT_DRIVER)).c
+            SRC += $(QUANTUM_DIR)/backlight/backlight_$(strip $(BACKLIGHT_DRIVER)).c
         endif
     endif
 endif
 
+VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c vendor
+
+WS2812_DRIVER ?= bitbang
+ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
+    ifeq ($(filter $(WS2812_DRIVER),$(VALID_WS2812_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid WS2812_DRIVER,WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
+    endif
+
+    OPT_DEFS += -DWS2812_DRIVER_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
+
+    ifeq ($(strip $(WS2812_DRIVER)), bitbang)
+        SRC += ws2812.c
+    else
+        SRC += ws2812_$(strip $(WS2812_DRIVER)).c
+
+        ifeq ($(strip $(PLATFORM)), CHIBIOS)
+            ifeq ($(strip $(WS2812_DRIVER)), pwm)
+                OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
+            endif
+        endif
+    endif
+
+    # add extra deps
+    ifeq ($(strip $(WS2812_DRIVER)), i2c)
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+endif
+
+ifeq ($(strip $(APA102_DRIVER_REQUIRED)), yes)
+    COMMON_VPATH += $(DRIVER_PATH)/led
+    SRC += apa102.c
+endif
+
 ifeq ($(strip $(CIE1931_CURVE)), yes)
     OPT_DEFS += -DUSE_CIE1931_CURVE
     LED_TABLES := yes
@@ -629,11 +621,28 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     RAW_ENABLE := yes
     BOOTMAGIC_ENABLE := yes
     TRI_LAYER_ENABLE := yes
+    SRC += $(QUANTUM_DIR)/via.c
+    OPT_DEFS += -DVIA_ENABLE
 endif
 
+VALID_MAGIC_TYPES := yes
+BOOTMAGIC_ENABLE ?= no
+ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
+  ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
+    $(call CATASTROPHIC_ERROR,Invalid BOOTMAGIC_ENABLE,BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
+  endif
+  ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
+      OPT_DEFS += -DBOOTMAGIC_LITE
+      QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/bootmagic_lite.c
+  endif
+endif
+COMMON_VPATH += $(QUANTUM_DIR)/bootmagic
+QUANTUM_SRC += $(QUANTUM_DIR)/bootmagic/magic.c
+
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
 
 CUSTOM_MATRIX ?= no
+
 ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(filter $(CUSTOM_MATRIX),$(VALID_CUSTOM_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid CUSTOM_MATRIX,CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
@@ -698,36 +707,29 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
     COMMON_VPATH += $(QUANTUM_PATH)/split_common
 endif
 
+ifeq ($(strip $(CRC_ENABLE)), yes)
+    OPT_DEFS += -DCRC_ENABLE
+    SRC += crc.c
+endif
+
 ifeq ($(strip $(FNV_ENABLE)), yes)
     OPT_DEFS += -DFNV_ENABLE
     VPATH += $(LIB_PATH)/fnv
     SRC += qmk_fnv_type_validation.c hash_32a.c hash_64a.c
 endif
 
-ifeq ($(strip $(LIB8TION_ENABLE)), yes)
-    ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
-        # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
-        OPT_DEFS += -DLIB8_ATTINY
-    endif
-    SRC += $(LIB_PATH)/lib8tion/lib8tion.c
-endif
-
-VALID_HAPTIC_DRIVER_TYPES := drv2605l solenoid
 ifeq ($(strip $(HAPTIC_ENABLE)),yes)
-    ifeq ($(filter $(HAPTIC_DRIVER),$(VALID_HAPTIC_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid HAPTIC_DRIVER,HAPTIC_DRIVER="$(HAPTIC_DRIVER)" is not a valid Haptic driver)
-    else
-        OPT_DEFS += -DHAPTIC_$(strip $(shell echo $(HAPTIC_DRIVER) | tr '[:lower:]' '[:upper:]'))
-        COMMON_VPATH += $(DRIVER_PATH)/haptic
+    COMMON_VPATH += $(DRIVER_PATH)/haptic
 
-        ifeq ($(strip $(HAPTIC_DRIVER)), drv2605l)
-            I2C_DRIVER_REQUIRED = yes
-            SRC += drv2605l.c
-        endif
+    ifneq ($(filter DRV2605L, $(HAPTIC_DRIVER)), )
+        SRC += DRV2605L.c
+        QUANTUM_LIB_SRC += i2c_master.c
+        OPT_DEFS += -DDRV2605L
+    endif
 
-        ifeq ($(strip $(HAPTIC_DRIVER)), solenoid)
-            SRC += solenoid.c
-        endif
+    ifneq ($(filter SOLENOID, $(HAPTIC_DRIVER)), )
+        SRC += solenoid.c
+        OPT_DEFS += -DSOLENOID_ENABLE
     endif
 endif
 
@@ -737,55 +739,41 @@ ifeq ($(strip $(HD44780_ENABLE)), yes)
     SRC += hd44780.c
 endif
 
-VALID_OLED_DRIVER_TYPES := custom ssd1306
-OLED_DRIVER ?= ssd1306
-VALID_OLED_TRANSPORT_TYPES := i2c spi custom
-OLED_TRANSPORT ?= i2c
+VALID_OLED_DRIVER_TYPES := SSD1306 custom
+OLED_DRIVER ?= SSD1306
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(filter $(OLED_DRIVER),$(VALID_OLED_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid OLED_DRIVER,OLED_DRIVER="$(OLED_DRIVER)" is not a valid OLED driver)
     else
-        ifeq ($(filter $(OLED_TRANSPORT),$(VALID_OLED_TRANSPORT_TYPES)),)
-            $(call CATASTROPHIC_ERROR,Invalid OLED_TRANSPORT,OLED_TRANSPORT="$(OLED_TRANSPORT)" is not a valid OLED transport)
-        else
-            OPT_DEFS += -DOLED_ENABLE
-            OPT_DEFS += -DOLED_$(strip $(shell echo $(OLED_DRIVER) | tr '[:lower:]' '[:upper:]'))
-            COMMON_VPATH += $(DRIVER_PATH)/oled
-            ifneq ($(strip $(OLED_DRIVER)), custom)
-                SRC += oled_driver.c
-            endif
+        OPT_DEFS += -DOLED_ENABLE
+        COMMON_VPATH += $(DRIVER_PATH)/oled
 
-            OPT_DEFS += -DOLED_TRANSPORT_$(strip $(shell echo $(OLED_TRANSPORT) | tr '[:lower:]' '[:upper:]'))
-            ifeq ($(strip $(OLED_TRANSPORT)), i2c)
-                I2C_DRIVER_REQUIRED = yes
-            endif
-            ifeq ($(strip $(OLED_TRANSPORT)), spi)
-                SPI_DRIVER_REQUIRED = yes
-            endif
+        OPT_DEFS += -DOLED_DRIVER_$(strip $(shell echo $(OLED_DRIVER) | tr '[:lower:]' '[:upper:]'))
+        ifeq ($(strip $(OLED_DRIVER)), SSD1306)
+            SRC += ssd1306_sh1106.c
+            QUANTUM_LIB_SRC += i2c_master.c
         endif
     endif
 endif
 
 ifeq ($(strip $(ST7565_ENABLE)), yes)
     OPT_DEFS += -DST7565_ENABLE
-    SPI_DRIVER_REQUIRED = yes
     COMMON_VPATH += $(DRIVER_PATH)/oled # For glcdfont.h
     COMMON_VPATH += $(DRIVER_PATH)/lcd
+    QUANTUM_LIB_SRC += spi_master.c
     SRC += st7565.c
 endif
 
 ifeq ($(strip $(UCIS_ENABLE)), yes)
     OPT_DEFS += -DUCIS_ENABLE
     UNICODE_COMMON := yes
-    SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c \
-           $(QUANTUM_DIR)/unicode/ucis.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c
 endif
 
 ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
     OPT_DEFS += -DUNICODEMAP_ENABLE
     UNICODE_COMMON := yes
-    SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c \
-           $(QUANTUM_DIR)/unicode/unicodemap.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c
 endif
 
 ifeq ($(strip $(UNICODE_ENABLE)), yes)
@@ -802,11 +790,32 @@ ifeq ($(strip $(UNICODE_COMMON)), yes)
            $(QUANTUM_DIR)/unicode/utf8.c
 endif
 
+MAGIC_ENABLE ?= yes
+ifeq ($(strip $(MAGIC_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/process_keycode/process_magic.c
+    OPT_DEFS += -DMAGIC_KEYCODE_ENABLE
+endif
+
+SEND_STRING_ENABLE ?= yes
+ifeq ($(strip $(SEND_STRING_ENABLE)), yes)
+    OPT_DEFS += -DSEND_STRING_ENABLE
+    COMMON_VPATH += $(QUANTUM_DIR)/send_string
+    SRC += $(QUANTUM_DIR)/send_string/send_string.c
+endif
+
+ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/process_keycode/process_auto_shift.c
+    OPT_DEFS += -DAUTO_SHIFT_ENABLE
+    ifeq ($(strip $(AUTO_SHIFT_MODIFIERS)), yes)
+        OPT_DEFS += -DAUTO_SHIFT_MODIFIERS
+    endif
+endif
+
 ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     PS2_ENABLE := yes
-    MOUSE_ENABLE := yes
     SRC += ps2_mouse.c
     OPT_DEFS += -DPS2_MOUSE_ENABLE
+    OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
@@ -838,12 +847,15 @@ ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
         $(call CATASTROPHIC_ERROR,Invalid JOYSTICK_DRIVER,JOYSTICK_DRIVER="$(JOYSTICK_DRIVER)" is not a valid joystick driver)
     endif
     OPT_DEFS += -DJOYSTICK_ENABLE
-    OPT_DEFS += -DJOYSTICK_$(strip $(shell echo $(JOYSTICK_DRIVER) | tr '[:lower:]' '[:upper:]'))
     SRC += $(QUANTUM_DIR)/process_keycode/process_joystick.c
     SRC += $(QUANTUM_DIR)/joystick.c
 
     ifeq ($(strip $(JOYSTICK_DRIVER)), analog)
-        ANALOG_DRIVER_REQUIRED = yes
+        OPT_DEFS += -DANALOG_JOYSTICK_ENABLE
+        SRC += analog.c
+    endif
+    ifeq ($(strip $(JOYSTICK_DRIVER)), digital)
+        OPT_DEFS += -DDIGITAL_JOYSTICK_ENABLE
     endif
 endif
 
@@ -872,114 +884,42 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
 endif
 
 BLUETOOTH_ENABLE ?= no
-VALID_BLUETOOTH_DRIVER_TYPES := bluefruit_le custom rn42
+VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid BLUETOOTH_DRIVER,BLUETOOTH_DRIVER="$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
     endif
     OPT_DEFS += -DBLUETOOTH_ENABLE
-    OPT_DEFS += -DBLUETOOTH_$(strip $(shell echo $(BLUETOOTH_DRIVER) | tr '[:lower:]' '[:upper:]'))
     NO_USB_STARTUP_CHECK := yes
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
-    SRC += outputselect.c
+    SRC += outputselect.c bluetooth.c
 
-    ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le)
-        SPI_DRIVER_REQUIRED = yes
-        ANALOG_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+    ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
+        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
+        QUANTUM_LIB_SRC += analog.c
+        QUANTUM_LIB_SRC += spi_master.c
     endif
 
-    ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42)
-        UART_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+    ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
+        OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
+        QUANTUM_LIB_SRC += uart.c
     endif
 endif
 
-ENCODER_ENABLE ?= no
-ENCODER_DRIVER ?= quadrature
-VALID_ENCODER_DRIVER_TYPES := quadrature custom
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
-    ifeq ($(filter $(ENCODER_DRIVER),$(VALID_ENCODER_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid ENCODER_DRIVER,ENCODER_DRIVER="$(ENCODER_DRIVER)" is not a valid encoder driver)
-    endif
     SRC += $(QUANTUM_DIR)/encoder.c
     OPT_DEFS += -DENCODER_ENABLE
-    OPT_DEFS += -DENCODER_DRIVER_$(strip $(shell echo $(ENCODER_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
-    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/encoder
-    COMMON_VPATH += $(DRIVER_PATH)/encoder
-
-    ifneq ($(strip $(ENCODER_DRIVER)), custom)
-        SRC += encoder_$(strip $(ENCODER_DRIVER)).c
-    endif
-
     ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
         OPT_DEFS += -DENCODER_MAP_ENABLE
     endif
 endif
 
-ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
-    ifeq ($(strip $(DIP_SWITCH_MAP_ENABLE)), yes)
-        OPT_DEFS += -DDIP_SWITCH_MAP_ENABLE
-    endif
-endif
-
-VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor
-
-WS2812_DRIVER ?= bitbang
-ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
-    ifeq ($(filter $(WS2812_DRIVER),$(VALID_WS2812_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid WS2812_DRIVER,WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
-    endif
-
-    OPT_DEFS += -DWS2812_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
-    SRC += ws2812_$(strip $(WS2812_DRIVER)).c
-
-    ifeq ($(strip $(PLATFORM)), CHIBIOS)
-        ifeq ($(strip $(WS2812_DRIVER)), pwm)
-            OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-        endif
-    endif
-
-    # add extra deps
-    ifeq ($(strip $(WS2812_DRIVER)), i2c)
-        I2C_DRIVER_REQUIRED = yes
-    endif
-endif
-
-ifeq ($(strip $(APA102_DRIVER_REQUIRED)), yes)
-    COMMON_VPATH += $(DRIVER_PATH)/led
-    SRC += apa102.c
-endif
-
-ifeq ($(strip $(ANALOG_DRIVER_REQUIRED)), yes)
-    OPT_DEFS += -DHAL_USE_ADC=TRUE
-    QUANTUM_LIB_SRC += analog.c
-endif
-
-ifeq ($(strip $(I2C_DRIVER_REQUIRED)), yes)
-    OPT_DEFS += -DHAL_USE_I2C=TRUE
-    QUANTUM_LIB_SRC += i2c_master.c
-endif
-
-ifeq ($(strip $(SPI_DRIVER_REQUIRED)), yes)
-    OPT_DEFS += -DHAL_USE_SPI=TRUE
-    QUANTUM_LIB_SRC += spi_master.c
-endif
-
-ifeq ($(strip $(UART_DRIVER_REQUIRED)), yes)
-    ifeq ($(strip $(PLATFORM)), CHIBIOS)
-        ifneq ($(filter $(MCU_SERIES),RP2040),)
-            OPT_DEFS += -DHAL_USE_SIO=TRUE
-            QUANTUM_LIB_SRC += uart_sio.c
-        else
-            OPT_DEFS += -DHAL_USE_SERIAL=TRUE
-            QUANTUM_LIB_SRC += uart_serial.c
-        endif
-    else
-        QUANTUM_LIB_SRC += uart.c
+ifeq ($(strip $(OS_DETECTION_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/os_detection.c
+    OPT_DEFS += -DOS_DETECTION_ENABLE
+    ifeq ($(strip $(OS_DETECTION_DEBUG_ENABLE)), yes)
+        OPT_DEFS += -DOS_DETECTION_DEBUG_ENABLE
     endif
 endif

builddefs/common_rules.mk

@@ -12,9 +12,6 @@ vpath %.hpp $(VPATH_SRC)
 vpath %.S $(VPATH_SRC)
 VPATH :=
 
-# Helper to return the distinct elements of a list
-uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
-
 # Convert all SRC to OBJ
 define OBJ_FROM_SRC
 $(patsubst %.c,$1/%.o,$(patsubst %.cpp,$1/%.o,$(patsubst %.cc,$1/%.o,$(patsubst %.S,$1/%.o,$(patsubst %.clib,$1/%.a,$($1_SRC))))))
@@ -155,7 +152,6 @@ endif
 # To produce a UF2 file in your build, add to your keyboard's rules.mk:
 #      FIRMWARE_FORMAT = uf2
 UF2CONV = $(TOP_DIR)/util/uf2conv.py
-UF2CONV_ARGS ?=
 UF2_FAMILY ?= 0x0
 
 # Compiler flags to generate dependency files.
@@ -179,7 +175,7 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 
 # For a ChibiOS build, ensure that the board files have the hook overrides injected
 define BOARDSRC_INJECT_HOOKS
-$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(KEYBOARD_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
 endef
 $(foreach LOBJ, $(BOARDSRC), $(eval $(call BOARDSRC_INJECT_HOOKS,$(LOBJ))))
 
@@ -191,7 +187,7 @@ DFU_SUFFIX_ARGS ?=
 elf: $(BUILD_DIR)/$(TARGET).elf
 hex: $(BUILD_DIR)/$(TARGET).hex
 uf2: $(BUILD_DIR)/$(TARGET).uf2
-cpfirmware_qmk: $(FIRMWARE_FORMAT)
+cpfirmware: $(FIRMWARE_FORMAT)
 	$(SILENT) || printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to qmk_firmware folder" | $(AWK_CMD)
 	$(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK)
 eep: $(BUILD_DIR)/$(TARGET).eep
@@ -200,15 +196,6 @@ sym: $(BUILD_DIR)/$(TARGET).sym
 LIBNAME=lib$(TARGET).a
 lib: $(LIBNAME)
 
-cpfirmware: cpfirmware_qmk
-
-ifneq ($(QMK_USERSPACE),)
-cpfirmware: cpfirmware_userspace
-cpfirmware_userspace: cpfirmware_qmk
-	$(SILENT) || printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to userspace folder" | $(AWK_CMD)
-	$(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(QMK_USERSPACE)/$(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK)
-endif
-
 # Display size of file, modifying the output so people don't mistakenly grab the hex output
 BINARY_SIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(SED) -e 's/\.build\/.*$$/$(TARGET).$(FIRMWARE_FORMAT)/g'
 
@@ -232,7 +219,7 @@ gccversion :
 	@$(BUILD_CMD)
 
 %.uf2: %.elf
-	$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(UF2CONV_ARGS) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
+	$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
 	#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
 	@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
 	@$(BUILD_CMD)
@@ -276,7 +263,7 @@ BEGIN = gccversion sizebefore
 # Note the obj.txt depeendency is there to force linking if a source file is deleted
 %.elf: $(OBJ) $(MASTER_OUTPUT)/cflags.txt $(MASTER_OUTPUT)/ldflags.txt $(MASTER_OUTPUT)/obj.txt | $(BEGIN)
 	@$(SILENT) || printf "$(MSG_LINKING) $@" | $(AWK_CMD)
-	$(eval CMD=MAKE=$(MAKE) $(CC) $(ALL_CFLAGS) $(call uniq,$(OBJ)) --output $@ $(LDFLAGS))
+	$(eval CMD=MAKE=$(MAKE) $(CC) $(ALL_CFLAGS) $(filter-out %.txt,$^) --output $@ $(LDFLAGS))
 	@$(BUILD_CMD)
 
 
@@ -392,9 +379,31 @@ dump_vars:
 objs-size:
 	for i in $(OBJ); do echo $$i; done | sort | xargs $(SIZE)
 
+ifeq ($(findstring avr-gcc,$(CC)),avr-gcc)
+SIZE_MARGIN = 1024
 
-# size check optionally implemented in its platform.mk
 check-size:
+	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | $(SED) -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
+	$(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
+	$(eval FREE_SIZE=$(shell expr $(MAX_SIZE) - $(CURRENT_SIZE)))
+	$(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE)))
+	$(eval PERCENT_SIZE=$(shell expr $(CURRENT_SIZE) \* 100 / $(MAX_SIZE)))
+	if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
+		$(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
+		if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then \
+		    printf "\n * $(MSG_FILE_TOO_BIG)"; $(PRINT_ERROR_PLAIN); \
+		else \
+		    if [ $(FREE_SIZE) -lt $(SIZE_MARGIN) ]; then \
+			$(PRINT_WARNING_PLAIN); printf " * $(MSG_FILE_NEAR_LIMIT)"; \
+		    else \
+			$(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; \
+		    fi ; \
+		fi ; \
+	fi
+else
+check-size:
+	$(SILENT) || echo "$(MSG_CHECK_FILESIZE_SKIPPED)"
+endif
 
 check-md5:
 	$(MD5SUM) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT)

builddefs/converters.mk

@@ -5,23 +5,12 @@ ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
 $(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
 endif
 
-ifneq (,$(filter $(MCU),atmega32u4))
-    # TODO: opt in rather than assume everything uses a pro micro
-    PIN_COMPATIBLE ?= promicro
-endif
-
-# Remove whitespace from any rule.mk provided vars
-#   - env cannot be overwritten but cannot have whitespace anyway
-CONVERT_TO:=$(strip $(CONVERT_TO))
+# TODO: opt in rather than assume everything uses a pro micro
+PIN_COMPATIBLE ?= promicro
 ifneq ($(CONVERT_TO),)
-
     # stash so we can overwrite env provided vars if needed
     ACTIVE_CONVERTER=$(CONVERT_TO)
 
-    ifeq ($(PIN_COMPATIBLE),)
-        $(call CATASTROPHIC_ERROR,Converting to '$(CONVERT_TO)' not possible!)
-    endif
-
     # glob to search each platfrorm and/or check for valid converter
     CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
     ifeq ($(CONVERTER),)
@@ -31,15 +20,16 @@ ifneq ($(CONVERT_TO),)
     -include $(CONVERTER)/pre_converter.mk
 
     PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2)
+    TARGET := $(TARGET)_$(CONVERT_TO)
 
     # Configure any defaults
-    OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')
-    OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\"
+    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
     OPT_DEFS += -DCONVERTER_ENABLED
     VPATH += $(CONVERTER)
 
     # Configure for "alias" - worst case it produces an idential define
-    OPT_DEFS += -DCONVERT_TO_$(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')
+    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]'))
 
     # Finally run any converter specific logic
     include $(CONVERTER)/converter.mk

builddefs/docsgen/.gitignore

@@ -1,5 +0,0 @@
-node_modules
-.vitepress/cache
-.vitepress/.temp
-.vitepress/dist
-docs

builddefs/docsgen/.vitepress/config.mts

@@ -1,51 +0,0 @@
-import { defineConfig } from "vitepress";
-import { tabsMarkdownPlugin } from "vitepress-plugin-tabs";
-import sidebar from "../../../docs/_sidebar.json";
-
-// https://vitepress.dev/reference/site-config
-export default defineConfig(({ mode }) => {
-    const prod = mode === "production";
-    return {
-        title: "QMK Firmware",
-        description: "Documentation for QMK Firmware",
-
-        srcDir: prod ? "docs" : "../../docs",
-        outDir: "../../.build/docs",
-        cleanUrls: true,
-
-        markdown: {
-            config(md) {
-                md.use(tabsMarkdownPlugin);
-            },
-        },
-
-        vite: {
-            resolve: {
-                preserveSymlinks: true,
-            },
-        },
-
-        themeConfig: {
-            // https://vitepress.dev/reference/default-theme-config
-            logo: {
-                light: "/qmk-logo-light.svg",
-                dark: "/qmk-logo-dark.svg",
-            },
-            title: 'QMK Firmware',
-
-            nav: [{ text: "Home", link: "/" }],
-
-            search: {
-                provider: "local",
-            },
-
-            sidebar: sidebar,
-
-            socialLinks: [
-                { icon: { svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" width="50px" height="50px"><path d="M 29 3 C 28.0625 3 27.164063 3.382813 26.5 4 C 25.835938 4.617188 25.363281 5.433594 25 6.40625 C 24.355469 8.140625 24.085938 10.394531 24.03125 13.03125 C 19.234375 13.179688 14.820313 14.421875 11.28125 16.46875 C 10.214844 15.46875 8.855469 14.96875 7.5 14.96875 C 6.089844 14.96875 4.675781 15.511719 3.59375 16.59375 C 1.425781 18.761719 1.425781 22.238281 3.59375 24.40625 L 3.84375 24.65625 C 3.3125 26.035156 3 27.488281 3 29 C 3 33.527344 5.566406 37.585938 9.5625 40.4375 C 13.558594 43.289063 19.007813 45 25 45 C 30.992188 45 36.441406 43.289063 40.4375 40.4375 C 44.433594 37.585938 47 33.527344 47 29 C 47 27.488281 46.6875 26.035156 46.15625 24.65625 L 46.40625 24.40625 C 48.574219 22.238281 48.574219 18.761719 46.40625 16.59375 C 45.324219 15.511719 43.910156 14.96875 42.5 14.96875 C 41.144531 14.96875 39.785156 15.46875 38.71875 16.46875 C 35.195313 14.433594 30.800781 13.191406 26.03125 13.03125 C 26.09375 10.546875 26.363281 8.46875 26.875 7.09375 C 27.164063 6.316406 27.527344 5.757813 27.875 5.4375 C 28.222656 5.117188 28.539063 5 29 5 C 29.460938 5 29.683594 5.125 30.03125 5.40625 C 30.378906 5.6875 30.785156 6.148438 31.3125 6.6875 C 32.253906 7.652344 33.695313 8.714844 36.09375 8.9375 C 36.539063 11.238281 38.574219 13 41 13 C 43.75 13 46 10.75 46 8 C 46 5.25 43.75 3 41 3 C 38.605469 3 36.574219 4.710938 36.09375 6.96875 C 34.3125 6.796875 33.527344 6.109375 32.75 5.3125 C 32.300781 4.851563 31.886719 4.3125 31.3125 3.84375 C 30.738281 3.375 29.9375 3 29 3 Z M 41 5 C 42.667969 5 44 6.332031 44 8 C 44 9.667969 42.667969 11 41 11 C 39.332031 11 38 9.667969 38 8 C 38 6.332031 39.332031 5 41 5 Z M 25 15 C 30.609375 15 35.675781 16.613281 39.28125 19.1875 C 42.886719 21.761719 45 25.226563 45 29 C 45 32.773438 42.886719 36.238281 39.28125 38.8125 C 35.675781 41.386719 30.609375 43 25 43 C 19.390625 43 14.324219 41.386719 10.71875 38.8125 C 7.113281 36.238281 5 32.773438 5 29 C 5 25.226563 7.113281 21.761719 10.71875 19.1875 C 14.324219 16.613281 19.390625 15 25 15 Z M 7.5 16.9375 C 8.203125 16.9375 8.914063 17.148438 9.53125 17.59375 C 7.527344 19.03125 5.886719 20.769531 4.75 22.71875 C 3.582031 21.296875 3.660156 19.339844 5 18 C 5.714844 17.285156 6.609375 16.9375 7.5 16.9375 Z M 42.5 16.9375 C 43.390625 16.9375 44.285156 17.285156 45 18 C 46.339844 19.339844 46.417969 21.296875 45.25 22.71875 C 44.113281 20.769531 42.472656 19.03125 40.46875 17.59375 C 41.085938 17.148438 41.796875 16.9375 42.5 16.9375 Z M 17 22 C 14.800781 22 13 23.800781 13 26 C 13 28.199219 14.800781 30 17 30 C 19.199219 30 21 28.199219 21 26 C 21 23.800781 19.199219 22 17 22 Z M 33 22 C 30.800781 22 29 23.800781 29 26 C 29 28.199219 30.800781 30 33 30 C 35.199219 30 37 28.199219 37 26 C 37 23.800781 35.199219 22 33 22 Z M 17 24 C 18.117188 24 19 24.882813 19 26 C 19 27.117188 18.117188 28 17 28 C 15.882813 28 15 27.117188 15 26 C 15 24.882813 15.882813 24 17 24 Z M 33 24 C 34.117188 24 35 24.882813 35 26 C 35 27.117188 34.117188 28 33 28 C 31.882813 28 31 27.117188 31 26 C 31 24.882813 31.882813 24 33 24 Z M 34.15625 33.84375 C 34.101563 33.851563 34.050781 33.859375 34 33.875 C 33.683594 33.9375 33.417969 34.144531 33.28125 34.4375 C 33.28125 34.4375 32.757813 35.164063 31.4375 36 C 30.117188 36.835938 28.058594 37.6875 25 37.6875 C 21.941406 37.6875 19.882813 36.835938 18.5625 36 C 17.242188 35.164063 16.71875 34.4375 16.71875 34.4375 C 16.492188 34.082031 16.066406 33.90625 15.65625 34 C 15.332031 34.082031 15.070313 34.316406 14.957031 34.632813 C 14.84375 34.945313 14.894531 35.292969 15.09375 35.5625 C 15.09375 35.5625 15.863281 36.671875 17.46875 37.6875 C 19.074219 38.703125 21.558594 39.6875 25 39.6875 C 28.441406 39.6875 30.925781 38.703125 32.53125 37.6875 C 34.136719 36.671875 34.90625 35.5625 34.90625 35.5625 C 35.207031 35.273438 35.296875 34.824219 35.128906 34.441406 C 34.960938 34.058594 34.574219 33.820313 34.15625 33.84375 Z"/></svg>' }, link: "https://reddit.com/r/olkb" },
-                { icon: "discord", link: "https://discord.gg/qmk" },
-                { icon: "github", link: "https://github.com/qmk/qmk_firmware" },
-            ],
-        }
-    };
-});

builddefs/docsgen/.vitepress/theme/QMKLayout.vue

@@ -1,29 +0,0 @@
-<script setup>
-import DefaultTheme from 'vitepress/theme'
-import { useRouter } from 'vitepress'
-import { onBeforeMount } from 'vue';
-import aliases from "../../../../docs/_aliases.json";
-
-const router = useRouter()
-onBeforeMount(async () => {
-    // Convert from docsify-style to vitepress-style URLs
-    let newUrl = window.location.href.replace(/\/#\//, '/').replace(/\?id=/, '#');
-
-    // Convert any aliases
-    let testUrl = new URL(newUrl);
-    while (testUrl.pathname in aliases) {
-        testUrl.pathname = aliases[testUrl.pathname];
-    }
-    newUrl = testUrl.toString();
-
-    // Redirect if required
-    if (newUrl != window.location.href) {
-        window.history.replaceState({}, '', newUrl);
-        await router.go(newUrl);
-    }
-});
-</script>
-
-<template>
-    <DefaultTheme.Layout/>
-</template>

builddefs/docsgen/.vitepress/theme/custom.css

@@ -1,19 +0,0 @@
-/* Override <kbd> as vitepress doesn't put them with borders */
-kbd {
-    border: 1px solid var(--vp-c-text-1);
-    border-radius: 5px;
-    margin: 0.2em;
-    padding: 0.2em;
-}
-
-:root {
-    --vp-nav-logo-height: 32px;
-
-    --vp-layout-max-width: calc(98% + 64px);
-
-    --vp-sidebar-width: 300px;
-}
-
-.VPDoc.has-aside .content-container {
-    max-width: unset !important;
-}

builddefs/docsgen/.vitepress/theme/index.ts

@@ -1,13 +0,0 @@
-import type { Theme } from 'vitepress'
-import DefaultTheme from 'vitepress/theme'
-import { enhanceAppWithTabs } from 'vitepress-plugin-tabs/client'
-import QMKLayout from './QMKLayout.vue'
-import './custom.css'
-
-export default {
-  extends: DefaultTheme,
-  Layout: QMKLayout,
-  enhanceApp({ app }) {
-    enhanceAppWithTabs(app)
-  }
-} satisfies Theme

builddefs/docsgen/build-docs.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-yarn install
-[[ -e docs ]] || ln -sf ../../docs docs
-DEBUG='vitepress:*,vite:*' yarn run docs:build

builddefs/docsgen/package.json

@@ -1,14 +0,0 @@
-{
-  "license": "GPL-2.0-or-later",
-  "devDependencies": {
-    "vite": "^5.2.14",
-    "vitepress": "^1.1.0",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vue": "^3.4.24"
-  },
-  "scripts": {
-    "docs:dev": "vitepress dev --host 0.0.0.0",
-    "docs:build": "vitepress build",
-    "docs:preview": "vitepress preview --host 0.0.0.0"
-  }
-}

builddefs/docsgen/start-docs.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-yarn install
-DEBUG='vitepress:*,vite:*' yarn run docs:dev

builddefs/docsgen/yarn.lock

@@ -1,797 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@algolia/autocomplete-core@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.9.3.tgz#1d56482a768c33aae0868c8533049e02e8961be7"
-  integrity sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==
-  dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights" "1.9.3"
-    "@algolia/autocomplete-shared" "1.9.3"
-
-"@algolia/autocomplete-plugin-algolia-insights@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.9.3.tgz#9b7f8641052c8ead6d66c1623d444cbe19dde587"
-  integrity sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.9.3"
-
-"@algolia/autocomplete-preset-algolia@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.9.3.tgz#64cca4a4304cfcad2cf730e83067e0c1b2f485da"
-  integrity sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.9.3"
-
-"@algolia/autocomplete-shared@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.9.3.tgz#2e22e830d36f0a9cf2c0ccd3c7f6d59435b77dfa"
-  integrity sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==
-
-"@algolia/cache-browser-local-storage@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.3.tgz#0cc26b96085e1115dac5fcb9d826651ba57faabc"
-  integrity sha512-vRHXYCpPlTDE7i6UOy2xE03zHF2C8MEFjPN2v7fRbqVpcOvAUQK81x3Kc21xyb5aSIpYCjWCZbYZuz8Glyzyyg==
-  dependencies:
-    "@algolia/cache-common" "4.23.3"
-
-"@algolia/cache-common@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.3.tgz#3bec79092d512a96c9bfbdeec7cff4ad36367166"
-  integrity sha512-h9XcNI6lxYStaw32pHpB1TMm0RuxphF+Ik4o7tcQiodEdpKK+wKufY6QXtba7t3k8eseirEMVB83uFFF3Nu54A==
-
-"@algolia/cache-in-memory@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.3.tgz#3945f87cd21ffa2bec23890c85305b6b11192423"
-  integrity sha512-yvpbuUXg/+0rbcagxNT7un0eo3czx2Uf0y4eiR4z4SD7SiptwYTpbuS0IHxcLHG3lq22ukx1T6Kjtk/rT+mqNg==
-  dependencies:
-    "@algolia/cache-common" "4.23.3"
-
-"@algolia/client-account@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.3.tgz#8751bbf636e6741c95e7c778488dee3ee430ac6f"
-  integrity sha512-hpa6S5d7iQmretHHF40QGq6hz0anWEHGlULcTIT9tbUssWUriN9AUXIFQ8Ei4w9azD0hc1rUok9/DeQQobhQMA==
-  dependencies:
-    "@algolia/client-common" "4.23.3"
-    "@algolia/client-search" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/client-analytics@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.3.tgz#f88710885278fe6fb6964384af59004a5a6f161d"
-  integrity sha512-LBsEARGS9cj8VkTAVEZphjxTjMVCci+zIIiRhpFun9jGDUlS1XmhCW7CTrnaWeIuCQS/2iPyRqSy1nXPjcBLRA==
-  dependencies:
-    "@algolia/client-common" "4.23.3"
-    "@algolia/client-search" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/client-common@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.3.tgz#891116aa0db75055a7ecc107649f7f0965774704"
-  integrity sha512-l6EiPxdAlg8CYhroqS5ybfIczsGUIAC47slLPOMDeKSVXYG1n0qGiz4RjAHLw2aD0xzh2EXZ7aRguPfz7UKDKw==
-  dependencies:
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/client-personalization@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.3.tgz#35fa8e5699b0295fbc400a8eb211dc711e5909db"
-  integrity sha512-3E3yF3Ocr1tB/xOZiuC3doHQBQ2zu2MPTYZ0d4lpfWads2WTKG7ZzmGnsHmm63RflvDeLK/UVx7j2b3QuwKQ2g==
-  dependencies:
-    "@algolia/client-common" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/client-search@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.3.tgz#a3486e6af13a231ec4ab43a915a1f318787b937f"
-  integrity sha512-P4VAKFHqU0wx9O+q29Q8YVuaowaZ5EM77rxfmGnkHUJggh28useXQdopokgwMeYw2XUht49WX5RcTQ40rZIabw==
-  dependencies:
-    "@algolia/client-common" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/logger-common@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.3.tgz#35c6d833cbf41e853a4f36ba37c6e5864920bfe9"
-  integrity sha512-y9kBtmJwiZ9ZZ+1Ek66P0M68mHQzKRxkW5kAAXYN/rdzgDN0d2COsViEFufxJ0pb45K4FRcfC7+33YB4BLrZ+g==
-
-"@algolia/logger-console@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.3.tgz#30f916781826c4db5f51fcd9a8a264a06e136985"
-  integrity sha512-8xoiseoWDKuCVnWP8jHthgaeobDLolh00KJAdMe9XPrWPuf1by732jSpgy2BlsLTaT9m32pHI8CRfrOqQzHv3A==
-  dependencies:
-    "@algolia/logger-common" "4.23.3"
-
-"@algolia/recommend@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.23.3.tgz#53d4f194d22d9c72dc05f3f7514c5878f87c5890"
-  integrity sha512-9fK4nXZF0bFkdcLBRDexsnGzVmu4TSYZqxdpgBW2tEyfuSSY54D4qSRkLmNkrrz4YFvdh2GM1gA8vSsnZPR73w==
-  dependencies:
-    "@algolia/cache-browser-local-storage" "4.23.3"
-    "@algolia/cache-common" "4.23.3"
-    "@algolia/cache-in-memory" "4.23.3"
-    "@algolia/client-common" "4.23.3"
-    "@algolia/client-search" "4.23.3"
-    "@algolia/logger-common" "4.23.3"
-    "@algolia/logger-console" "4.23.3"
-    "@algolia/requester-browser-xhr" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/requester-node-http" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-"@algolia/requester-browser-xhr@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.3.tgz#9e47e76f60d540acc8b27b4ebc7a80d1b41938b9"
-  integrity sha512-jDWGIQ96BhXbmONAQsasIpTYWslyjkiGu0Quydjlowe+ciqySpiDUrJHERIRfELE5+wFc7hc1Q5hqjGoV7yghw==
-  dependencies:
-    "@algolia/requester-common" "4.23.3"
-
-"@algolia/requester-common@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.3.tgz#7dbae896e41adfaaf1d1fa5f317f83a99afb04b3"
-  integrity sha512-xloIdr/bedtYEGcXCiF2muajyvRhwop4cMZo+K2qzNht0CMzlRkm8YsDdj5IaBhshqfgmBb3rTg4sL4/PpvLYw==
-
-"@algolia/requester-node-http@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.3.tgz#c9f94a5cb96a15f48cea338ab6ef16bbd0ff989f"
-  integrity sha512-zgu++8Uj03IWDEJM3fuNl34s746JnZOWn1Uz5taV1dFyJhVM/kTNw9Ik7YJWiUNHJQXcaD8IXD1eCb0nq/aByA==
-  dependencies:
-    "@algolia/requester-common" "4.23.3"
-
-"@algolia/transporter@4.23.3":
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.3.tgz#545b045b67db3850ddf0bbecbc6c84ff1f3398b7"
-  integrity sha512-Wjl5gttqnf/gQKJA+dafnD0Y6Yw97yvfY8R9h0dQltX1GXTgNs1zWgvtWW0tHl1EgMdhAyw189uWiZMnL3QebQ==
-  dependencies:
-    "@algolia/cache-common" "4.23.3"
-    "@algolia/logger-common" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-
-"@babel/parser@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
-  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
-
-"@docsearch/css@3.6.0", "@docsearch/css@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.6.0.tgz#0e9f56f704b3a34d044d15fd9962ebc1536ba4fb"
-  integrity sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ==
-
-"@docsearch/js@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.6.0.tgz#f9e46943449b9092d874944f7a80bcc071004cfb"
-  integrity sha512-QujhqINEElrkIfKwyyyTfbsfMAYCkylInLYMRqHy7PHc8xTBQCow73tlo/Kc7oIwBrCLf0P3YhjlOeV4v8hevQ==
-  dependencies:
-    "@docsearch/react" "3.6.0"
-    preact "^10.0.0"
-
-"@docsearch/react@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.6.0.tgz#b4f25228ecb7fc473741aefac592121e86dd2958"
-  integrity sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==
-  dependencies:
-    "@algolia/autocomplete-core" "1.9.3"
-    "@algolia/autocomplete-preset-algolia" "1.9.3"
-    "@docsearch/css" "3.6.0"
-    algoliasearch "^4.19.1"
-
-"@esbuild/aix-ppc64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
-  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
-
-"@esbuild/android-arm64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
-  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
-
-"@esbuild/android-arm@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
-  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
-
-"@esbuild/android-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
-  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
-
-"@esbuild/darwin-arm64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
-  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
-
-"@esbuild/darwin-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
-  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
-
-"@esbuild/freebsd-arm64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
-  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
-
-"@esbuild/freebsd-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
-  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
-
-"@esbuild/linux-arm64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
-  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
-
-"@esbuild/linux-arm@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
-  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
-
-"@esbuild/linux-ia32@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
-  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
-
-"@esbuild/linux-loong64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
-  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
-
-"@esbuild/linux-mips64el@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
-  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
-
-"@esbuild/linux-ppc64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
-  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
-
-"@esbuild/linux-riscv64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
-  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
-
-"@esbuild/linux-s390x@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
-  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
-
-"@esbuild/linux-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
-  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
-
-"@esbuild/netbsd-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
-  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
-
-"@esbuild/openbsd-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
-  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
-
-"@esbuild/sunos-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
-  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
-
-"@esbuild/win32-arm64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
-  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
-
-"@esbuild/win32-ia32@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
-  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
-
-"@esbuild/win32-x64@0.20.2":
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
-  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
-
-"@jridgewell/sourcemap-codec@^1.4.15":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@rollup/rollup-android-arm-eabi@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5"
-  integrity sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==
-
-"@rollup/rollup-android-arm64@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz#654ca1049189132ff602bfcf8df14c18da1f15fb"
-  integrity sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==
-
-"@rollup/rollup-darwin-arm64@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz#6d241d099d1518ef0c2205d96b3fa52e0fe1954b"
-  integrity sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==
-
-"@rollup/rollup-darwin-x64@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz#42bd19d292a57ee11734c980c4650de26b457791"
-  integrity sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz#f23555ee3d8fe941c5c5fd458cd22b65eb1c2232"
-  integrity sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==
-
-"@rollup/rollup-linux-arm-musleabihf@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz#f3bbd1ae2420f5539d40ac1fde2b38da67779baa"
-  integrity sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==
-
-"@rollup/rollup-linux-arm64-gnu@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz#7abe900120113e08a1f90afb84c7c28774054d15"
-  integrity sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==
-
-"@rollup/rollup-linux-arm64-musl@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz#9e655285c8175cd44f57d6a1e8e5dedfbba1d820"
-  integrity sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz#9a79ae6c9e9d8fe83d49e2712ecf4302db5bef5e"
-  integrity sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==
-
-"@rollup/rollup-linux-riscv64-gnu@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz#67ac70eca4ace8e2942fabca95164e8874ab8128"
-  integrity sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==
-
-"@rollup/rollup-linux-s390x-gnu@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz#9f883a7440f51a22ed7f99e1d070bd84ea5005fc"
-  integrity sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==
-
-"@rollup/rollup-linux-x64-gnu@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz#70116ae6c577fe367f58559e2cffb5641a1dd9d0"
-  integrity sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==
-
-"@rollup/rollup-linux-x64-musl@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz#f473f88219feb07b0b98b53a7923be716d1d182f"
-  integrity sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==
-
-"@rollup/rollup-win32-arm64-msvc@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz#4349482d17f5d1c58604d1c8900540d676f420e0"
-  integrity sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==
-
-"@rollup/rollup-win32-ia32-msvc@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz#a6fc39a15db618040ec3c2a24c1e26cb5f4d7422"
-  integrity sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==
-
-"@rollup/rollup-win32-x64-msvc@4.22.4":
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202"
-  integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==
-
-"@shikijs/core@1.3.0", "@shikijs/core@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.3.0.tgz#5b93b51ddb8def1e3a1543107f9b5b0540f716f6"
-  integrity sha512-7fedsBfuILDTBmrYZNFI8B6ATTxhQAasUHllHmjvSZPnoq4bULWoTpHwmuQvZ8Aq03/tAa2IGo6RXqWtHdWaCA==
-
-"@shikijs/transformers@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@shikijs/transformers/-/transformers-1.3.0.tgz#b03c5733ef61e25e4f53666bf11889f8876f34e9"
-  integrity sha512-3mlpg2I9CjhjE96dEWQOGeCWoPcyTov3s4aAsHmgvnTHa8MBknEnCQy8/xivJPSpD+olqOqIEoHnLfbNJK29AA==
-  dependencies:
-    shiki "1.3.0"
-
-"@types/estree@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/linkify-it@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.5.tgz#1e78a3ac2428e6d7e6c05c1665c242023a4601d8"
-  integrity sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==
-
-"@types/markdown-it@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.0.1.tgz#3d3fdf9dba83b69edececc070d39ec72b84270a7"
-  integrity sha512-6WfOG3jXR78DW8L5cTYCVVGAsIFZskRHCDo5tbqa+qtKVt4oDRVH7hyIWu1SpDQJlmIoEivNQZ5h+AGAOrgOtQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.5.tgz#3e0d2db570e9fb6ccb2dc8fde0be1d79ac810d39"
-  integrity sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==
-
-"@types/web-bluetooth@^0.0.20":
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
-  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
-
-"@vitejs/plugin-vue@^5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz#508d6a0f2440f86945835d903fcc0d95d1bb8a37"
-  integrity sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==
-
-"@vue/compiler-core@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.24.tgz#6b4a5ffddcd874a692f2acfa68981201bcd7096b"
-  integrity sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==
-  dependencies:
-    "@babel/parser" "^7.24.4"
-    "@vue/shared" "3.4.24"
-    entities "^4.5.0"
-    estree-walker "^2.0.2"
-    source-map-js "^1.2.0"
-
-"@vue/compiler-dom@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.24.tgz#b7335a49f095b6d35e48b6f7be8da513c1fa52b8"
-  integrity sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==
-  dependencies:
-    "@vue/compiler-core" "3.4.24"
-    "@vue/shared" "3.4.24"
-
-"@vue/compiler-sfc@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.24.tgz#2872e353147ce2a145169a33ddd4d68dc95c3a18"
-  integrity sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==
-  dependencies:
-    "@babel/parser" "^7.24.4"
-    "@vue/compiler-core" "3.4.24"
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/compiler-ssr" "3.4.24"
-    "@vue/shared" "3.4.24"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.10"
-    postcss "^8.4.38"
-    source-map-js "^1.2.0"
-
-"@vue/compiler-ssr@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.24.tgz#0d11fe54dabd17cbd6393a16bf7f785da1cfab46"
-  integrity sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==
-  dependencies:
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/shared" "3.4.24"
-
-"@vue/devtools-api@^7.0.27":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-7.1.2.tgz#8808b0f008842b756bf1e9c30788837abb62ab3a"
-  integrity sha512-AKd49cN3BdRgttmX5Aw8op7sx6jmaPwaILcDjaa05UKc1yIHDYST7P8yGZs6zd2pKFETAQz40gmyG7+b57slsQ==
-  dependencies:
-    "@vue/devtools-kit" "^7.1.2"
-
-"@vue/devtools-kit@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/devtools-kit/-/devtools-kit-7.1.2.tgz#dfb7306edf895dadc556dd5f0c516809c2f94826"
-  integrity sha512-UTrcUSOhlI9eXqbPMHUWwA6NQiiPT3onzXsVk2JHGR8ZFFSkzsWTTpHyVA1woG8zvgu2HNV/wigW2k87p858zw==
-  dependencies:
-    "@vue/devtools-shared" "^7.1.2"
-    hookable "^5.5.3"
-    mitt "^3.0.1"
-    perfect-debounce "^1.0.0"
-    speakingurl "^14.0.1"
-
-"@vue/devtools-shared@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/devtools-shared/-/devtools-shared-7.1.2.tgz#7b1c1de10bab4756f271c377370a62833b4ee94b"
-  integrity sha512-r9cUf93VMhKSsxF2/cBbf6Lm1nRBx+r1pRuji5CiAf3JIPYPOjeEqJ13OuwP1fauYh1tyBFcCxt3eJPvHT59gg==
-  dependencies:
-    rfdc "^1.3.1"
-
-"@vue/reactivity@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.24.tgz#150584316ca2acc4ed19a24f9f29863c3a17a7b2"
-  integrity sha512-nup3fSYg4i4LtNvu9slF/HF/0dkMQYfepUdORBcMSsankzRPzE7ypAFurpwyRBfU1i7Dn1kcwpYsE1wETSh91g==
-  dependencies:
-    "@vue/shared" "3.4.24"
-
-"@vue/runtime-core@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.24.tgz#066c544dc59a07a96c12874a57b750c239124874"
-  integrity sha512-c7iMfj6cJMeAG3s5yOn9Rc5D9e2/wIuaozmGf/ICGCY3KV5H7mbTVdvEkd4ZshTq7RUZqj2k7LMJWVx+EBiY1g==
-  dependencies:
-    "@vue/reactivity" "3.4.24"
-    "@vue/shared" "3.4.24"
-
-"@vue/runtime-dom@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.24.tgz#4f8e7acbe1e8ffa7c55af1366e4438729ebe9b20"
-  integrity sha512-uXKzuh/Emfad2Y7Qm0ABsLZZV6H3mAJ5ZVqmAOlrNQRf+T5mxpPGZBfec1hkP41t6h6FwF6RSGCs/gd8WbuySQ==
-  dependencies:
-    "@vue/runtime-core" "3.4.24"
-    "@vue/shared" "3.4.24"
-    csstype "^3.1.3"
-
-"@vue/server-renderer@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.24.tgz#80dd546f8d6a9f5c4f8b68083fe9cc2d62299332"
-  integrity sha512-H+DLK4sQF6sRgzKyofmlEVBIV/9KrQU6HIV7nt6yIwSGGKvSwlV8pqJlebUKLpbXaNHugdSfAbP6YmXF69lxow==
-  dependencies:
-    "@vue/compiler-ssr" "3.4.24"
-    "@vue/shared" "3.4.24"
-
-"@vue/shared@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.24.tgz#278ac71f492b392b9b17fe8fc7d324db1a8842db"
-  integrity sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==
-
-"@vueuse/core@10.9.0", "@vueuse/core@^10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.9.0.tgz#7d779a95cf0189de176fee63cee4ba44b3c85d64"
-  integrity sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==
-  dependencies:
-    "@types/web-bluetooth" "^0.0.20"
-    "@vueuse/metadata" "10.9.0"
-    "@vueuse/shared" "10.9.0"
-    vue-demi ">=0.14.7"
-
-"@vueuse/integrations@^10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/integrations/-/integrations-10.9.0.tgz#2b1a9556215ad3c1f96d39cbfbef102cf6e0ec05"
-  integrity sha512-acK+A01AYdWSvL4BZmCoJAcyHJ6EqhmkQEXbQLwev1MY7NBnS+hcEMx/BzVoR9zKI+UqEPMD9u6PsyAuiTRT4Q==
-  dependencies:
-    "@vueuse/core" "10.9.0"
-    "@vueuse/shared" "10.9.0"
-    vue-demi ">=0.14.7"
-
-"@vueuse/metadata@10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.9.0.tgz#769a1a9db65daac15cf98084cbf7819ed3758620"
-  integrity sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==
-
-"@vueuse/shared@10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.9.0.tgz#13af2a348de15d07b7be2fd0c7fc9853a69d8fe0"
-  integrity sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==
-  dependencies:
-    vue-demi ">=0.14.7"
-
-algoliasearch@^4.19.1:
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.3.tgz#e09011d0a3b0651444916a3e6bbcba064ec44b60"
-  integrity sha512-Le/3YgNvjW9zxIQMRhUHuhiUjAlKY/zsdZpfq4dlLqg6mEm0nL6yk+7f2hDOtLpxsgE4jSzDmvHL7nXdBp5feg==
-  dependencies:
-    "@algolia/cache-browser-local-storage" "4.23.3"
-    "@algolia/cache-common" "4.23.3"
-    "@algolia/cache-in-memory" "4.23.3"
-    "@algolia/client-account" "4.23.3"
-    "@algolia/client-analytics" "4.23.3"
-    "@algolia/client-common" "4.23.3"
-    "@algolia/client-personalization" "4.23.3"
-    "@algolia/client-search" "4.23.3"
-    "@algolia/logger-common" "4.23.3"
-    "@algolia/logger-console" "4.23.3"
-    "@algolia/recommend" "4.23.3"
-    "@algolia/requester-browser-xhr" "4.23.3"
-    "@algolia/requester-common" "4.23.3"
-    "@algolia/requester-node-http" "4.23.3"
-    "@algolia/transporter" "4.23.3"
-
-csstype@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
-
-entities@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-esbuild@^0.20.1:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
-  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.2"
-    "@esbuild/android-arm" "0.20.2"
-    "@esbuild/android-arm64" "0.20.2"
-    "@esbuild/android-x64" "0.20.2"
-    "@esbuild/darwin-arm64" "0.20.2"
-    "@esbuild/darwin-x64" "0.20.2"
-    "@esbuild/freebsd-arm64" "0.20.2"
-    "@esbuild/freebsd-x64" "0.20.2"
-    "@esbuild/linux-arm" "0.20.2"
-    "@esbuild/linux-arm64" "0.20.2"
-    "@esbuild/linux-ia32" "0.20.2"
-    "@esbuild/linux-loong64" "0.20.2"
-    "@esbuild/linux-mips64el" "0.20.2"
-    "@esbuild/linux-ppc64" "0.20.2"
-    "@esbuild/linux-riscv64" "0.20.2"
-    "@esbuild/linux-s390x" "0.20.2"
-    "@esbuild/linux-x64" "0.20.2"
-    "@esbuild/netbsd-x64" "0.20.2"
-    "@esbuild/openbsd-x64" "0.20.2"
-    "@esbuild/sunos-x64" "0.20.2"
-    "@esbuild/win32-arm64" "0.20.2"
-    "@esbuild/win32-ia32" "0.20.2"
-    "@esbuild/win32-x64" "0.20.2"
-
-estree-walker@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
-  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
-
-focus-trap@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.4.tgz#6c4e342fe1dae6add9c2aa332a6e7a0bbd495ba2"
-  integrity sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==
-  dependencies:
-    tabbable "^6.2.0"
-
-fsevents@~2.3.2, fsevents@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-hookable@^5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/hookable/-/hookable-5.5.3.tgz#6cfc358984a1ef991e2518cb9ed4a778bbd3215d"
-  integrity sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==
-
-magic-string@^0.30.10:
-  version "0.30.10"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.10.tgz#123d9c41a0cb5640c892b041d4cfb3bd0aa4b39e"
-  integrity sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.15"
-
-mark.js@8.11.1:
-  version "8.11.1"
-  resolved "https://registry.yarnpkg.com/mark.js/-/mark.js-8.11.1.tgz#180f1f9ebef8b0e638e4166ad52db879beb2ffc5"
-  integrity sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==
-
-minisearch@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/minisearch/-/minisearch-6.3.0.tgz#985a2f1ca3c73c2d65af94f0616bfe57164b0b6b"
-  integrity sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==
-
-mitt@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
-  integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
-
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-perfect-debounce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz#9c2e8bc30b169cc984a58b7d5b28049839591d2a"
-  integrity sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-postcss@^8.4.38:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.2.0"
-
-preact@^10.0.0:
-  version "10.20.2"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.20.2.tgz#0b343299a8c020562311cc25db93b3d832ec5e71"
-  integrity sha512-S1d1ernz3KQ+Y2awUxKakpfOg2CEmJmwOP+6igPx6dgr6pgDvenqYviyokWso2rhHvGtTlWWnJDa7RaPbQerTg==
-
-rfdc@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
-  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
-
-rollup@^4.13.0:
-  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f"
-  integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==
-  dependencies:
-    "@types/estree" "1.0.5"
-  optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.22.4"
-    "@rollup/rollup-android-arm64" "4.22.4"
-    "@rollup/rollup-darwin-arm64" "4.22.4"
-    "@rollup/rollup-darwin-x64" "4.22.4"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.22.4"
-    "@rollup/rollup-linux-arm-musleabihf" "4.22.4"
-    "@rollup/rollup-linux-arm64-gnu" "4.22.4"
-    "@rollup/rollup-linux-arm64-musl" "4.22.4"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.22.4"
-    "@rollup/rollup-linux-riscv64-gnu" "4.22.4"
-    "@rollup/rollup-linux-s390x-gnu" "4.22.4"
-    "@rollup/rollup-linux-x64-gnu" "4.22.4"
-    "@rollup/rollup-linux-x64-musl" "4.22.4"
-    "@rollup/rollup-win32-arm64-msvc" "4.22.4"
-    "@rollup/rollup-win32-ia32-msvc" "4.22.4"
-    "@rollup/rollup-win32-x64-msvc" "4.22.4"
-    fsevents "~2.3.2"
-
-shiki@1.3.0, shiki@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/shiki/-/shiki-1.3.0.tgz#3eda35cb49f6f0a98525e9da48fc072e6c655a3f"
-  integrity sha512-9aNdQy/etMXctnPzsje1h1XIGm9YfRcSksKOGqZWXA/qP9G18/8fpz5Bjpma8bOgz3tqIpjERAd6/lLjFyzoww==
-  dependencies:
-    "@shikijs/core" "1.3.0"
-
-source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
-
-speakingurl@^14.0.1:
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/speakingurl/-/speakingurl-14.0.1.tgz#f37ec8ddc4ab98e9600c1c9ec324a8c48d772a53"
-  integrity sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==
-
-tabbable@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
-  integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
-
-vite@^5.2.14, vite@^5.2.9:
-  version "5.2.14"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.14.tgz#fd5f60facf6b5f90ec7da6323c467a365d380c3d"
-  integrity sha512-TFQLuwWLPms+NBNlh0D9LZQ+HXW471COABxw/9TEUBrjuHMo9BrYBPrN/SYAwIuVL+rLerycxiLT41t4f5MZpA==
-  dependencies:
-    esbuild "^0.20.1"
-    postcss "^8.4.38"
-    rollup "^4.13.0"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
-vitepress-plugin-tabs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/vitepress-plugin-tabs/-/vitepress-plugin-tabs-0.5.0.tgz#2b193a72ed36b9fcd63e3907d3044fe7b6cf3e4e"
-  integrity sha512-SIhFWwGsUkTByfc2b279ray/E0Jt8vDTsM1LiHxmCOBAEMmvzIBZSuYYT1DpdDTiS3SuJieBheJkYnwCq/yD9A==
-
-vitepress@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-1.1.3.tgz#ded22392f5274680aaba8bb81dd4fb1c4741c02e"
-  integrity sha512-hGrIYN0w9IHWs0NQSnlMjKV/v/HLfD+Ywv5QdvCSkiT32mpNOOwUrZjnqZv/JL/WBPpUc94eghTUvmipxw0xrA==
-  dependencies:
-    "@docsearch/css" "^3.6.0"
-    "@docsearch/js" "^3.6.0"
-    "@shikijs/core" "^1.3.0"
-    "@shikijs/transformers" "^1.3.0"
-    "@types/markdown-it" "^14.0.1"
-    "@vitejs/plugin-vue" "^5.0.4"
-    "@vue/devtools-api" "^7.0.27"
-    "@vueuse/core" "^10.9.0"
-    "@vueuse/integrations" "^10.9.0"
-    focus-trap "^7.5.4"
-    mark.js "8.11.1"
-    minisearch "^6.3.0"
-    shiki "^1.3.0"
-    vite "^5.2.9"
-    vue "^3.4.23"
-
-vue-demi@>=0.14.7:
-  version "0.14.7"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.7.tgz#8317536b3ef74c5b09f268f7782e70194567d8f2"
-  integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==
-
-vue@^3.4.23, vue@^3.4.24:
-  version "3.4.24"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.24.tgz#f269549939a6c092480f018aa0bd886ba64f4c6f"
-  integrity sha512-NPdx7dLGyHmKHGRRU5bMRYVE+rechR+KDU5R2tSTNG36PuMwbfAJ+amEvOAw7BPfZp5sQulNELSLm5YUkau+Sg==
-  dependencies:
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/compiler-sfc" "3.4.24"
-    "@vue/runtime-dom" "3.4.24"
-    "@vue/server-renderer" "3.4.24"
-    "@vue/shared" "3.4.24"

builddefs/generic_features.mk

@@ -13,53 +13,38 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-GRAVE_ESC_ENABLE ?= yes
-MAGIC_ENABLE ?= yes
-SEND_STRING_ENABLE ?= yes
 SPACE_CADET_ENABLE ?= yes
+GRAVE_ESC_ENABLE ?= yes
 
 GENERIC_FEATURES = \
-    AUTO_SHIFT \
     AUTOCORRECT \
-    BOOTMAGIC \
     CAPS_WORD \
     COMBO \
     COMMAND \
-    CRC \
     DEFERRED_EXEC \
     DIGITIZER \
     DIP_SWITCH \
     DYNAMIC_KEYMAP \
     DYNAMIC_MACRO \
-    DYNAMIC_TAPPING_TERM \
     GRAVE_ESC \
     HAPTIC \
     KEY_LOCK \
     KEY_OVERRIDE \
     LEADER \
-    MAGIC \
-    MOUSEKEY \
-    MUSIC \
-    OS_DETECTION \
     PROGRAMMABLE_BUTTON \
-    REPEAT_KEY \
     SECURE \
-    SEND_STRING \
-    SEQUENCER \
     SPACE_CADET \
     SWAP_HANDS \
     TAP_DANCE \
-    TRI_LAYER \
-    VIA \
-    VIRTSER \
+    VELOCIKEY \
     WPM \
+    DYNAMIC_TAPPING_TERM \
+    TRI_LAYER
 
 define HANDLE_GENERIC_FEATURE
     # $$(info "Processing: $1_ENABLE $2.c")
     SRC += $$(wildcard $$(QUANTUM_DIR)/process_keycode/process_$2.c)
-    SRC += $$(wildcard $$(QUANTUM_DIR)/$2/$2.c)
     SRC += $$(wildcard $$(QUANTUM_DIR)/$2.c)
-    VPATH += $$(wildcard $$(QUANTUM_DIR)/$2/)
     OPT_DEFS += -D$1_ENABLE
 endef
 

builddefs/message.mk

@@ -91,6 +91,7 @@ MSG_AVAILABLE_KEYMAPS = $(eval $(call GENERATE_MSG_AVAILABLE_KEYMAPS))$(MSG_AVAI
 
 MSG_BOOTLOADER_NOT_FOUND_BASE = Bootloader not found. Make sure the board is in bootloader mode. See https://docs.qmk.fm/\#/newbs_flashing\n
 MSG_CHECK_FILESIZE = Checking file size of $(TARGET).$(FIRMWARE_FORMAT)
+MSG_CHECK_FILESIZE_SKIPPED = (Firmware size check does not yet support $(MCU_ORIG); skipping)
 MSG_FILE_TOO_BIG = $(ERROR_COLOR)The firmware is too large!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE) ($(OVER_SIZE) bytes over)\n
 MSG_FILE_TOO_SMALL = The firmware is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n
 MSG_FILE_JUST_RIGHT = The firmware size is fine - $(CURRENT_SIZE)/$(MAX_SIZE) ($(PERCENT_SIZE)%%, $(FREE_SIZE) bytes free)\n
@@ -103,10 +104,6 @@ MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) $(MSG_BOOTLOADER_NOT_
 BOOTLOADER_RETRY_TIME ?= 0.5
 MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
 
-define WARNING_MESSAGE
-    $(shell printf "\n %-99s $(WARN_STRING)\n" "$1" >&2)
-endef
-
 define CATASTROPHIC_ERROR
     $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
     $(error $1)

builddefs/show_options.mk

@@ -17,7 +17,7 @@ HARDWARE_OPTION_NAMES = \
   BACKLIGHT_ENABLE \
   BACKLIGHT_DRIVER \
   RGBLIGHT_ENABLE \
-  RGBLIGHT_DRIVER \
+  RGBLIGHT_CUSTOM_DRIVER \
   RGB_MATRIX_ENABLE \
   RGB_MATRIX_DRIVER \
   CIE1931_CURVE \
@@ -37,6 +37,7 @@ OTHER_OPTION_NAMES = \
   UNICODEMAP_ENABLE \
   UNICODE_COMMON \
   AUTO_SHIFT_ENABLE \
+  AUTO_SHIFT_MODIFIERS \
   DYNAMIC_TAPPING_TERM_ENABLE \
   COMBO_ENABLE \
   KEY_LOCK_ENABLE \
@@ -59,6 +60,8 @@ OTHER_OPTION_NAMES = \
   ENCODER_ENABLE_CUSTOM \
   GERMAN_ENABLE \
   HAPTIC_ENABLE \
+  HHKB_RN42_ENABLE \
+  ISSI_ENABLE \
   KEYLOGGER_ENABLE \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
@@ -82,8 +85,7 @@ OTHER_OPTION_NAMES = \
   SECURE_ENABLE \
   CAPS_WORD_ENABLE \
   AUTOCORRECT_ENABLE \
-  TRI_LAYER_ENABLE \
-  REPEAT_KEY_ENABLE
+  TRI_LAYER_ENABLE
 
 define NAME_ECHO
        @printf "  %-30s = %-16s # %s\\n" "$1" "$($1)" "$(origin $1)"

chibios_mcu.json

@@ -0,0 +1,41 @@
+{
+    "MKL26Z64" : {
+        "MCU" : "cortex-m0plus",
+        "ARMV": 6,
+        "MCU_FAMILY": "KINETIS",
+        "MCU_SERIES": "KL2x",
+        "MCU_LDSCRIPT": "MKL26Z64",
+        "MCU_STARTUP": "kl2x",
+        "BOARD": "PJRC_TEENSY_LC"
+    },
+    "MK20DX128" : {
+        "MCU" : "cortex-m4",
+        "ARMV": 7,
+        "MCU_FAMILY": "KINETIS",
+        "MCU_SERIES": "K20x",
+        "MCU_LDSCRIPT": "MK20DX128",
+        "MCU_STARTUP": "k20x5",
+        "BOARD": "PJRC_TEENSY_3"
+    },
+    "MK20DX256" : {
+        "MCU" : "cortex-m4",
+        "ARMV": 7,
+        "MCU_FAMILY": "KINETIS",
+        "MCU_SERIES": "K20x",
+        "MCU_LDSCRIPT": "MK20DX256",
+        "MCU_STARTUP": "k20x7",
+        "BOARD": "PJRC_TEENSY_3_1"
+    },
+    "STM32F303" : {
+        "MCU" : "cortex-m4",
+        "ARMV": 7,
+        "MCU_FAMILY": "STM32",
+        "MCU_SERIES": "STM32F3xx",
+        "MCU_LDSCRIPT": "STM32F303xC",
+        "MCU_STARTUP": "stm32f3xx",
+        "BOARD": "GENERIC_STM32_F303XC",
+        "USE_FPU": true,
+        "UF2_FAMILY": "STM32F3",
+        "STM32_BOOTLOADER_ADDRESS": "0x1FFFD800"
+    }
+}

cmake/AddKeyboard.cmake

@@ -0,0 +1,83 @@
+include(ResolveKeyboard)
+include(ValidateJson)
+include(ResolveToolchain)
+
+macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)  
+  # not entirely sure why this is necessary
+  # set(TEMP_PATH ${KEYBOARD_FOLDER})
+  # cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
+  # if(${IS_KEYBOARD_FOLDER_RELATIVE})
+  #   set(KEYBOARD_FOLDER_ABS ${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD_FOLDER})
+  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
+  #     # message(FATAL_ERROR "Keyboard does not exist in QMK - try using an absolute path to the keyboard folder")
+  #     resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+  #   endif()
+  # else()
+  #   set(KEYBOARD_FOLDER_ABS ${KEYBOARD_FOLDER})
+  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
+  #     message(FATAL_ERROR "Absolute path to keyboard does not exist")
+  #   endif()
+  # endif()
+ 
+  resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+
+  set(TEMP_PATH ${KEYBOARD_FOLDER})
+  cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
+  
+  set(TEMP_PATH ${KEYMAP_FOLDER})
+  cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
+  if(${IS_KEYMAP_FOLDER_RELATIVE})
+    set(KEYMAP_NAME ${KEYMAP_FOLDER})
+  else()
+    if(WIN32)
+      set(KEYMAP_NAME $ENV{USERNAME})
+    else()
+      set(KEYMAP_NAME $ENV{USE})
+    endif()
+  endif()
+
+  # find the right toolchain
+
+  # not sure we need to validate here
+  validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
+
+  string(JSON PROCESSOR GET ${JSON_STRING} processor)
+  resolve_toolchain(${PROCESSOR} TOOLCHAIN)
+
+  string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
+  if(${IS_KEYBOARD_FOLDER_RELATIVE})
+    string(MAKE_C_IDENTIFIER ${KEYBOARD_FOLDER} KEYBOARD_SLUG)
+  else()
+    string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
+  endif()
+  string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
+  set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
+  ExternalProject_Add(${TARGET_NAME}
+    SOURCE_DIR ${CMAKE_SOURCE_DIR}
+    # PREFIX ${CMAKE_SOURCE_DIR}/build/keyboards/${KEYBOARD_FOLDER}
+    TMP_DIR ${CMAKE_SOURCE_DIR}/build/tmp
+    DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/build/download
+    BINARY_DIR ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}
+    STAMP_DIR ${CMAKE_SOURCE_DIR}/build/stamp
+    LOG_DIR ${CMAKE_SOURCE_DIR}/build/log
+    INSTALL_DIR ${CMAKE_SOURCE_DIR}/build/install
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/${TARGET_NAME}${QMK_EXTENSION} ${CMAKE_SOURCE_DIR}/${TARGET_NAME}${QMK_EXTENSION}
+    # this seems to work well for all systems so far - not sure if it'd be useful to customize
+    CMAKE_GENERATOR "Unix Makefiles"
+    CMAKE_ARGS 
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${TOOLCHAIN}.cmake
+      -DQMK_KEYBOARD=${KEYBOARD_SLUG}
+      -DQMK_KEYBOARD_FOLDER=${KEYBOARD_FOLDER}
+      -DQMK_KEYMAP_FOLDER=${KEYMAP_FOLDER}
+      -DTARGET_NAME=${TARGET_NAME}
+  )
+  ExternalProject_Add_Step(${TARGET_NAME} copy_compile_commands
+    DEPENDEES configure
+    DEPENDERS build
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/keyboards/${TARGET_NAME}/compile_commands.json ${CMAKE_SOURCE_DIR}/compile_commands.json
+    # BYPRODUCTS ${CMAKE_SOURCE_DIR}/compile_commands.json
+    ALWAYS TRUE
+  )
+  
+# file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${KEYMAP_FOLDER}|${KEYBOARD_FOLDER}|Made by: ${MANUFACTURER}\n")
+endmacro(add_keyboard)

cmake/ConfigureKeyboard.cmake

@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+include(ResolveKeyboard)
+include(ValidateJSON)
+
+resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
+
+if(NOT DEFINED QMK_KEYMAP_FOLDER)
+    set(QMK_KEYMAP_FOLDER default)
+endif()
+
+set(TEMP_PATH ${QMK_KEYBOARD_FOLDER})
+cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
+
+set(TEMP_PATH ${QMK_KEYMAP_FOLDER})
+cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
+
+if(${IS_KEYMAP_FOLDER_RELATIVE})
+  set(KEYMAP_NAME ${QMK_KEYMAP_FOLDER})
+else()
+  if(WIN32)
+    set(KEYMAP_NAME $ENV{USERNAME})
+  else()
+    set(KEYMAP_NAME $ENV{USE})
+  endif()
+endif()  
+
+string(JSON KEYBOARD_NAME GET ${JSON_STRING} keyboard_name)
+
+if(${IS_KEYBOARD_FOLDER_RELATIVE})
+    string(MAKE_C_IDENTIFIER ${QMK_KEYBOARD_FOLDER} KEYBOARD_SLUG)
+else()
+    string(MAKE_C_IDENTIFIER ${KEYBOARD_NAME} KEYBOARD_SLUG)
+endif()
+
+string(JSON MANUFACTURER GET ${JSON_STRING} manufacturer)
+
+set(TARGET_NAME "${KEYBOARD_SLUG}_${KEYMAP_NAME}")
+file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${QMK_KEYMAP_FOLDER}|${QMK_KEYBOARD_FOLDER}:${QMK_KEYMAP_FOLDER}|Made by: ${MANUFACTURER}\n")
+
+message(STATUS "Added keyboard '${QMK_KEYBOARD_FOLDER}' with keymap '${QMK_KEYMAP_FOLDER}'")

cmake/FindARMToolchain.cmake

@@ -0,0 +1,14 @@
+macro(find_arm_toolchain)
+    find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
+
+    if(NOT TOOLCHAIN_ROOT)
+        include(GetARMToolchain)
+        find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
+    endif()
+
+    if(NOT TOOLCHAIN_ROOT)
+        message(FATAL_ERROR "ARM Toolchain could not be found")
+    endif()
+
+    message(STATUS "ARM toolchain found: ${TOOLCHAIN_ROOT}")
+endmacro()

cmake/FindAVRToolchain.cmake

@@ -0,0 +1,20 @@
+macro(find_avr_toolchain)
+    find_toolchain(avr TOOLCHAIN_ROOT)
+
+    if(NOT TOOLCHAIN_ROOT)
+        include(GetAVRToolchain)
+        find_toolchain(avr TOOLCHAIN_ROOT)
+    endif()
+
+    find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
+    if(${DFU_PROGRAMMER} STREQUAL "DFU_PROGRAMMER-NOTFOUND")
+        include(GetDfuProgrammer)
+        find_program(DFU_PROGRAMMER NAMES dfu-programmer PATHS ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/)
+    endif()
+
+    if(NOT TOOLCHAIN_ROOT)
+        message(FATAL_ERROR "AVR Toolchain could not be found")
+    endif()
+
+    message(STATUS "AVR toolchain found: ${TOOLCHAIN_ROOT}")
+endmacro()

cmake/Findchibios.cmake

@@ -0,0 +1,282 @@
+include(ParseMakefile)
+
+# STM32F303
+
+set(MCU "cortex-m4")
+set(ARMV 7)
+set(MCU_FAMILY "STM32")
+set(MCU_SERIES "STM32F3xx")
+string(TOUPPER ${MCU_SERIES} MCU_SERIES_UPPER)
+set(MCU_LDSCRIPT "STM32F303xC")
+set(MCU_STARTUP "stm32f3xx")
+set(BOARD "GENERIC_STM32_F303XC")
+set(USE_FPU TRUE)
+set(UF2_FAMILY "STM32F3")
+set(STM32_BOOTLOADER_ADDRESS 0x1FFFD800)
+set(EEPROM_DRIVER "wear_leveling" FORCE)
+set(WEAR_LEVELING_DRIVER "embedded_flash" FORCE)
+
+target_compile_definitions(qmk PUBLIC
+  QMK_MCU_FAMILY_${MCU_FAMILY}
+  QMK_MCU_SERIES_${MCU_SERIES_UPPER}
+)
+
+target_compile_options(qmk PUBLIC
+    -march=armv7-m
+)
+
+target_compile_definitions(qmk PUBLIC
+    MCU_${MCU_FAMILY}
+    __ARM_ARCH_7M__
+)
+
+# platforms/chibios/platform.mk
+
+if(NOT DEFINED USE_PROCESS_STACKSIZE)
+    set(USE_PROCESS_STACKSIZE 0x800)
+endif()
+
+if(NOT DEFINED USE_EXCEPTIONS_STACKSIZE)
+    set(USE_EXCEPTIONS_STACKSIZE 0x400)
+endif()
+
+target_link_options(qmk PUBLIC
+    -Wl,--defsym=__process_stack_size__=${USE_PROCESS_STACKSIZE},--defsym=__main_stack_size__=${USE_EXCEPTIONS_STACKSIZE}
+)
+
+if(NOT DEFINED MCU_PORT_NAME)
+    set(MCU_PORT_NAME ${MCU_FAMILY})
+endif()
+set(MCU_ARCH ${MCU})
+if(NOT DEFINED CHIBIOS_PORT)
+    set(CHIBIOS_PORT "ARMv${ARMV}-M")
+endif()
+if(NOT DEFINED PLATFORM_NAME)
+    set(PLATFORM_NAME platform)
+endif()
+
+set(CHIBIOS ${CMAKE_SOURCE_DIR}/lib/chibios)
+set(CHIBIOS_CONTRIB ${CMAKE_SOURCE_DIR}/lib/chibios-contrib)
+
+# port*.mk
+include(chibios/ports/${CHIBIOS_PORT})
+
+# platform.mk
+include(chibios/ports/${MCU_SERIES})
+
+# startup_*.mk - might need to convert these
+find_file(STARTUP_MK startup_${MCU_STARTUP}.mk
+    ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/mk
+    ${CHIBIOS}/os/common/startup/ARMCMx/compilers/GCC/mk
+    ${CHIBIOS_CONTRIB}/os/common/startup/ARMCMx/compilers/GCC/mk
+)
+get_filename_component(STARTUP_DIR ${STARTUP_MK} DIRECTORY)
+ParseMakefile(${STARTUP_MK})
+target_sources(qmk PUBLIC ${STARTUPSRC})
+target_sources(qmk PUBLIC ${STARTUPASM})
+target_include_directories(qmk PUBLIC ${STARTUPINC})
+
+# board paths - we should just standardize these
+find_path(BOARD_PATH
+NAMES 
+    boards/${BOARD}/board.mk 
+    board/board.mk
+PATHS
+    ${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}
+    ${CHIBIOS}/os/hal/
+    ${CHIBIOS_CONTRIB}/os/hal/
+)
+# if(EXISTS ${BOARD_PATH}/rules.mk)
+#     ParseMakefile(${BOARD_PATH}/rules.mk)
+# endif()
+
+if(EXISTS ${BOARD_PATH}/configs/config.h)
+target_precompile_headers(qmk PUBLIC
+    ${BOARD_PATH}/configs/config.h
+)
+endif()
+
+if(EXISTS ${BOARD_PATH}/configs/post_config.h)
+    target_precompile_headers(qmk PUBLIC
+        ${BOARD_PATH}/configs/post_config.h
+    )
+endif()
+
+find_file(BOARD_MK board.mk
+    ${BOARD_PATH}/boards/${BOARD}
+    ${BOARD_PATH}/board
+)
+ParseMakefile(${BOARD_MK})
+
+target_sources(qmk PUBLIC ${BOARDSRC})
+target_include_directories(qmk PUBLIC ${BOARDINC})
+
+# allow board.c to be overriden
+file(RELATIVE_PATH INIT_HOOK_RELATIVE ${CMAKE_BINARY_DIR}
+    "${CMAKE_SOURCE_DIR}/tmk_core/protocol/chibios/init_hooks.h")
+set_source_files_properties(${BOARDSRC} TARGET_DIRECTORY qmk PROPERTIES 
+    # COMPILE_OPTIONS "-include ../../../tmk_core/protocol/chibios/init_hooks.h"
+    COMPILE_OPTIONS "-include ${INIT_HOOK_RELATIVE}"
+)
+
+# bootloader
+if(DEFINED STM32_BOOTLOADER_ADDRESS)
+    target_compile_definitions(qmk PUBLIC STM32_BOOTLOADER_ADDRESS=${STM32_BOOTLOADER_ADDRESS})
+endif()
+if(DEFINED WB32_BOOTLOADER_ADDRESS)
+    target_compile_definitions(qmk PUBLIC WB32_BOOTLOADER_ADDRESS=${WB32_BOOTLOADER_ADDRESS})
+endif()
+
+find_file(BOOTLOADER_DEFS_H bootloader_defs.h
+    ${QMK_KEYBOARD_FOLDER}
+    ${QMK_KEYBOARD_FOLDER}/boards/${BOARD}
+    ${BOARD_PATH}/configs
+)
+if(EXISTS ${BOOTLOADER_DEFS_H})
+    target_compile_options(qmk PUBLIC -include ${BOOTLOADER_DEFS_H})
+endif()
+
+# chconf directories
+find_path(CHCONFDIR chconf.h
+    ${QMK_KEYBOARD_FOLDER}
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
+)
+target_include_directories(qmk PUBLIC ${CHCONFDIR})
+
+# halconf directories
+find_path(HALCONFDIR halconf.h
+    ${QMK_KEYBOARD_FOLDER}
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/configs
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/configs
+)
+target_include_directories(qmk PUBLIC ${HALCONFDIR})
+
+# linker script
+find_file(LDSCRIPT ${MCU_LDSCRIPT}.ld
+    ${QMK_KEYBOARD_FOLDER}/ld
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/${BOARD}/ld
+    ${CMAKE_SOURCE_DIR}/platforms/chibios/boards/common/ld
+    ${STARTUPLD}
+    ${STARTUPLD_CONTRIB}
+)
+get_filename_component(LDSCRIPT_PATH ${LDSCRIPT} DIRECTORY)
+target_link_options(qmk PUBLIC
+    -T ${LDSCRIPT}
+    -L ${LDSCRIPT_PATH}
+)
+
+# os/hal/hal.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/src/hal.c
+    ${CHIBIOS}/os/hal/src/hal_st.c
+    ${CHIBIOS}/os/hal/src/hal_buffers.c
+    ${CHIBIOS}/os/hal/src/hal_queues.c
+    ${CHIBIOS}/os/hal/src/hal_flash.c
+    ${CHIBIOS}/os/hal/src/hal_mmcsd.c
+    ${CHIBIOS}/os/hal/src/hal_adc.c
+    ${CHIBIOS}/os/hal/src/hal_can.c
+    ${CHIBIOS}/os/hal/src/hal_crypto.c
+    ${CHIBIOS}/os/hal/src/hal_dac.c
+    ${CHIBIOS}/os/hal/src/hal_efl.c
+    ${CHIBIOS}/os/hal/src/hal_gpt.c
+    ${CHIBIOS}/os/hal/src/hal_i2c.c
+    ${CHIBIOS}/os/hal/src/hal_i2s.c
+    ${CHIBIOS}/os/hal/src/hal_icu.c
+    ${CHIBIOS}/os/hal/src/hal_mac.c
+    ${CHIBIOS}/os/hal/src/hal_mmc_spi.c
+    ${CHIBIOS}/os/hal/src/hal_pal.c
+    ${CHIBIOS}/os/hal/src/hal_pwm.c
+    ${CHIBIOS}/os/hal/src/hal_rtc.c
+    ${CHIBIOS}/os/hal/src/hal_sdc.c
+    ${CHIBIOS}/os/hal/src/hal_serial.c
+    ${CHIBIOS}/os/hal/src/hal_serial_usb.c
+    ${CHIBIOS}/os/hal/src/hal_sio.c
+    ${CHIBIOS}/os/hal/src/hal_spi.c
+    ${CHIBIOS}/os/hal/src/hal_trng.c
+    ${CHIBIOS}/os/hal/src/hal_uart.c
+    ${CHIBIOS}/os/hal/src/hal_usb.c
+    ${CHIBIOS}/os/hal/src/hal_wdg.c
+    ${CHIBIOS}/os/hal/src/hal_wspi.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/include
+)
+
+# os/hal/osal/rt-nil/osal.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/osal/rt-nil/osal.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/osal/rt-nil
+)
+
+# os/rt/rt.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/rt/src/chsys.c
+    ${CHIBIOS}/os/rt/src/chrfcu.c
+    ${CHIBIOS}/os/rt/src/chdebug.c
+    ${CHIBIOS}/os/rt/src/chtrace.c
+    ${CHIBIOS}/os/rt/src/chvt.c
+    ${CHIBIOS}/os/rt/src/chschd.c
+    ${CHIBIOS}/os/rt/src/chinstances.c
+    ${CHIBIOS}/os/rt/src/chthreads.c
+    ${CHIBIOS}/os/rt/src/chsys.c
+    ${CHIBIOS}/os/rt/src/chrfcu.c
+    ${CHIBIOS}/os/rt/src/chdebug.c
+    ${CHIBIOS}/os/rt/src/chtrace.c
+    ${CHIBIOS}/os/rt/src/chvt.c
+    ${CHIBIOS}/os/rt/src/chschd.c
+    ${CHIBIOS}/os/rt/src/chinstances.c
+    ${CHIBIOS}/os/rt/src/chthreads.c
+    ${CHIBIOS}/os/rt/src/chtm.c
+    ${CHIBIOS}/os/rt/src/chstats.c
+    ${CHIBIOS}/os/rt/src/chregistry.c
+    ${CHIBIOS}/os/rt/src/chsem.c
+    ${CHIBIOS}/os/rt/src/chmtx.c
+    ${CHIBIOS}/os/rt/src/chcond.c
+    ${CHIBIOS}/os/rt/src/chevents.c
+    ${CHIBIOS}/os/rt/src/chmsg.c
+    ${CHIBIOS}/os/rt/src/chdynamic.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/rt/include
+)
+
+# os/oslib/oslib.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/oslib/src/chmboxes.c
+    ${CHIBIOS}/os/oslib/src/chmemcore.c
+    ${CHIBIOS}/os/oslib/src/chmemheaps.c
+    ${CHIBIOS}/os/oslib/src/chmempools.c
+    ${CHIBIOS}/os/oslib/src/chpipes.c
+    ${CHIBIOS}/os/oslib/src/chobjcaches.c
+    ${CHIBIOS}/os/oslib/src/chdelegates.c
+    ${CHIBIOS}/os/oslib/src/chfactory.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/oslib/include
+)
+
+# os/hal/lib/streams/streams.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/lib/streams/chprintf.c
+    ${CHIBIOS}/os/hal/lib/streams/chscanf.c
+    ${CHIBIOS}/os/hal/lib/streams/memstreams.c
+    ${CHIBIOS}/os/hal/lib/streams/nullstreams.c
+    ${CHIBIOS}/os/hal/lib/streams/bufstreams.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/lib/streams
+)
+
+# resume platform.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/various/syscalls.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/license
+    ${CHIBIOS}/os/oslib/include
+    ${CHIBIOS}/os/various
+)

cmake/Findlufa.cmake

@@ -0,0 +1,27 @@
+include(UpdateSubmodule)
+update_submodule(lib/lufa)
+set(LUFA_PATH ${CMAKE_SOURCE_DIR}/lib/lufa)
+set(LUFA_ROOT_PATH ${LUFA_PATH}/LUFA)
+target_sources(qmk PUBLIC
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBController_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBInterrupt_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/ConfigDescriptors.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/Events.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/USBTask.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Class/Common/HIDParser.c
+
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Host_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Pipe_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/PipeStream_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/HostStandardReq.c
+
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Device_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Endpoint_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/EndpointStream_${ARCH}.c
+    ${LUFA_ROOT_PATH}/Drivers/USB/Core/DeviceStandardReq.c
+    ${LUFA_PATH}/LUFA/Drivers/USB/USB.h
+)
+target_include_directories(qmk PUBLIC ${LUFA_PATH})
+# target_link_libraries(lufa ${QMK_TARGET})
+# target_link_libraries(lufa tmk_core_protocol)
+# target_link_libraries(lufa tmk_core_protocol_lufa)

cmake/GetARMToolchain.cmake

@@ -0,0 +1,24 @@
+message("Downloading gcc-arm-none-eabi")
+if(WIN32)
+file(DOWNLOAD
+    https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-win32.zip?rev=8f4a92e2ec2040f89912f372a55d8cf3&hash=8A9EAF77EF1957B779C59EADDBF2DAC118170BBF
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
+    EXPECTED_HASH MD5=2bc8f0c4c4659f8259c8176223eeafc1
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-win32.zip
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
+)
+elseif(UNIX)
+file(DOWNLOAD
+    https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2?rev=78196d3461ba4c9089a67b5f33edf82a&hash=D484B37FF37D6FC3597EBE2877FB666A41D5253B
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
+    EXPECTED_HASH MD5=3fe3d8bb693bd0a6e4615b6569443d0d
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/gcc-arm-none-eabi-x86_64-linux.tar.bz2
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
+)
+endif()

cmake/GetAVRToolchain.cmake

@@ -0,0 +1,24 @@
+message("Downloading avr-gcc")
+if(WIN32)
+file(DOWNLOAD
+    https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-windows.zip
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
+    EXPECTED_HASH SHA256=e921a964fdeaedbe963352d0f26c6520a0a3eb8effc6ff232f3824b06c4ea0e2
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-windows.zip
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
+)
+elseif(UNIX)
+file(DOWNLOAD
+    https://github.com/ZakKemble/avr-gcc-build/releases/download/v12.1.0-1/avr-gcc-12.1.0-x64-linux.tar.bz2
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
+    EXPECTED_HASH SHA256=feb034f4b85237032da8bac1f03765af5ebc4a8939b69bed57ff31bc482ca1a6
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/avr-gcc-x64-linux.tar.bz2
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/
+)
+endif()

cmake/GetDfuProgrammer.cmake

@@ -0,0 +1,22 @@
+message("Downloading dfu-programmer")
+if(WIN32)
+file(DOWNLOAD
+    https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-x64-1.0.0.7z
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-x64-1.0.0.7z
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
+)
+elseif(UNIX)
+file(DOWNLOAD
+    https://github.com/dfu-programmer/dfu-programmer/releases/download/v1.0.0/dfu-programmer-linux-1.0.0.7z
+    ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
+    SHOW_PROGRESS
+)
+file(ARCHIVE_EXTRACT
+    INPUT ${CMAKE_SOURCE_DIR}/toolchains/downloads/dfu-programmer-linux-1.0.0.7z
+    DESTINATION ${CMAKE_SOURCE_DIR}/toolchains/dfu-programmer/
+)
+endif()

cmake/GetKeymaps.cmake

@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+include(ResolveKeyboard)
+include(ValidateJson)
+
+set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
+set(CMAKE_MESSAGE_INDENT "")
+
+resolve_keyboard(${QMK_KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STR)
+cmake_path(IS_PREFIX QMK_KEYBOARDS_FOLDER "${KEYBOARD_FOLDER_ABS}" IS_KEYBOARDS_FOLDER)
+
+file(WRITE "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "")
+if(${IS_KEYBOARDS_FOLDER})
+    file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
+    while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
+        file(GLOB KEYMAPS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/*/keymap.c")
+        foreach(KEYMAP ${KEYMAPS})
+            file(RELATIVE_PATH KEYMAP_C "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps" "${KEYMAP}")
+            get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
+            # message(STATUS "${KEYMAP_FOLDER}")
+            file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
+        endforeach()
+        get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
+    endwhile()
+else()
+    if(EXISTS "${KEYBOARD_FOLDER_ABS}/keymap.c")
+        set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymap.c" PARENT_SCOPE)
+    elseif(EXISTS "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c")
+        set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
+    endif()
+endif()
+
+string(JSON COMMUNITY_LAYOUTS ERROR_VARIABLE NO_COMMUNITY_LAYOUTS GET ${JSON_STR} community_layouts)
+
+if(${NO_COMMUNITY_LAYOUTS} STREQUAL "NOTFOUND")
+    string(JSON NUM_LAYOUTS LENGTH ${COMMUNITY_LAYOUTS})
+    math(EXPR MAX "${NUM_LAYOUTS} - 1")
+    foreach(IDX RANGE ${MAX})
+        string(JSON LAYOUT GET ${COMMUNITY_LAYOUTS} ${IDX})
+        file(GLOB KEYMAPS "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/*/keymap.c")
+        foreach(KEYMAP ${KEYMAPS})
+            file(RELATIVE_PATH KEYMAP_C "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}" "${KEYMAP}")
+            get_filename_component(KEYMAP_FOLDER ${KEYMAP_C} DIRECTORY)
+            # message(STATUS "${KEYMAP_FOLDER}")
+            file(APPEND "${CMAKE_SOURCE_DIR}/build/keyboard_keymaps" "${KEYMAP_FOLDER}\n")
+        endforeach()
+    endforeach()
+endif()

cmake/ParseHeader.cmake

@@ -0,0 +1,64 @@
+# Simple CMake utility to read variables from MK files
+# - Gets contents from given file (name or path)
+# - Parses the assignment statements
+# - Makes the same assignments in the PARENT_SCOPE
+
+if(POLICY CMP0007)
+    cmake_policy(SET CMP0007 NEW)
+endif()
+
+function(ParseHeader HeaderFile Prefix)
+    _ParseHeader(${HeaderFile} ${Prefix})
+endfunction()
+
+macro(_ParseHeader HeaderFile Prefix)
+    message(CHECK_START "Parsing Header")
+    list(APPEND CMAKE_MESSAGE_INDENT "  ")
+    message(STATUS "Reading \"${HeaderFile}\"")
+
+    file(READ "${HeaderFile}" FileContents)
+    string(REGEX REPLACE "/\\*.*\\*/" "" FileContents ${FileContents})
+    # replace the \ newlines with spaces
+    string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
+    # turn each line into an item in a list
+    string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
+    list(REMOVE_ITEM FileLines "")
+
+    foreach(line ${FileLines})
+        # remove comments from the ends of each line
+        string(REGEX REPLACE "//.*" "" line ${line})
+
+        # remove now-empty lines
+        if("${line}" STREQUAL "")
+            continue()
+        endif()
+
+        # try to process includes, if the file exists
+        if(line MATCHES "^#include \"(.+)\"")
+            set(INCLUDED_HEADER ${CMAKE_MATCH_1})
+            if(EXISTS ${INCLUDED_HEADER})
+                _ParseHeader("${INCLUDED_HEADER}" ${Prefix})
+            else()
+                message(STATUS "Could not read ${INCLUDED_HEADER}")
+            endif()
+            continue()
+        endif()
+        
+        # array
+        if(line MATCHES "#define ([A-Za-z0-9_]+) {(.*)}")
+            set(VARIABLE_NAME ${CMAKE_MATCH_1})
+            set(VARIABLE_VALUE ${CMAKE_MATCH_2})
+            set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
+        endif()
+
+        # regular variable
+        if(line MATCHES "#define ([A-Za-z0-9_]+) (.*)")
+            set(VARIABLE_NAME ${CMAKE_MATCH_1})
+            set(VARIABLE_VALUE ${CMAKE_MATCH_2})
+            set(${Prefix}${VARIABLE_NAME} ${VARIABLE_VALUE})
+        endif()
+    endforeach()
+
+    list(POP_BACK CMAKE_MESSAGE_INDENT)
+    message(CHECK_PASS "Complete")
+endmacro()

cmake/ParseMakefile.cmake

@@ -0,0 +1,98 @@
+# Simple CMake utility to read variables from MK files
+# - Gets contents from given file (name or path)
+# - Parses the assignment statements
+# - Makes the same assignments in the PARENT_SCOPE
+
+if(POLICY CMP0007)
+    cmake_policy(SET CMP0007 NEW)
+endif()
+
+function(ParseMakefile MKFile)
+    _ParseMakefile(${MKFile} ${ARGN})
+endfunction()
+
+macro(_ParseMakefile MKFile)
+    message(CHECK_START "Parsing Makefile")
+    list(APPEND CMAKE_MESSAGE_INDENT "  ")
+    message(STATUS "Reading \"${MKFile}\"")
+
+    file(READ "${MKFile}" FileContents)
+    # replace the \ newlines with spaces
+    string(REGEX REPLACE "\\\\\r?\n *" " " FileContents ${FileContents})
+    # turn each line into an item in a list
+    string(REGEX REPLACE "\r?\n" ";" FileLines ${FileContents})
+    list(REMOVE_ITEM FileLines "")
+
+    foreach(line ${FileLines})
+        # remove comments from the ends of each line
+        string(REGEX REPLACE "#.*" "" line ${line})
+
+        # remove now-empty lines
+        if("${line}" STREQUAL "")
+            continue()
+        endif()
+
+        # try to process includes, if the file exists
+        if(line MATCHES "^-?include (.+)$")
+            set(MAKE_CHILD ${CMAKE_MATCH_1})
+            if(EXISTS ${MAKE_CHILD})
+                _ParseMakefile("${MAKE_CHILD}" ${ARGN})
+            else()
+                message(STATUS "Could not read ${MAKE_CHILD}")
+            endif()
+            continue()
+        endif()
+
+        # turn the assignment into a list with the first item being the variable name
+        string(REPLACE "=" ";" line_split ${line})
+        list(LENGTH line_split count)
+
+        if(count LESS 2)
+            message(STATUS "Skipping ${line}")
+            continue()
+        endif()
+
+        list(GET line_split -1 value)
+        string(STRIP ${value} value)
+        # separate_arguments(value)
+        # string(REPLACE " " ";" value ${value})
+        list(REMOVE_AT line_split -1)
+
+        foreach(var_name ${line_split})
+            string(STRIP ${var_name} var_name)
+            # replace $(?) with the variable ? from cmake
+            if(value MATCHES "\\$\\(([^\\(\\)]+)\\)")
+                set(MAKE_VARIABLE "${CMAKE_MATCH_1}")
+                string(REPLACE "$(${MAKE_VARIABLE})" "${${MAKE_VARIABLE}}" value ${value})
+            endif()
+
+            # look for +, assuming it used to be +=
+            if(${var_name} MATCHES "([^ \\+]+) *\\+")
+                message(STATUS "Appending \"${CMAKE_MATCH_1}\" with \"${value}\"")
+                # read parent variable in local & append
+                set(LOCAL_${CMAKE_MATCH_1} ${CMAKE_MATCH_1})
+                # APPEND accepts spaces between values
+                list(APPEND LOCAL_${CMAKE_MATCH_1} ${value})
+                set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}})
+                set(${CMAKE_MATCH_1} ${LOCAL_${CMAKE_MATCH_1}} PARENT_SCOPE)
+            else()
+                # set needs ; between elements to be considered a list
+                string(REGEX REPLACE " +" ";" value ${value})
+                # try to find variable in cache and FORCE wtih INTERNAL if it exists
+                if(DEFINED CACHE${${var_name}})
+                    message(STATUS "Caching \"${var_name}\" to \"${value}\"")
+                    # set locally so replacement still work
+                    set(${var_name} ${value})
+                    set(${var_name} ${value} CACHE INTERNAL "")
+                else()
+                    message(STATUS "Setting \"${var_name}\" to \"${value}\"")
+                    set(${var_name} ${value})
+                    set(${var_name} ${value} PARENT_SCOPE)
+                endif()
+            endif()
+        endforeach()
+    endforeach()
+
+    list(POP_BACK CMAKE_MESSAGE_INDENT)
+    message(CHECK_PASS "Complete")
+endmacro()

cmake/ProcessKeyboard.cmake

@@ -0,0 +1,78 @@
+include(ParseMakefile)
+include(Utils)
+
+macro(process_keyboard)
+    message(CHECK_START "Processing keyboard")
+    list(APPEND CMAKE_MESSAGE_INDENT "  ")
+
+    validate_json(${QMK_KEYBOARD_FOLDER_ABS}/info.json keyboard QMK_KEYBOARD_INFO_JSON_STRING)
+
+    # process rules from info.json
+    file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_rules.hjson JSON_STRING)
+    string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
+    math(EXPR MAX "${MAPPING_LENGTH} - 1")
+    foreach(IDX RANGE ${MAX})
+        string(JSON RULE_KEY MEMBER ${JSON_STRING} ${IDX})
+        # string(JSON INFO_KEY GET ${JSON_STRING} ${RULE_KEY} info_key)
+        json_get_with_default(INFO_KEY ${JSON_STRING} _ ${RULE_KEY} info_key)
+        string(REPLACE "." " " INFO_KEYS ${INFO_KEY})
+        string(JSON RULE_VALUE ERROR_VARIABLE RULE_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
+        if(${RULE_KEY_NOT_FOUND} STREQUAL "NOTFOUND")
+            json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${RULE_KEY} value_type)
+            if(${VALUE_TYPE} STREQUAL "list")
+                string(JSON NUM_VALUES LENGTH ${RULE_VALUE})
+                math(EXPR MAX "${NUM_VALUES} - 1")
+                foreach(IDX RANGE ${MAX})
+                    string(JSON VALUE GET ${RULE_VALUE} ${IDX})
+                    list(APPEND ${RULE_KEY} ${VALUE})
+                endforeach()
+                message(STATUS "Found rule '${INFO_KEY}': '${${RULE_KEY}}' assigned to '${RULE_KEY}'")
+            else()
+                set(${RULE_KEY} ${RULE_VALUE})
+                message(STATUS "Found rule '${INFO_KEY}': '${RULE_VALUE}' assigned to '${RULE_KEY}'")
+            endif()
+        endif()
+    endforeach()
+
+    # process definitions from info.json
+    file(READ ${CMAKE_SOURCE_DIR}/data/mappings/info_config.hjson JSON_STRING)
+    string(JSON MAPPING_LENGTH LENGTH ${JSON_STRING})
+    math(EXPR MAX "${MAPPING_LENGTH} - 1")
+    foreach(IDX RANGE ${MAX})
+        string(JSON CONFIG_KEY MEMBER ${JSON_STRING} ${IDX})
+        json_get_with_default(INFO_KEY ${JSON_STRING} _ ${CONFIG_KEY} info_key)
+        string(REPLACE "." ";" INFO_KEYS ${INFO_KEY})
+        # string(JSON CONFIG_VALUE ERROR_VARIABLE CONFIG_KEY_NOT_FOUND GET ${QMK_KEYBOARD_INFO_JSON_STRING} ${INFO_KEYS})
+        json_get_with_default(CONFIG_VALUE ${QMK_KEYBOARD_INFO_JSON_STRING} NOTFOUND ${INFO_KEYS})
+        if(NOT CONFIG_VALUE STREQUAL "NOTFOUND")
+            set(${CONFIG_KEY} ${CONFIG_VALUE})
+            json_get_with_default(VALUE_TYPE ${JSON_STRING} raw ${CONFIG_KEY} value_type)
+            if(${VALUE_TYPE} STREQUAL "str")
+                add_compile_definitions(${CONFIG_KEY}="${CONFIG_VALUE}")
+                message(STATUS "Found definition '${INFO_KEY}': '\"${CONFIG_VALUE}\"' assigned to '${CONFIG_KEY}'")
+            elseif(${VALUE_TYPE} STREQUAL "bcd_version")
+                string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSION_MATCH ${CONFIG_VALUE})
+                set(VERSION_MAJOR ${CMAKE_MATCH_1})
+                set(VERSION_MINOR ${CMAKE_MATCH_2})
+                set(VERSION_PATCH ${CMAKE_MATCH_3})
+                math(EXPR BCD_VERSION "${VERSION_MAJOR} * 10000 + ${VERSION_MINOR} * 100 + ${VERSION_PATCH}" OUTPUT_FORMAT HEXADECIMAL)
+                add_compile_definitions(${CONFIG_KEY}=${BCD_VERSION})
+                message(STATUS "Found definition '${INFO_KEY}': '${BCD_VERSION}' assigned to '${CONFIG_KEY}'")
+            else()
+                add_compile_definitions(${CONFIG_KEY}=${CONFIG_VALUE})
+                message(STATUS "Found definition '${INFO_KEY}': '${CONFIG_VALUE}' assigned to '${CONFIG_KEY}'")
+            endif()
+        endif()
+    endforeach()
+
+    string(JSON KEYBOARD_NAME GET ${QMK_KEYBOARD_INFO_JSON_STRING} keyboard_name)
+    string(JSON MANUFACTURER GET ${QMK_KEYBOARD_INFO_JSON_STRING} manufacturer)
+    string(JSON URL GET ${QMK_KEYBOARD_INFO_JSON_STRING} url)
+    string(JSON QMK_MCU GET ${QMK_KEYBOARD_INFO_JSON_STRING} processor)
+
+    list(POP_BACK CMAKE_MESSAGE_INDENT)
+    message(CHECK_PASS "info.json validated and loaded")
+
+
+    ParseMakefile(${QMK_KEYBOARD_FOLDER_ABS}/rules.mk)
+endmacro()

cmake/ResolveKeyboard.cmake

@@ -0,0 +1,146 @@
+include(Utils)
+
+function(resolve_keyboard KEYBOARD KEYBOAD_FOLDER_ABS_STR)
+    message(VERBOSE "Resolving ${KEYBOARD}")
+    if(EXISTS "${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD}")
+        message(VERBOSE "Found in repo: ${KEYBOARD}")
+        set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD}" PARENT_SCOPE)
+        return()
+    endif()
+    if(EXISTS "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}")
+        message(VERBOSE "Already checked out: ${KEYBOARD}")
+        set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}" PARENT_SCOPE)
+        return()
+    endif()
+    file(READ ${CMAKE_SOURCE_DIR}/data/keyboards.json KEYBOARDS_JSON)
+    string(JSON KEYBOARD_SLUG ERROR_VARIABLE JSON_ERROR GET ${KEYBOARDS_JSON} ${KEYBOARD})
+    if(${JSON_ERROR} STREQUAL "NOTFOUND")
+        message(VERBOSE "Found ${KEYBOARD_SLUG}")
+        if(${KEYBOARD_SLUG} MATCHES "^@([0-9a-zA-Z_]+/[0-9a-zA-Z_]+)")
+            # keyboard slug is mapped to a github repo
+            set(GIT_SLUG ${CMAKE_MATCH_1})
+            # string(MAKE_C_IDENTIFIER ${KEYBOARD} KEYBOARD_NAME)
+            message(VERBOSE "Cloning ${GIT_SLUG}")
+            find_package(Git QUIET)
+            if(GIT_FOUND)
+                file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}")
+                execute_process(COMMAND ${GIT_EXECUTABLE} clone "https://github.com/${GIT_SLUG}.git" .
+                                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}"
+                                RESULT_VARIABLE GIT_SUBMOD_RESULT)
+                if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+                    message(FATAL_ERROR "git clone failed with ${GIT_SUBMOD_RESULT}")
+                endif()
+            else()
+                message("Git not found - skipping submodule update")
+            endif()
+            set(${KEYBOAD_FOLDER_ABS_STR} "${CMAKE_SOURCE_DIR}/build/keyboard_repository/${KEYBOARD}" PARENT_SCOPE)
+        else()
+            message(FATAL_ERROR "Didn't match")
+        endif()
+    else()
+        message(FATAL_ERROR "Couldn't find")
+        # set(${RESULT_STR} "NOTFOUND" PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(resolve_config_h KEYBOARD_FOLDER_ABS CONFIG_H_STR)
+    set(${CONFIG_H_STR} PARENT_SCOPE)
+    if(${IS_KEYBOARDS_FOLDER})
+        file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
+        # get the deepest config.h
+        while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
+            if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h")
+                parent_list(PREPEND ${CONFIG_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h")
+                # set(${CONFIG_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/config.h" PARENT_SCOPE)
+                # return()
+            endif()
+            get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
+        endwhile()
+        # message(FATAL_ERROR "Could not find config.h in ${KEYBOARD_FOLDER_ABS}")
+    else()
+        if(EXISTS "${KEYBOARD_FOLDER_ABS}/config.h")
+            set(${CONFIG_H_STR} "${KEYBOARD_FOLDER_ABS}/config.h" PARENT_SCOPE)
+        else()
+            message(FATAL_ERROR "Could not find config.h in ${KEYBOARD_FOLDER_ABS}")
+        endif()
+    endif()
+endfunction()
+
+function(resolve_keyboard_h KEYBOARD_FOLDER_ABS KEYBOARD_H_STR)
+    if(${IS_KEYBOARDS_FOLDER})
+        file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
+        # get the deepest header
+        while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
+            get_filename_component(LAST_PART ${RELATIVE_KEYBOARD_FOLDER} NAME)
+            if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/${LAST_PART}.h")
+                set(${KEYBOARD_H_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/${LAST_PART}.h" PARENT_SCOPE)
+                return()
+            endif()
+            get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
+        endwhile()
+        message(FATAL_ERROR "Could not find *.h in ${KEYBOARD_FOLDER_ABS}")
+    else()
+        if(EXISTS "${KEYBOARD_FOLDER_ABS}/keyboard.h")
+            set(${KEYBOARD_H_STR} "${KEYBOARD_FOLDER_ABS}/keyboard.h" PARENT_SCOPE)
+        else()
+            message(FATAL_ERROR "Could not find keyboard.h in ${KEYBOARD_FOLDER_ABS}")
+        endif()
+    endif()
+endfunction()
+
+function(resolve_keymap_c KEYBOARD_FOLDER_ABS KEYMAP_FOLDER KEYMAP_C_STR)
+    if(IS_ABSOLUTE ${KEYMAP_FOLDER})
+        if(EXISTS "${KEYMAP_FOLDER}/keymap.c")
+            set(${KEYMAP_C_STR} "${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
+            return()
+        endif()
+    else()
+        if(${IS_KEYBOARDS_FOLDER})
+            file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
+            # get the deepest keymap.c
+            while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
+                if(EXISTS "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/${KEYMAP_FOLDER}/keymap.c")
+                    set(${KEYMAP_C_STR} "${QMK_KEYBOARDS_FOLDER}/${RELATIVE_KEYBOARD_FOLDER}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
+                    return()
+                endif()
+                get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
+            endwhile()
+        else()
+            if(EXISTS "${KEYBOARD_FOLDER_ABS}/keymap.c")
+                set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymap.c" PARENT_SCOPE)
+                return()
+            elseif(EXISTS "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c")
+                set(${KEYMAP_C_STR} "${KEYBOARD_FOLDER_ABS}/keymaps/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
+                return()
+            endif()
+        endif()
+    endif()
+
+    # string(JSON COMMUNITY_LAYOUTS ERROR_VARIABLE NO_COMMUNITY_LAYOUTS GET ${QMK_KEYBOARD_INFO_JSON_STRING} community_layouts)
+
+    # if(${NO_COMMUNITY_LAYOUTS} STREQUAL "NOTFOUND")
+        # string(JSON NUM_LAYOUTS LENGTH ${COMMUNITY_LAYOUTS})
+        # math(EXPR MAX "${NUM_LAYOUTS} - 1")
+        foreach(LAYOUT ${LAYOUTS})
+        # foreach(IDX RANGE ${MAX})
+            # string(JSON LAYOUT GET ${COMMUNITY_LAYOUTS} ${IDX})
+            if(EXISTS "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/${KEYMAP_FOLDER}/keymap.c")
+                set(${KEYMAP_C_STR} "${CMAKE_SOURCE_DIR}/layouts/community/${LAYOUT}/${KEYMAP_FOLDER}/keymap.c" PARENT_SCOPE)
+                return()
+            endif()
+        endforeach()
+    # endif()
+    message(FATAL_ERROR "Could not resolve keymap '${KEYMAP_FOLDER}'")
+endfunction()
+
+function(resolve_keyboard_includes KEYBOARD_FOLDER_ABS)
+    if(${IS_KEYBOARDS_FOLDER})
+        file(RELATIVE_PATH RELATIVE_KEYBOARD_FOLDER ${QMK_KEYBOARDS_FOLDER} ${KEYBOARD_FOLDER_ABS})
+        while(NOT ${RELATIVE_KEYBOARD_FOLDER} STREQUAL "")  
+            target_include_directories(qmk PUBLIC "${CMAKE_SOURCE_DIR}/keyboards/${RELATIVE_KEYBOARD_FOLDER}")
+            get_filename_component(RELATIVE_KEYBOARD_FOLDER ${RELATIVE_KEYBOARD_FOLDER} DIRECTORY)
+        endwhile()
+    else()
+        target_include_directories(qmk PUBLIC "${KEYBOARD_FOLDER_ABS}")
+    endif()
+endfunction()

cmake/ResolveToolchain.cmake

@@ -0,0 +1,60 @@
+function(resolve_toolchain PROCESSOR TOOLCHAIN_STR)
+    unset(${TOOLCHAIN_STR} PARENT_SCOPE)
+    if(
+        ${PROCESSOR} MATCHES "^at.*"
+        )
+            set(${TOOLCHAIN_STR} "avr" PARENT_SCOPE)
+            set(QMK_EXTENSION ".hex" PARENT_SCOPE)
+            include(FindAVRToolchain)
+            find_avr_toolchain()
+    elseif(
+        ${PROCESSOR} MATCHES "^STM.*" OR
+        ${PROCESSOR} MATCHES "^WB32.*" OR
+        ${PROCESSOR} MATCHES "^MK.*" OR
+        ${PROCESSOR} MATCHES "RP2040" OR
+        ${PROCESSOR} MATCHES "^GD32.*"
+        )
+            set(${TOOLCHAIN_STR} "arm-none-eabi" PARENT_SCOPE)
+            set(QMK_EXTENSION ".bin" PARENT_SCOPE)
+            include(FindARMToolchain)
+            find_arm_toolchain()
+    elseif(
+        ${PROCESSOR} MATCHES "risc-v"
+        )
+            set(${TOOLCHAIN_STR} "riscv32-unknown-elf" PARENT_SCOPE)
+            set(QMK_EXTENSION ".bin" PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "Could not find toolchain for ${PROCESSOR}")
+    endif()
+endfunction()
+
+function(find_toolchain TOOLCHAIN TOOLCHAIN_ROOT_STR)
+    unset(${TOOLCHAIN_STR} PARENT_SCOPE)
+    if(UNIX)
+        set(OS_SUFFIX "")
+        find_path(TOOLCHAIN_ROOT
+            NAMES
+                ${TOOLCHAIN}-gcc${OS_SUFFIX}
+            PATHS
+                "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc/avr-gcc-12.1.0-x64-linux/bin/"
+                "${CMAKE_SOURCE_DIR}/toolchains/gcc-arm-none-eabi-10.3-2021.10/bin/"
+                /usr/bin/
+                /usr/local/bin
+                /bin/
+                $ENV{AVR_ROOT}
+        )
+    elseif(WIN32)
+        set(OS_SUFFIX ".exe")
+        find_path(TOOLCHAIN_ROOT
+            NAMES
+                ${TOOLCHAIN}-gcc${OS_SUFFIX}
+            PATHS
+                "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin"
+                "${CMAKE_SOURCE_DIR}/toolchains/gcc-arm-none-eabi-10.3-2021.10/bin/"
+                $ENV{AVR_ROOT}
+        )
+    else()
+        message(FATAL_ERROR "Unsure how to handle this OS")
+    endif(UNIX)
+    set(${TOOLCHAIN_ROOT_STR} ${TOOLCHAIN_ROOT} PARENT_SCOPE)
+endfunction(find_toolchain)

cmake/UpdateSubmodule.cmake

@@ -0,0 +1,22 @@
+# can be passed a relative path (to CMAKE_SOURCE_DIR) to update/checkout that submodule
+macro(update_submodule SUBMODULE)
+    find_package(Git QUIET)
+    if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+        option(GIT_SUBMODULE "Check submodules during build" ON)
+        if(GIT_SUBMODULE)
+            message(STATUS "Updating submoudle ${SUBMODULE}")
+            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update ${SUBMODULE}
+                            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
+            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+                message(FATAL_ERROR "git submodule update ${SUBMODULE} failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+            endif()
+        endif()
+    else()
+        message("Git not found - skipping submodule update")
+    endif()
+
+    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/${SUBMODULE}/.git")
+        message(FATAL_ERROR "The submodule was not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
+    endif()
+endmacro()

cmake/Utils.cmake

@@ -0,0 +1,25 @@
+macro(json_get_with_default KEY_STR JSON_STR DEFAULT)
+    # message(STATUS "Getting ${ARGN} for ${KEY_STR}")
+    string(JSON ${KEY_STR} ERROR_VARIABLE JSON_ERROR GET ${JSON_STR} ${ARGN})
+    if(NOT ${JSON_ERROR} STREQUAL "NOTFOUND")
+        set(${KEY_STR} ${DEFAULT})
+    endif()
+endmacro()
+
+macro(json_get KEY_STR JSON_STR)
+    # message(STATUS "Getting ${ARGN} for ${KEY_STR}")
+    string(JSON ${KEY_STR} ERROR_VARIABLE JSON_ERROR GET ${JSON_STR} ${ARGN})
+    if(NOT ${JSON_ERROR} STREQUAL "NOTFOUND")
+        unset(${KEY_STR})
+    endif()
+endmacro()
+
+macro(parent_list ACTION LIST_STR)
+    set(ARGS ${ARGN})
+    string(REPLACE ";" " " ARGS ${ARGS})
+    set(LOCAL_LIST ${${LIST_STR}})
+    list(${ACTION} LOCAL_LIST ${ARGS})
+    # set in current scope too
+    set(${LIST_STR} ${LOCAL_LIST})
+    set(${LIST_STR} ${LOCAL_LIST} PARENT_SCOPE)
+endmacro()

cmake/ValidateJson.cmake

@@ -0,0 +1,199 @@
+function(validate_json JSON_FILE SCHEMA_NAME JSON_STRING_STR)
+  unset(${JSON_STRING_STR} PARENT_SCOPE)
+  message(VERBOSE "Validating ${JSON_FILE} with '${SCHEMA_NAME}' schema")
+  file(READ ${JSON_FILE} JSON_STRING)
+  file(READ ${CMAKE_SOURCE_DIR}/data/schemas/${SCHEMA_NAME}.jsonschema SCHEMA_STRING)
+  string(JSON SCHEMA_ID GET ${SCHEMA_STRING} $id)
+
+  set(DEFINITIONS "{}")
+  file(READ ${CMAKE_SOURCE_DIR}/data/schemas/definitions.jsonschema DEFINITIONS_STRING)
+  string(JSON DEFINITION_ID GET ${DEFINITIONS_STRING} $id)
+  string(JSON DEFINITIONS SET ${DEFINITIONS} "${DEFINITION_ID}#" ${DEFINITIONS_STRING})
+
+  string(JSON SCHEMA_DEFINITIONS ERROR_VARIABLE JSON_ERROR GET ${SCHEMA_STRING} definitions)
+  if(${JSON_ERROR} STREQUAL "NOTFOUND")
+    string(JSON DEFINITIONS SET ${DEFINITIONS} "#" "{}")
+    string(JSON DEFINITIONS SET ${DEFINITIONS} "#" definitions ${SCHEMA_DEFINITIONS})
+    # string(JSON DEFINITIONS_LENGTH LENGTH ${SCHEMA_DEFINITIONS})
+    # math(EXPR MAX "${DEFINITIONS_LENGTH} - 1")
+    # foreach(IDX RANGE ${MAX})
+    #   string(JSON DEFINITION_NAME MEMBER ${SCHEMA_DEFINITIONS} ${IDX})
+    #   string(JSON DEFINITION GET ${SCHEMA_DEFINITIONS} ${DEFINITION_NAME})
+    #   message(VERBOSE "Loading local definition '${DEFINITION_NAME}'")
+    #   string(JSON DEFINITIONS_STRING SET ${DEFINITIONS_STRING} ${DEFINITION_NAME} ${DEFINITION})
+    # endforeach()
+  endif()
+  
+  validate_object(${JSON_STRING} ${SCHEMA_STRING} OBJECT_ERROR)
+  if(DEFINED OBJECT_ERROR)
+    message(FATAL_ERROR ${OBJECT_ERROR})
+  else()
+    set(${JSON_STRING_STR} ${JSON_STRING} PARENT_SCOPE)
+  endif()
+endfunction()
+
+function(validate_object JSON_STRING SCHEMA_STRING OBJECT_ERROR_STR)
+  unset(${OBJECT_ERROR_STR} PARENT_SCOPE)
+  set(OBJECT_ERROR)
+  string(JSON PROPERTY_NAME_SCHEMA ERROR_VARIABLE PROPERTY_NAMES_ERROR GET ${SCHEMA_STRING} propertyNames)
+  string(JSON REQUIRED_PROPERTIES ERROR_VARIABLE REQUIRED_PROPERTIES_ERROR GET ${SCHEMA_STRING} required)
+  set(REQUIRED_LIST)
+  if(${REQUIRED_PROPERTIES_ERROR} STREQUAL "NOTFOUND")
+    string(JSON REQUIRED_LENGTH LENGTH ${REQUIRED_PROPERTIES})
+    math(EXPR MAX "${REQUIRED_LENGTH} - 1")
+    foreach(IDX RANGE ${MAX})
+      string(JSON REQUIRED GET ${REQUIRED_PROPERTIES} ${IDX})
+      list(APPEND REQUIRED_LIST ${REQUIRED})
+    endforeach()
+  endif()
+  string(JSON NUM_PROPERTIES LENGTH ${JSON_STRING})
+  math(EXPR MAX "${NUM_PROPERTIES} - 1")
+  foreach(IDX RANGE ${MAX})
+    string(JSON PROPERTY_NAME MEMBER ${JSON_STRING} ${IDX})
+    list(REMOVE_ITEM REQUIRED_LIST ${PROPERTY_NAME})
+    message(VERBOSE "Validating property '${PROPERTY_NAME}'")
+    if(${PROPERTY_NAMES_ERROR} STREQUAL "NOTFOUND")
+      validate_property(${PROPERTY_NAME} ${PROPERTY_NAME_SCHEMA} PROPERTY_NAME_ERROR)
+      if(DEFINED PROPERTY_NAME_ERROR)
+        list(APPEND OBJECT_ERROR "${PROPERTY_NAME_ERROR}")
+      endif()
+    endif()
+    string(JSON PROPERTY GET ${JSON_STRING} ${PROPERTY_NAME})
+    string(JSON SCHEMA_PROPERTIES ERROR_VARIABLE PROPERTIES_ERROR GET ${SCHEMA_STRING} properties ${PROPERTY_NAME})
+    if(${PROPERTIES_ERROR} STREQUAL "NOTFOUND")
+      string(JSON PROPERTY_SCHEMA GET ${SCHEMA_STRING} properties ${PROPERTY_NAME})
+    else()
+      string(JSON PROPERTY_SCHEMA ERROR_VARIABLE ADDITIONAL_PROPERTIES_ERROR GET ${SCHEMA_STRING} additionalProperties)
+      if(NOT ${ADDITIONAL_PROPERTIES_ERROR} STREQUAL "NOTFOUND" OR "${PROPERTY_SCHEMA}" STREQUAL "OFF")
+        list(APPEND OBJECT_ERROR "Additional properties like '${PROPERTY_NAME}' not permitted in '${JSON_STRING}'")
+      endif()
+    endif()
+    validate_property(${PROPERTY} ${PROPERTY_SCHEMA} PROPERTY_ERROR)
+    if(DEFINED PROPERTY_ERROR)
+      list(APPEND OBJECT_ERROR "${PROPERTY_ERROR}")
+    endif()
+  endforeach()
+  list(LENGTH REQUIRED_LIST REQUIRED_REMAINING_LENGTH)
+  if(${REQUIRED_REMAINING_LENGTH} GREATER 0)
+    list(APPEND OBJECT_ERROR "Required properties not found: ${REQUIRED_LIST}")
+  endif()
+  set(${OBJECT_ERROR_STR} ${OBJECT_ERROR} PARENT_SCOPE)
+endfunction()
+
+function(validate_property PROPERTY PROPERTY_SCHEMA PROPERTY_ERROR_STR)
+  unset(${PROPERTY_ERROR_STR} PARENT_SCOPE)
+  set(PROPERTY_ERROR)
+  string(JSON PROPERTY_REF ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} $ref)
+  if(${JSON_ERROR} STREQUAL "NOTFOUND")
+    string(REPLACE "/" ";" REF_COMPONENTS "${PROPERTY_REF}")
+    string(JSON PROPERTY_SCHEMA GET ${DEFINITIONS} ${REF_COMPONENTS})
+  endif()
+  string(JSON PROPERTY_TYPE ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} type)
+  if(${JSON_ERROR} STREQUAL "NOTFOUND")
+    message(VERBOSE "Validating property type '${PROPERTY_TYPE}'")
+    if(${PROPERTY_TYPE} STREQUAL "object")
+      validate_object(${PROPERTY} ${PROPERTY_SCHEMA} OBJECT_ERROR)
+      if(DEFINED OBJECT_ERROR)
+        list(APPEND PROPERTY_ERROR ${OBJECT_ERROR})
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "array")
+      string(JSON ARRAY_LENGTH LENGTH ${PROPERTY})
+      string(JSON MAX_ITEMS ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maxItems)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${ARRAY_LENGTH} GREATER ${MAX_ITEMS})
+        list(APPEND PROPERTY_ERROR "Number of items in '${PROPERTY}' exceeds maximum ${MAX_ITEMS}")
+      endif()
+      string(JSON MIN_ITEMS ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minItems)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${ARRAY_LENGTH} LESS ${MIN_ITEMS})
+        list(APPEND PROPERTY_ERROR "Number of items in '${PROPERTY}' is less than ${MIN_ITEMS}")
+      endif()
+      string(JSON ITEM_SCHEMA ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} items)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND")
+        math(EXPR MAX "${ARRAY_LENGTH} - 1")
+        foreach(IDX RANGE ${MAX})
+          string(JSON ITEM GET ${PROPERTY} ${IDX})
+          validate_property(${ITEM} ${ITEM_SCHEMA} ITEM_ERROR)
+          if(DEFINED ITEM_ERROR)
+            list(APPEND PROPERTY_ERROR ${ITEM_ERROR})
+          endif()
+        endforeach()
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "null")
+      if(NOT "${PROPERTY}" STREQUAL "null")
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not null'")
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "boolean")
+      if(NOT "${PROPERTY}" STREQUAL "OFF" AND NOT "${PROPERTY}" STREQUAL "ON")
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not a boolean'")
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "number")
+      if(NOT "${PROPERTY}" MATCHES "-?[0-9]+\\.?[0-9]*")
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not a number'")
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "integer")
+      if(NOT "${PROPERTY}" MATCHES "-?[0-9]+")
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not an integer'")
+      endif()
+      string(JSON MIN ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minimum)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${PROPERTY} LESS ${MIN})
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is less than the minimum of ${MIN}")
+      endif()
+      string(JSON MAX ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maximum)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${PROPERTY} GREATER ${MAX})
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is greater than the maximum of ${MAX}")
+      endif()
+    elseif(${PROPERTY_TYPE} STREQUAL "string")
+      # cmake regex doesn't support {}, so other options might be needed here
+      string(JSON PATTERN ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} pattern)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND NOT "${PROPERTY}" MATCHES "${PATTERN}")
+        list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' does not match '${PATTERN}'")
+      endif()
+      string(LENGTH ${PROPERTY} STRING_LENGTH)
+      string(JSON MIN_LENGTH ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} minLength)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${STRING_LENGTH} LESS ${MIN_LENGTH})
+        list(APPEND PROPERTY_ERROR "Length of property '${PROPERTY}' is less than the minimum of ${MIN_LENGTH}")
+      endif()
+      string(JSON MAX_LENGTH ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} maxLength)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND" AND ${STRING_LENGTH} GREATER ${MAX_LENGTH})
+        list(APPEND PROPERTY_ERROR "Length of property '${PROPERTY}' is greater than the maximum of ${MAX_LENGTH}")
+      endif()
+      string(JSON ENUM_LIST ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} enum)
+      if(${JSON_ERROR} STREQUAL "NOTFOUND")
+        set(FOUND_IN_ENUM_LIST FALSE)
+        string(JSON ENUM_LENGTH LENGTH ${ENUM_LIST})
+        math(EXPR MAX "${ENUM_LENGTH} - 1")
+        foreach(IDX RANGE ${MAX})
+          string(JSON ENUM GET ${PROPERTY_SCHEMA} enum ${IDX})
+          if(${ENUM} STREQUAL ${PROPERTY})
+            set(FOUND_IN_ENUM_LIST TRUE)
+          endif()
+        endforeach()
+        if(NOT ${FOUND_IN_ENUM_LIST})
+          list(APPEND PROPERTY_ERROR "Property '${PROPERTY}' is not defined in the schema's enum: ${ENUM_LIST}")
+        endif()
+      endif()
+    else()
+      message(VERBOSE "Unknown type '${PROPERTY_TYPE}'")
+    endif()
+  else()
+    string(JSON PROPERTY_ONEOF ERROR_VARIABLE JSON_ERROR GET ${PROPERTY_SCHEMA} oneOf)
+    if(${JSON_ERROR} STREQUAL "NOTFOUND")
+      set(TYPE_SUCCESS FALSE)
+      string(JSON NUM_ONEOF LENGTH ${PROPERTY_ONEOF})
+      math(EXPR MAX "${NUM_ONEOF} - 1")
+      set(ONEOF_ERRORS)
+      foreach(IDX RANGE ${MAX})
+        string(JSON PROPERTY_SCHEMA GET ${PROPERTY_ONEOF} ${IDX})
+        validate_property(${PROPERTY} ${PROPERTY_SCHEMA} ONEOF_ERROR)
+        if(NOT DEFINED ONEOF_ERROR)
+          set(TYPE_SUCCESS TRUE)
+        else()
+          list(APPEND ONEOF_ERRORS "${ONEOF_ERROR}\n")
+        endif()
+      endforeach()
+      if(NOT TYPE_SUCCESS)
+        list(APPEND PROPERTY_ERROR "Could not validate oneOf type '${PROPERTY}' :\n${ONEOF_ERRORS}")
+      endif()
+    endif()
+  endif()
+  set(${PROPERTY_ERROR_STR} ${PROPERTY_ERROR} PARENT_SCOPE)
+endfunction()

cmake/chibios/LLD/ADCv3.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/ADCv3/hal_adc_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/ADCv3)

cmake/chibios/LLD/CANv1.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/CANv1/hal_can_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/CANv1)

cmake/chibios/LLD/DACv1.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DACv1/hal_dac_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DACv1)

cmake/chibios/LLD/DMAv1.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DMAv1/stm32_dma.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/DMAv1)

cmake/chibios/LLD/EXTIv1.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/EXTIv1/stm32_exti.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/EXTIv1)

cmake/chibios/LLD/GPIOv2.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/GPIOv2/hal_pal_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/GPIOv2)

cmake/chibios/LLD/I2Cv2.cmake

@@ -0,0 +1,7 @@
+if(${USE_HAL_I2C_FALLBACK})
+    target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2C/hal_i2c_lld.c)
+    target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2C)
+else()
+    target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2Cv2/hal_i2c_lld.c)
+    target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/I2Cv2)
+endif()

cmake/chibios/LLD/RTCv2.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/RTCv2/hal_rtc_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/RTCv2)

cmake/chibios/LLD/SPIv2.cmake

@@ -0,0 +1,5 @@
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2/hal_i2s_lld.c
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2/hal_spi_v2_lld.c
+)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SPIv2)

cmake/chibios/LLD/SYSTICKv1.cmake

@@ -0,0 +1,2 @@
+target_sources(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SYSTICKv1/hal_st_lld.c)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/SYSTICKv1)

cmake/chibios/LLD/TIMv1.cmake

@@ -0,0 +1,6 @@
+target_sources(qmk PUBLIC
+${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_gpt_lld.c
+${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_icu_lld.c
+${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1/hal_pwm_lld.c
+)
+target_include_directories(qmk PUBLIC ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/TIMv1)

cmake/chibios/LLD/USARTv2.cmake

@@ -0,0 +1,9 @@
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_serial_lld.c
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_sio_lld.c
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2/hal_uart_lld.c 
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USART
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USARTv2
+)

cmake/chibios/LLD/USBv1.cmake

@@ -0,0 +1,6 @@
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USBv1/hal_usb_lld.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/USBv1
+)

cmake/chibios/LLD/xWDGv1.cmake

@@ -0,0 +1,6 @@
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/xWDGv1/hal_wdg_lld.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/${MCU_PORT_NAME}/LLD/xWDGv1
+)

cmake/chibios/ports/ARMv7-M.cmake

@@ -0,0 +1,10 @@
+# os/common/ports/ARMv7/compilers/GCC/mk/port.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/common/ports/ARMv7-M/chcore.c
+    ${CHIBIOS}/os/common/ports/ARMv7-M/compilers/GCC/chcoreasm.S
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/common/portability/GCC
+    ${CHIBIOS}/os/common/ports/ARM-common
+    ${CHIBIOS}/os/common/ports/ARMv7-M
+)

cmake/chibios/ports/STM32F3xx.cmake

@@ -0,0 +1,25 @@
+# os/hal/ports/STM32/STM32F3xx/platform.mk
+target_sources(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c
+    ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/stm32_isr.c
+    ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/hal_lld.c
+    ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/hal_efl_lld.c
+)
+target_include_directories(qmk PUBLIC
+    ${CHIBIOS}/os/hal/ports/common/ARMCMx
+    ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx
+)
+include(chibios/LLD/ADCv3)
+include(chibios/LLD/CANv1)
+include(chibios/LLD/DACv1)
+include(chibios/LLD/DMAv1)
+include(chibios/LLD/EXTIv1)
+include(chibios/LLD/GPIOv2)
+include(chibios/LLD/I2Cv2)
+include(chibios/LLD/RTCv2)
+include(chibios/LLD/SPIv2)
+include(chibios/LLD/SYSTICKv1)
+include(chibios/LLD/TIMv1)
+include(chibios/LLD/USARTv2)
+include(chibios/LLD/USBv1)
+include(chibios/LLD/xWDGv1)

cmake/features/backlight.cmake

@@ -0,0 +1,32 @@
+option(BACKLIGHT_ENABLE "" TRUE)
+set(BACKLIGHT_DRIVER "pwm" CACHE STRING "Backlight driver")
+set_property(CACHE BACKLIGHT_DRIVER PROPERTY STRINGS pwm timer software custom)
+
+string(JSON BACKLIGHT_PIN ERROR_VARIABLE NO_BACKLIGHT_PIN GET ${QMK_KEYBOARD_INFO_JSON_STRING} backlight pin)
+if(${BACKLIGHT_ENABLE} AND NOT ${BACKLIGHT_PIN} STREQUAL "backlight-NOTFOUND")
+    target_sources(qmk PUBLIC
+      quantum/backlight/backlight.c 
+      quantum/process_keycode/process_backlight.c
+    )
+    target_compile_definitions(qmk PUBLIC
+        BACKLIGHT_ENABLE
+        BACKLIGHT_PIN=${BACKLIGHT_PIN}
+    )
+    if(${BACKLIGHT_DRIVER} STREQUAL "custom")
+        target_compile_definitions(qmk PUBLIC BACKLIGHT_CUSTOM_DRIVER)
+    else()
+        target_sources(qmk PUBLIC quantum/backlight/backlight_driver_common.c)
+        if(${BACKLIGHT_DRIVER} STREQUAL "pwm")
+            target_sources(qmk PUBLIC quantum/backlight/backlight_${QMK_PLATFORM}.c)
+        else()
+            target_sources(qmk PUBLIC quantum/backlight/backlight_${BACKLIGHT_DRIVER}.c)
+        endif()
+    endif()
+    target_include_directories(qmk PUBLIC quantum/backlight)
+    target_include_directories(qmk PUBLIC drivers/oled)
+    # target_link_libraries(backlight qmk)
+    # target_include_directories(backlight PUBLIC quantum/backlight)
+    # target_include_directories(quantum PUBLIC quantum/backlight)
+    # target_link_libraries(backlight ${QMK_TARGET})
+    # target_link_libraries(backlight quantum)
+endif()

cmake/features/eeprom.cmake

@@ -0,0 +1,70 @@
+set(EEPROM_DRIVER "vendor" CACHE STRING "EEPROM driver")
+set_property(CACHE EEPROM_DRIVER PROPERTY STRINGS vendor custom transient i2c spi wear_leveling legacy_stm32_flash)
+set(WEAR_LEVELING_DRIVER "none" CACHE STRING "EEPROM wear-leveling driver")
+set_property(CACHE WEAR_LEVELING_DRIVER PROPERTY STRINGS custom embedded_flash spi_flash rp2040_flash legacy)
+
+target_compile_definitions(qmk PUBLIC
+    EEPROM_ENABLE
+)
+target_include_directories(qmk PUBLIC
+    platforms/${QMK_PLATFORM}/drivers/eeprom
+    drivers/eeprom
+    platforms/common
+)
+
+if(${EEPROM_DRIVER} STREQUAL "wear_leveling")
+    target_compile_definitions(qmk PUBLIC 
+        EEPROM_DRIVER
+        EEPROM_WEAR_LEVELING
+    )
+    target_sources(qmk PUBLIC 
+        drivers/eeprom/eeprom_driver.c
+        drivers/eeprom/eeprom_wear_leveling.c
+    )
+elseif(${EEPROM_DRIVER} STREQUAL "vendor")
+    target_compile_definitions(qmk PUBLIC 
+        EEPROM_VENDOR
+    )
+    if(${QMK_PLATFORM} STREQUAL "chibios")
+        if(${QMK_MCU} MATCHES "STM32F[1-9].*" OR ${QMK_MCU} MATCHES "WB32.*" OR ${QMK_MCU} MATCHES "GD32.*")
+            target_compile_definitions(qmk PUBLIC 
+                EEPROM_DRIVER
+                EEPROM_WEAR_LEVELING
+            )
+            target_sources(qmk PUBLIC
+                drivers/eeprom/eeprom_driver.c
+                drivers/eeprom/eeprom_wear_leveling.c
+            )
+            set(WEAR_LEVELING_DRIVER "embedded_flash")
+        endif()
+    endif()
+endif()
+
+if(NOT ${WEAR_LEVELING_DRIVER} STREQUAL "none")
+    set(FNV_ENABLE TRUE)
+    target_compile_definitions(qmk PUBLIC 
+        WEAR_LEVELING_ENABLE
+    )
+    target_include_directories(qmk PUBLIC
+        platforms/${QMK_PLATFORM}/drivers/wear_leveling
+        drivers/wear_leveling
+        quantum/wear_leveling
+    )
+    target_sources(qmk PUBLIC quantum/wear_leveling/wear_leveling.c)
+
+    if(${WEAR_LEVELING_DRIVER} STREQUAL "embedded_flash")
+        target_compile_definitions(qmk PUBLIC 
+            HAL_USE_EFL
+            WEAR_LEVELING_EMBEDDED_FLASH
+        )
+        target_sources(qmk PUBLIC 
+            platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl.c
+        )
+        # target_compile_options(qmk PUBLIC
+            # -include ${CMAKE_SOURCE_DIR}/platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl_config.h
+        # )
+        target_precompile_headers(qmk PUBLIC
+            ${CMAKE_SOURCE_DIR}/platforms/${QMK_PLATFORM}/drivers/wear_leveling/wear_leveling_efl_config.h
+        )
+    endif()
+endif()

cmake/features/fnv.cmake

@@ -0,0 +1,9 @@
+if(${FNV_ENABLE})
+    target_compile_definitions(qmk PUBLIC FNV_ENABLE)
+    target_include_directories(qmk PUBLIC lib/fnv)
+    target_sources(qmk PUBLIC
+        lib/fnv/qmk_fnv_type_validation.c
+        lib/fnv/hash_32a.c
+        lib/fnv/hash_64a.c
+    )
+endif()

cmake/features/matrix.cmake

@@ -0,0 +1,9 @@
+message(STATUS "Custom Matrix: ${CUSTOM_MATRIX}")
+set(CUSTOM_MATRIX "no" CACHE STRING "Custom matrix-scanning")
+set_property(CACHE CUSTOM_MATRIX PROPERTY STRINGS yes lite no)
+if(NOT ${CUSTOM_MATRIX} STREQUAL yes)
+    target_sources(qmk PUBLIC quantum/matrix_common.c)
+    if(NOT ${CUSTOM_MATRIX} STREQUAL lite)
+        target_sources(qmk PUBLIC quantum/matrix.c)
+    endif()
+endif()

cmake/features/oled.cmake

@@ -0,0 +1,10 @@
+option(OLED_ENABLE "" OFF)
+if(${OLED_ENABLE})
+    target_sources(qmk PUBLIC
+      drivers/oled/ssd1306_sh1106.c 
+      platforms/${QMK_PLATFORM}/drivers/i2c_master.c)
+    target_compile_definitions(qmk PUBLIC OLED_ENABLE)
+    target_include_directories(qmk PUBLIC drivers)
+    target_include_directories(qmk PUBLIC drivers/oled)
+    target_include_directories(qmk PUBLIC platforms/${QMK_PLATFORM}/drivers)
+endif()

cmake/toolchains/arm-none-eabi.cmake

@@ -0,0 +1,144 @@
+set(CMAKE_EXPORT_COMPILE_COMMANDS on)
+
+include(ResolveToolchain)
+
+set(QMK_TOOLCHAIN "arm-none-eabi")
+set(QMK_PLATFORM "chibios")
+set(QMK_PROTOCOL "chibios")
+set(QMK_EXTENSION ".bin")
+
+if(UNIX)
+    set(OS_SUFFIX "")
+elseif(WIN32)
+    set(OS_SUFFIX ".exe")
+endif()
+
+find_toolchain(arm-none-eabi TOOLCHAIN_ROOT)
+
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_CROSS_COMPILING 1)
+
+set(CMAKE_C_COMPILER   "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-gcc${OS_SUFFIX}"     CACHE PATH "gcc"     FORCE)
+set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-g++${OS_SUFFIX}"     CACHE PATH "g++"     FORCE)
+set(CMAKE_AR           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ar${OS_SUFFIX}"      CACHE PATH "ar"      FORCE)
+set(CMAKE_AS           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-as${OS_SUFFIX}"      CACHE PATH "as"      FORCE)
+set(CMAKE_LINKER       "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ld${OS_SUFFIX}"      CACHE PATH "linker"  FORCE)
+set(CMAKE_NM           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-nm${OS_SUFFIX}"      CACHE PATH "nm"      FORCE)
+set(CMAKE_OBJCOPY      "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objcopy${OS_SUFFIX}" CACHE PATH "objcopy" FORCE)
+set(CMAKE_OBJDUMP      "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objdump${OS_SUFFIX}" CACHE PATH "objdump" FORCE)
+set(CMAKE_STRIP        "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-strip${OS_SUFFIX}"   CACHE PATH "strip"   FORCE)
+set(CMAKE_RANLIB       "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ranlib${OS_SUFFIX}"  CACHE PATH "ranlib"  FORCE)
+set(CMAKE_SIZE         "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-size${OS_SUFFIX}"    CACHE PATH "size"    FORCE)
+
+find_program(CMAKE_MAKE_PROGRAM NAME make
+    PATHS
+    "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin/"
+    "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-linux/bin/"
+    /usr/bin/
+    /usr/local/bin
+    /bin/
+)
+
+add_compile_options(
+    $<$<COMPILE_LANGUAGE:C>:-std=gnu11>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+    # -flto
+    -Os
+    -Wall
+    -Wstrict-prototypes
+    # -fcommon
+    # -g
+
+    -fomit-frame-pointer
+    -ffunction-sections
+    -fdata-sections
+    -fno-common
+    -fshort-wchar
+    -fno-builtin-printf
+    # -funsigned-char
+    # -funsigned-bitfields
+    # -ffunction-sections
+    # -fdata-sections
+    # -fpack-struct
+    # -fshort-enums
+    # -fno-builtin-printf
+    # $<$<COMPILE_LANGUAGE:C>:-fno-inline-small-functions>
+    # $<$<COMPILE_LANGUAGE:C>:-fno-strict-aliasing>
+    # $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+)
+
+add_link_options(
+    -Wl,--gc-sections
+    -nostartfiles
+    -Wl,--no-wchar-size-warning
+    --specs=nano.specs
+    -lm
+)
+
+macro(add_qmk_executable target_name)
+
+    set(elf_file ${target_name}.elf)
+    set(map_file ${target_name}.map)
+    set(bin_file ${target_name}.bin)
+    set(lst_file ${target_name}.lst)
+
+    add_link_options(
+        -Wl,-Map=${map_file},--cref
+    )
+
+    # create elf file
+    add_executable(qmk ${ARGN})
+    # add_executable(${elf_file} ${ARGN})
+    # target_link_libraries(${elf_file} qmk)
+
+    set_target_properties(qmk
+        PROPERTIES
+            OUTPUT_NAME ${elf_file}
+    )
+
+    # generate the lst file
+    add_custom_command(
+        OUTPUT ${lst_file}
+        COMMAND ${CMAKE_OBJDUMP} -h -S ${elf_file} > ${lst_file}
+        DEPENDS qmk
+    )
+
+    # add_custom_command(
+    #     OUTPUT "print-size-${elf_file}"
+
+    #     COMMAND
+    #         ${CMAKE_SIZE} ${elf_file}
+
+    #     DEPENDS ${elf_file}
+    # )
+
+    # add_custom_command(
+    #     OUTPUT "print-size-${bin_file}"
+
+    #     COMMAND
+    #         ${CMAKE_SIZE} ${bin_file} sizeafter
+
+    #     DEPENDS ${bin_file}
+    # )
+
+    add_custom_command(
+        TARGET qmk
+        POST_BUILD
+        COMMAND ${CMAKE_OBJCOPY} -O binary ${elf_file} ${CMAKE_SOURCE_DIR}/build/${bin_file}
+        # COMMAND ${CMAKE_COMMAND} -E copy ${elf_file} ${CMAKE_SOURCE_DIR}/build/${elf_file}
+        # COMMAND ${CMAKE_COMMAND} -E copy ${lst_file} ${CMAKE_SOURCE_DIR}/build/${lst_file}
+        # COMMAND ${CMAKE_COMMAND} -E copy ${map_file} ${CMAKE_SOURCE_DIR}/build/${map_file}
+    )
+
+    # build the intel hex file for the device
+    add_custom_target(${target_name} ALL
+        DEPENDS ${elf_file} ${lst_file}
+    )
+
+    set_target_properties(${target_name}
+        PROPERTIES
+            OUTPUT_NAME ${bin_file}
+    )
+endmacro(add_qmk_executable)

cmake/toolchains/avr.cmake

@@ -0,0 +1,182 @@
+#
+# AVR GCC Toolchain file
+#
+# @author Natesh Narain
+# @since Feb 06 2016
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS on)
+
+include(ResolveToolchain)
+
+set(QMK_TOOLCHAIN "avr")
+set(QMK_PLATFORM "avr")
+set(QMK_PROTOCOL "lufa")
+set(QMK_EXTENSION ".hex")
+
+if(UNIX)
+    set(OS_SUFFIX "")
+elseif(WIN32)
+    set(OS_SUFFIX ".exe")
+endif()
+
+find_toolchain(avr TOOLCHAIN_ROOT)
+
+# setup the AVR compiler variables
+
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR avr)
+set(CMAKE_CROSS_COMPILING 1)
+
+set(CMAKE_C_COMPILER   "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-gcc${OS_SUFFIX}"     CACHE PATH "gcc"     FORCE)
+set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-g++${OS_SUFFIX}"     CACHE PATH "g++"     FORCE)
+set(CMAKE_AR           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ar${OS_SUFFIX}"      CACHE PATH "ar"      FORCE)
+set(CMAKE_AS           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-as${OS_SUFFIX}"      CACHE PATH "as"      FORCE)
+set(CMAKE_LINKER       "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ld${OS_SUFFIX}"      CACHE PATH "linker"  FORCE)
+set(CMAKE_NM           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-nm${OS_SUFFIX}"      CACHE PATH "nm"      FORCE)
+set(CMAKE_OBJCOPY      "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objcopy${OS_SUFFIX}" CACHE PATH "objcopy" FORCE)
+set(CMAKE_OBJDUMP      "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-objdump${OS_SUFFIX}" CACHE PATH "objdump" FORCE)
+set(CMAKE_STRIP        "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-strip${OS_SUFFIX}"   CACHE PATH "strip"   FORCE)
+set(CMAKE_RANLIB       "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-ranlib${OS_SUFFIX}"  CACHE PATH "ranlib"  FORCE)
+set(AVR_SIZE           "${TOOLCHAIN_ROOT}/${QMK_TOOLCHAIN}-size${OS_SUFFIX}"    CACHE PATH "size"    FORCE)
+
+# set(CMAKE_EXE_LINKER_FLAGS "-L /usr/lib/gcc/avr/4.8.2")
+
+# avr uploader config
+find_program(AVR_UPLOAD
+    NAME
+        avrdude
+    PATHS
+        /usr/bin/
+        $ENV{AVR_ROOT}
+)
+
+find_program(CMAKE_MAKE_PROGRAM NAME make
+    PATHS
+    "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-windows/bin/"
+    "${CMAKE_SOURCE_DIR}/toolchains/avr-gcc-12.1.0-x64-linux/bin/"
+    /usr/bin/
+    /usr/local/bin
+    /bin/
+)
+
+# setup the avr exectable macro
+
+# set(AVR_LINKER_LIBS "-lc -lm -lgcc -Wl,-lprintf_flt -Wl,-u,vfprintf")
+
+add_compile_options(
+    $<$<COMPILE_LANGUAGE:C>:-std=gnu11>
+    $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
+    -flto
+    # -mrelax
+    -Os
+    -Wall
+    -Wstrict-prototypes
+    -fcommon
+    # -g
+    $<$<BOOL:${WIN32}>:--param=min-pagesize=0>
+    -funsigned-char
+    -funsigned-bitfields
+    -ffunction-sections
+    -fdata-sections
+    -fpack-struct
+    -fshort-enums
+    -mcall-prologues
+    -fno-builtin-printf
+    $<$<COMPILE_LANGUAGE:C>:-fno-inline-small-functions>
+    $<$<COMPILE_LANGUAGE:C>:-fno-strict-aliasing>
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+)
+
+add_compile_definitions(
+    F_CPU=16000000
+    F_USB=16000000UL
+    __AVR_ATmega32U4__
+    LTO_ENABLE
+)
+
+add_link_options(
+    -Wl,--gc-sections
+)
+
+macro(add_qmk_executable target_name)
+
+    set(elf_file ${target_name}.elf)
+    set(map_file ${target_name}.map)
+    set(hex_file ${target_name}.hex)
+    set(lst_file ${target_name}.lst)
+
+    add_compile_options(
+        -mmcu=${QMK_MCU}
+    )
+
+    add_link_options(
+        -mmcu=${QMK_MCU}
+        -Wl,-Map=${map_file}
+    )
+
+    # create elf file
+    # add_executable(${elf_file} ${ARGN})
+    # target_link_libraries(${elf_file} qmk)
+
+    add_executable(qmk ${ARGN})
+    set_target_properties(qmk
+        PROPERTIES
+            OUTPUT_NAME ${elf_file}
+    )
+
+
+    # set_target_properties(${elf_file}
+    #     PROPERTIES
+    #         COMPILE_FLAGS "-mmcu=${QMK_MCU} ${COMPILE_OPTIONS}"
+    #         LINK_FLAGS    "-mmcu=${QMK_MCU} ${LINK_OPTIONS}"
+    # )
+
+    # add_custom_target(compileOptions
+    #     COMMAND cmake -P ${CMAKE_SOURCE_DIR}/cmake/WriteCompileOptions.cmake
+    #     COMMENT "Writing compile_flags.txt"
+    # )
+
+    # generate the lst file
+    add_custom_command(
+        OUTPUT ${lst_file}
+        COMMAND ${CMAKE_OBJDUMP} -h -S ${elf_file} > ${lst_file}
+        DEPENDS ${elf_file}
+    )
+
+    # create hex file
+    add_custom_command(
+        OUTPUT ${hex_file}
+        # COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${elf_file} ${hex_file}
+        COMMAND ${CMAKE_OBJCOPY} -O ihex -R .eeprom -R .fuse -R .lock -R .signature ${elf_file} ${hex_file}
+        DEPENDS ${elf_file}
+    )
+
+    add_custom_command(
+        OUTPUT "print-size-${elf_file}"
+        COMMAND ${AVR_SIZE} ${elf_file}
+        DEPENDS ${elf_file}
+    )
+
+    add_custom_command(
+        OUTPUT "print-size-${hex_file}"
+        COMMAND ${AVR_SIZE} ${hex_file}
+        DEPENDS ${hex_file}
+    )
+
+    add_custom_target(copy_hex
+        COMMAND ${CMAKE_COMMAND} -E copy ${hex_file} ${CMAKE_SOURCE_DIR}/build/${hex_file}
+        DEPENDS ${hex_file}
+    )
+
+    # build the intel hex file for the device
+    add_custom_target(${target_name} ALL
+        DEPENDS ${hex_file} ${lst_file} "print-size-${elf_file}" "print-size-${hex_file}" copy_hex 
+    )
+
+    set_target_properties(${target_name}
+        PROPERTIES
+            OUTPUT_NAME ${hex_file}
+    )
+
+
+endmacro(add_qmk_executable)

cmake/toolchains/riscv64-unknown-elf.cmake

@@ -0,0 +1,16 @@
+if(${USE_PICOLIBC})
+    add_compile_options(
+        --specs=picolibc.specs
+    )
+    add_compile_definitions(USE_PICOLIBC)
+    add_link_options(
+        -Wl,--defsym=__heap_start=__heap_base__,--defsym=__heap_end=__heap_end__
+    )
+endif()
+
+add_compile_options(
+    -march=${MCU_ARCH}
+    -mabi=${MCU_ABI}
+    -mcmodel=${MCU_CMODEL}
+    -mstrict-align
+)

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

@@ -1,407 +0,0 @@
-{
-    "aliases": {
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ # │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ 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": "FR_HASH",
-            "label": "#",
-        }
-        "KC_1": {
-            "key": "FR_1",
-            "label": "1",
-        }
-        "KC_2": {
-            "key": "FR_2",
-            "label": "2",
-        }
-        "KC_3": {
-            "key": "FR_3",
-            "label": "3",
-        }
-        "KC_4": {
-            "key": "FR_4",
-            "label": "4",
-        }
-        "KC_5": {
-            "key": "FR_5",
-            "label": "5",
-        }
-        "KC_6": {
-            "key": "FR_6",
-            "label": "6",
-        }
-        "KC_7": {
-            "key": "FR_7",
-            "label": "7",
-        }
-        "KC_8": {
-            "key": "FR_8",
-            "label": "8",
-        }
-        "KC_9": {
-            "key": "FR_9",
-            "label": "9",
-        }
-        "KC_0": {
-            "key": "FR_0",
-            "label": "0",
-        }
-        "KC_MINS": {
-            "key": "FR_MINS",
-            "label": "-",
-        }
-        "KC_EQL": {
-            "key": "FR_EQL",
-            "label": "=",
-        }
-        "KC_Q": {
-            "key": "FR_Q",
-            "label": "Q",
-        }
-        "KC_W": {
-            "key": "FR_W",
-            "label": "W",
-        }
-        "KC_E": {
-            "key": "FR_E",
-            "label": "E",
-        }
-        "KC_R": {
-            "key": "FR_R",
-            "label": "R",
-        }
-        "KC_T": {
-            "key": "FR_T",
-            "label": "T",
-        }
-        "KC_Y": {
-            "key": "FR_Y",
-            "label": "Y",
-        }
-        "KC_U": {
-            "key": "FR_U",
-            "label": "U",
-        }
-        "KC_I": {
-            "key": "FR_I",
-            "label": "I",
-        }
-        "KC_O": {
-            "key": "FR_O",
-            "label": "O",
-        }
-        "KC_P": {
-            "key": "FR_P",
-            "label": "P",
-        }
-        "KC_LBRC": {
-            "key": "FR_DCIR",
-            "label": "^ (dead)",
-        }
-        "KC_RBRC": {
-            "key": "FR_CEDL",
-            "label": "¸ (dead)",
-        }
-        "KC_A": {
-            "key": "FR_A",
-            "label": "A",
-        }
-        "KC_S": {
-            "key": "FR_S",
-            "label": "S",
-        }
-        "KC_D": {
-            "key": "FR_D",
-            "label": "D",
-        }
-        "KC_F": {
-            "key": "FR_F",
-            "label": "F",
-        }
-        "KC_G": {
-            "key": "FR_G",
-            "label": "G",
-        }
-        "KC_H": {
-            "key": "FR_H",
-            "label": "H",
-        }
-        "KC_J": {
-            "key": "FR_J",
-            "label": "J",
-        }
-        "KC_K": {
-            "key": "FR_K",
-            "label": "K",
-        }
-        "KC_L": {
-            "key": "FR_L",
-            "label": "L",
-        }
-        "KC_SCLN": {
-            "key": "FR_SCLN",
-            "label": ";",
-        }
-        "KC_QUOT": {
-            "key": "FR_DGRV",
-            "label": "` (dead)",
-        }
-        "KC_NUHS": {
-            "key": "FR_LABK",
-            "label": "<",
-        }
-        "KC_NUBS": {
-            "key": "FR_LDAQ",
-            "label": "«",
-        }
-        "KC_Z": {
-            "key": "FR_Z",
-            "label": "Z",
-        }
-        "KC_X": {
-            "key": "FR_X",
-            "label": "X",
-        }
-        "KC_C": {
-            "key": "FR_C",
-            "label": "C",
-        }
-        "KC_V": {
-            "key": "FR_V",
-            "label": "V",
-        }
-        "KC_B": {
-            "key": "FR_B",
-            "label": "B",
-        }
-        "KC_N": {
-            "key": "FR_N",
-            "label": "N",
-        }
-        "KC_M": {
-            "key": "FR_M",
-            "label": "M",
-        }
-        "KC_COMM": {
-            "key": "FR_COMM",
-            "label": ",",
-        }
-        "KC_DOT": {
-            "key": "FR_DOT",
-            "label": ".",
-        }
-        "KC_SLSH": {
-            "key": "FR_EACU",
-            "label": "É",
-        }
-/* Shifted symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ | │ ! │ " │ / │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │ ¨ │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │ : │   │ > │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ » │   │   │   │   │   │   │   │ ' │   │   │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(FR_HASH)": {
-            "key": "FR_PIPE",
-            "label": "|",
-        }
-        "S(FR_1)": {
-            "key": "FR_EXLM",
-            "label": "!",
-        }
-        "S(FR_2)": {
-            "key": "FR_DQUO",
-            "label": "\"",
-        }
-        "S(FR_3)": {
-            "key": "FR_SLSH",
-            "label": "/",
-        }
-        "S(FR_4)": {
-            "key": "FR_DLR",
-            "label": "$",
-        }
-        "S(FR_5)": {
-            "key": "FR_PERC",
-            "label": "%",
-        }
-        "S(FR_6)": {
-            "key": "FR_QUES",
-            "label": "?",
-        }
-        "S(FR_7)": {
-            "key": "FR_AMPR",
-            "label": "&",
-        }
-        "S(FR_8)": {
-            "key": "FR_ASTR",
-            "label": "*",
-        }
-        "S(FR_9)": {
-            "key": "FR_LPRN",
-            "label": "(",
-        }
-        "S(FR_0)": {
-            "key": "FR_RPRN",
-            "label": ")",
-        }
-        "S(FR_MINS)": {
-            "key": "FR_UNDS",
-            "label": "_",
-        }
-        "S(FR_EQL)": {
-            "key": "FR_PLUS",
-            "label": "+",
-        }
-        "S(FR_CEDL)": {
-            "key": "FR_DIAE",
-            "label": "¨ (dead)",
-        }
-        "S(FR_SCLN)": {
-            "key": "FR_COLN",
-            "label": ":",
-        }
-        "S(FR_LABK)": {
-            "key": "FR_RABK",
-            "label": ">",
-        }
-        "S(FR_LDAQ)": {
-            "key": "FR_RDAQ",
-            "label": "»",
-        }
-        "S(FR_COMM)": {
-            "key": "FR_QUOT",
-            "label": "'",
-        }
-/* AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ \ │ ± │ @ │ £ │ ¢ │ ¤ │ ¬ │ ¦ │ ² │ ³ │ ¼ │ ½ │ ¾ │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │ § │ ¶ │ [ │ ] │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │ ~ │ { │ } │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ ° │   │   │   │   │   │   │ µ │ ¯ │ - │ ´ │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(FR_HASH)": {
-            "key": "FR_BSLS",
-            "label": "\\",
-        }
-        "ALGR(FR_1)": {
-            "key": "FR_PLMN",
-            "label": "±",
-        }
-        "ALGR(FR_2)": {
-            "key": "FR_AT",
-            "label": "@",
-        }
-        "ALGR(FR_3)": {
-            "key": "FR_PND",
-            "label": "£",
-        }
-        "ALGR(FR_4)": {
-            "key": "FR_CENT",
-            "label": "¢",
-        }
-        "ALGR(FR_5)": {
-            "key": "FR_CURR",
-            "label": "¤",
-        }
-        "ALGR(FR_6)": {
-            "key": "FR_NOT",
-            "label": "¬",
-        }
-        "ALGR(FR_7)": {
-            "key": "FR_BRKP",
-            "label": "¦",
-        }
-        "ALGR(FR_8)": {
-            "key": "FR_SUP2",
-            "label": "²",
-        }
-        "ALGR(FR_9)": {
-            "key": "FR_SUP3",
-            "label": "³",
-        }
-        "ALGR(FR_0)": {
-            "key": "FR_QRTR",
-            "label": "¼",
-        }
-        "ALGR(FR_MINS)": {
-            "key": "FR_HALF",
-            "label": "½",
-        }
-        "ALGR(FR_EQL)": {
-            "key": "FR_TQTR",
-            "label": "¾",
-        }
-        "ALGR(FR_O)": {
-            "key": "FR_SECT",
-            "label": "§",
-        }
-        "ALGR(FR_P)": {
-            "key": "FR_PARA",
-            "label": "¶",
-        }
-        "ALGR(FR_DCIR)": {
-            "key": "FR_LBRC",
-            "label": "[",
-        }
-        "ALGR(FR_CEDL)": {
-            "key": "FR_RBRC",
-            "label": "]",
-        }
-        "ALGR(FR_SCLN)": {
-            "key": "FR_TILD",
-            "label": "~",
-        }
-        "ALGR(FR_DGRV)": {
-            "key": "FR_LCBR",
-            "label": "{",
-        }
-        "ALGR(FR_LABK)": {
-            "key": "FR_RCBR",
-            "label": "}",
-        }
-        "ALGR(FR_LDAQ)": {
-            "key": "FR_DEG",
-            "label": "°",
-        }
-        "ALGR(FR_M)": {
-            "key": "FR_MICR",
-            "label": "µ",
-        }
-        "ALGR(FR_COMM)": {
-            "key": "FR_MACR",
-            "label": "¯",
-        }
-        "ALGR(FR_DOT)": {
-            "key": "FR_SHYP",
-            "label": "­ (soft hyphen)",
-        }
-        "ALGR(FR_EACU)": {
-            "key": "FR_ACUT",
-            "label": "´ (dead)",
-        }
-    }
-}

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

@@ -1,580 +0,0 @@
-{
-    "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

@@ -1,580 +0,0 @@
-{
-    "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": "—",
-        }
-    }
-}