Compare commits

..
Author SHA1 Message Date
zvecr
524557a12c Remove split.transport.protocol=serial 2024-07-24 20:24:36 +01:00
13182 changed files with 276460 additions and 135889 deletions

35
.clangd
View file

@ -1,33 +1,4 @@
CompileFlags: CompileFlags:
Add: 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]
-Wno-unknown-attributes, Compiler: clang
-Wno-maybe-uninitialized,
-Wno-unknown-warning-option,
-Wno-pointer-to-int-cast,
-Wno-int-to-void-pointer-cast,
-DPROGMEM=,
]
Remove:
[
-W*,
-mmcu=*,
-mcpu=*,
-mfpu=*,
-mfloat-abi=*,
-mno-unaligned-access,
-mno-thumb-interwork,
-mcall-prologues,
-D__has_include*,
-mlra,
]
Compiler: clang
Diagnostics:
UnusedIncludes: None
Suppress:
[
asm_invalid_output_constraint,
asm_invalid_input_constraint,
invalid_asm_value_for_constraint,
anyx86_interrupt_attribute,
]

View file

@ -11,8 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
# To match GitHub Actions formatting [{*.yaml,*.yml}] # To match GitHub Actions formatting
[*.{yaml,yml}]
indent_size = 2 indent_size = 2
[*.md] [*.md]

View file

@ -38,4 +38,4 @@ body:
- type: textarea - type: textarea
attributes: attributes:
label: Additional Context label: Additional Context
description: Add any other relevant information about the problem here. description: Add any other relevant information about the problem here.

View file

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

View file

@ -1,5 +1,6 @@
<!--- Provide a general summary of your changes in the title above. --> <!--- 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. --> <!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
## Description ## Description
@ -14,7 +15,7 @@
- [ ] New feature - [ ] New feature
- [ ] Enhancement/optimization - [ ] Enhancement/optimization
- [ ] Keyboard (addition or update) - [ ] Keyboard (addition or update)
- [ ] Keymap/layout (addition or update) - [ ] Keymap/layout/userspace (addition or update)
- [ ] Documentation - [ ] Documentation
## Issues Fixed or Closed by This PR ## Issues Fixed or Closed by This PR

20
.github/labeler.yml vendored
View file

@ -11,15 +11,15 @@ core:
- Makefile - Makefile
- '*.mk' - '*.mk'
dependencies: dependencies:
- changed-files: - all:
- all-globs-to-any-file: - changed-files:
- lib/** - any-glob-to-any-file: lib/**
- '!lib/python/**' - all-globs-to-all-files: '!lib/python/**'
keyboard: keyboard:
- changed-files: - all:
- all-globs-to-any-file: - changed-files:
- keyboards/** - any-glob-to-any-file: keyboards/**
- '!keyboards/**/keymaps/**' - all-globs-to-all-files: '!keyboards/**/keymaps/**'
keymap: keymap:
- changed-files: - changed-files:
- any-glob-to-any-file: - any-glob-to-any-file:
@ -54,7 +54,3 @@ dd:
- data/constants/** - data/constants/**
- data/mappings/** - data/mappings/**
- data/schemas/** - data/schemas/**
community_module:
- changed-files:
- any-glob-to-any-file:
- modules/**

View file

@ -25,7 +25,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware' if: github.repository == 'qmk/qmk_firmware'
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 1 fetch-depth: 1
persist-credentials: false persist-credentials: false

View file

@ -15,7 +15,6 @@ on:
- quantum/**/* - quantum/**/*
- tests/**/* - tests/**/*
- tmk_core/**/* - tmk_core/**/*
- lib/python/**/*
- util/**/* - util/**/*
- Makefile - Makefile
- '*.mk' - '*.mk'
@ -28,7 +27,7 @@ jobs:
if: github.repository == 'qmk/qmk_firmware' if: github.repository == 'qmk/qmk_firmware'
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0

View file

@ -6,13 +6,13 @@ permissions:
on: on:
push: push:
branches: [master, develop, xap] branches: [master, develop]
workflow_dispatch: workflow_dispatch:
inputs: inputs:
branch: branch:
type: choice type: choice
description: "Branch to build" description: "Branch to build"
options: [master, develop, xap] options: [master, develop]
env: env:
# https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits
@ -45,14 +45,14 @@ jobs:
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Determine concurrency - name: Determine concurrency
id: generate_slice_length id: generate_slice_length
run: | run: |
target_count=$( { target_count=$( {
qmk find -km default 2>/dev/null qmk find -km default 2>/dev/null
qmk find -km xap 2>/dev/null # qmk find -km xap 2>/dev/null
} | sort | uniq | wc -l) } | sort | uniq | wc -l)
slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution
echo "slice_length=$slice_length" >> $GITHUB_OUTPUT echo "slice_length=$slice_length" >> $GITHUB_OUTPUT
@ -63,7 +63,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
keymap: [default, xap] keymap: [default]
# keymap: [default, xap]
uses: ./.github/workflows/ci_build_major_branch_keymap.yml uses: ./.github/workflows/ci_build_major_branch_keymap.yml
with: with:
branch: ${{ inputs.branch || github.ref_name }} branch: ${{ inputs.branch || github.ref_name }}
@ -82,12 +83,12 @@ jobs:
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v5 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v6 uses: actions/download-artifact@v4
with: with:
pattern: firmware-* pattern: firmware-*
path: . path: .

View file

@ -37,7 +37,7 @@ jobs:
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Generate build targets - name: Generate build targets
id: generate_targets id: generate_targets
@ -62,7 +62,7 @@ jobs:
echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT
- name: Upload targets json - name: Upload targets json
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v4
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: targets.json path: targets.json
@ -89,10 +89,10 @@ jobs:
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Get target definitions - name: Get target definitions
uses: actions/download-artifact@v6 uses: actions/download-artifact@v4
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: . path: .
@ -112,7 +112,7 @@ jobs:
qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed
- name: Upload binaries - name: Upload binaries
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v4
with: with:
name: firmware-${{ inputs.keymap }}-${{ matrix.target }} name: firmware-${{ inputs.keymap }}-${{ matrix.target }}
if-no-files-found: ignore if-no-files-found: ignore
@ -136,17 +136,17 @@ jobs:
steps: steps:
- name: Checkout QMK Firmware - name: Checkout QMK Firmware
uses: actions/checkout@v5 uses: actions/checkout@v4
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v6 uses: actions/download-artifact@v4
with: with:
pattern: firmware-${{ inputs.keymap }}-* pattern: firmware-${{ inputs.keymap }}-*
path: . path: .
merge-multiple: true merge-multiple: true
- name: Upload all firmwares - name: Upload all firmwares
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v4
with: with:
name: firmware-${{ inputs.keymap }} name: firmware-${{ inputs.keymap }}
if-no-files-found: ignore if-no-files-found: ignore

View file

@ -24,7 +24,7 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive

View file

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

View file

@ -30,7 +30,7 @@ jobs:
container: ghcr.io/qmk/qmk_cli container: ghcr.io/qmk/qmk_cli
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 1 fetch-depth: 1
@ -56,7 +56,7 @@ jobs:
- name: Deploy - name: Deploy
if: ${{ github.event_name == 'push' && github.repository == 'qmk/qmk_firmware' }} if: ${{ github.event_name == 'push' && github.repository == 'qmk/qmk_firmware' }}
uses: JamesIves/github-pages-deploy-action@v4.7.4 uses: JamesIves/github-pages-deploy-action@v4.6.3
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages branch: gh-pages

View file

@ -21,7 +21,7 @@ jobs:
- riot - riot
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
token: ${{ secrets.QMK_BOT_TOKEN }} token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0 fetch-depth: 0

View file

@ -10,7 +10,6 @@ on:
- 'lib/arm_atsam/**' - 'lib/arm_atsam/**'
- 'lib/lib8tion/**' - 'lib/lib8tion/**'
- 'lib/python/**' - 'lib/python/**'
- 'modules/**'
- 'platforms/**' - 'platforms/**'
- 'quantum/**' - 'quantum/**'
- 'tests/**' - 'tests/**'
@ -26,7 +25,7 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
@ -36,7 +35,7 @@ jobs:
- name: Get changed files - name: Get changed files
id: file_changes id: file_changes
uses: tj-actions/changed-files@v47 uses: tj-actions/changed-files@v44
with: with:
use_rest_api: true use_rest_api: true

View file

@ -19,7 +19,7 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
@ -39,7 +39,7 @@ jobs:
qmk format-text -a qmk format-text -a
git diff git diff
- uses: rlespinasse/github-slug-action@v5 - uses: rlespinasse/github-slug-action@v3.x
- name: Become QMK Bot - name: Become QMK Bot
run: | run: |
@ -47,7 +47,7 @@ jobs:
git config user.email 'hello@qmk.fm' git config user.email 'hello@qmk.fm'
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v7 uses: peter-evans/create-pull-request@v6
if: ${{ github.repository == 'qmk/qmk_firmware'}} if: ${{ github.repository == 'qmk/qmk_firmware'}}
with: with:
token: ${{ secrets.QMK_BOT_TOKEN }} token: ${{ secrets.QMK_BOT_TOKEN }}

View file

@ -10,4 +10,4 @@ jobs:
pull-requests: write pull-requests: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/labeler@v6 - uses: actions/labeler@v5

View file

@ -18,7 +18,7 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
@ -27,7 +27,7 @@ jobs:
- name: Get changed files - name: Get changed files
id: file_changes id: file_changes
uses: tj-actions/changed-files@v47 uses: tj-actions/changed-files@v44
with: with:
use_rest_api: true use_rest_api: true

View file

@ -19,7 +19,7 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
- name: Run qmk generators - name: Run qmk generators
run: | run: |

View file

@ -19,14 +19,14 @@ jobs:
- name: Disable safe.directory check - name: Disable safe.directory check
run : git config --global --add safe.directory '*' run : git config --global --add safe.directory '*'
- uses: actions/checkout@v5 - uses: actions/checkout@v4
- name: Run qmk generators - name: Run qmk generators
run: | run: |
util/regen.sh util/regen.sh
git diff git diff
- uses: rlespinasse/github-slug-action@v5 - uses: rlespinasse/github-slug-action@v3.x
- name: Become QMK Bot - name: Become QMK Bot
run: | run: |
@ -34,7 +34,7 @@ jobs:
git config user.email 'hello@qmk.fm' git config user.email 'hello@qmk.fm'
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@v7 uses: peter-evans/create-pull-request@v6
if: ${{ github.repository == 'qmk/qmk_firmware'}} if: ${{ github.repository == 'qmk/qmk_firmware'}}
with: with:
token: ${{ secrets.QMK_BOT_TOKEN }} token: ${{ secrets.QMK_BOT_TOKEN }}

Some files were not shown because too many files have changed in this diff Show more