Squashed commit of the following:

commit b8c9cb8 Merge: cfa473e 61f3f56 Author: QMK Bot <[email protected]> Date: Mon Mar 6 01:28:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 61f3f56 Author: Leon Anavi <[email protected]> Date: Mon Mar 6 03:28:01 2023 +0200 keyboards/anavi: Add ANAVI Knobs 3 (qmk#18624) commit cfa473e Merge: 23c365b 500c4b7 Author: QMK Bot <[email protected]> Date: Sun Mar 5 23:08:22 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 500c4b7 Author: Joel Challis <[email protected]> Date: Sun Mar 5 23:07:47 2023 +0000 Reject VIA keys within info.json (qmk#20026) commit 23c365b Author: Ryan <[email protected]> Date: Mon Mar 6 09:53:52 2023 +1100 Move matrix config to info.json, part 1 (qmk#19985) commit b34d51d Merge: 8075eb5 07b7fed Author: QMK Bot <[email protected]> Date: Sun Mar 5 13:29:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 07b7fed Author: Sergey Vlasov <[email protected]> Date: Sun Mar 5 16:29:10 2023 +0300 Unbreak switchplate/southpaw_65 after qmk#16277 (qmk#20015) Apparently the changes done in qmk#16277 swapped the values read from the PCA9555 expanders by mistake, which resulted in mixed up matrix columns. Fix the chip and register addresses to match the original code. commit 8075eb5 Merge: fab04ef 77f7351 Author: QMK Bot <[email protected]> Date: Sat Mar 4 00:53:53 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 77f7351 Author: lalalademaxiya1 <[email protected]> Date: Sat Mar 4 08:53:09 2023 +0800 Add Keychron Q12 (qmk#19844) Co-authored-by: Ryan <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> commit fab04ef Merge: 3290bc7 127b53b Author: QMK Bot <[email protected]> Date: Fri Mar 3 23:04:40 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 127b53b Author: Elliot Powell <[email protected]> Date: Fri Mar 3 23:04:00 2023 +0000 Add Support for Lilly58 r2g (qmk#19862) * Add support for lilly58 r2g by Mechboards commit 3290bc7 Merge: 3be5d90 95dd573 Author: QMK Bot <[email protected]> Date: Fri Mar 3 22:02:32 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 95dd573 Author: Guillermo Aguirre <[email protected]> Date: Fri Mar 3 19:01:22 2023 -0300 Add new keymap for Preonic rev3 (qmk#19706) commit 3be5d90 Author: Joel Challis <[email protected]> Date: Fri Mar 3 17:50:40 2023 +0000 Remove some use of keymap.h (qmk#20006) commit c3c40df Author: Joel Challis <[email protected]> Date: Fri Mar 3 11:26:53 2023 +0000 Remove some use of keymap.h (qmk#19980) commit 6676cc1 Merge: 4cf8f69 d1a430b Author: QMK Bot <[email protected]> Date: Fri Mar 3 03:16:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit d1a430b Author: Nick Brassel <[email protected]> Date: Fri Mar 3 14:16:32 2023 +1100 Initial deprecation policy documentation. (qmk#19908) commit 4cf8f69 Author: Nick Brassel <[email protected]> Date: Fri Mar 3 14:16:18 2023 +1100 Remove Vagrant due to bit-rot. (qmk#20000) commit 7ebb8c2 Author: Nick Brassel <[email protected]> Date: Fri Mar 3 14:16:06 2023 +1100 Update branch names to reflect configurator's new deployment. (qmk#19999) commit be78192 Author: Joel Challis <[email protected]> Date: Thu Mar 2 23:26:37 2023 +0000 Merge upstream changes to uf2conv (qmk#19993) commit 0a7f159 Merge: 500da8e 6fabc33 Author: QMK Bot <[email protected]> Date: Wed Mar 1 23:57:53 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 6fabc33 Author: Ryan <[email protected]> Date: Thu Mar 2 10:56:45 2023 +1100 Check all keys have matrix positions when parsing C LAYOUT macros (qmk#19781) commit 500da8e Merge: a83cb60 80c6fba Author: QMK Bot <[email protected]> Date: Wed Mar 1 17:54:11 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 80c6fba Author: Albert Y <[email protected]> Date: Thu Mar 2 01:53:31 2023 +0800 [Keyboard] Clean up contra & move to data-driven (qmk#19973) Co-authored-by: Joel Challis <[email protected]> commit a83cb60 Merge: c9b49cd f639089 Author: QMK Bot <[email protected]> Date: Wed Mar 1 17:50:14 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit f639089 Author: David Rambo <[email protected]> Date: Wed Mar 1 09:49:33 2023 -0800 [Keymap] Add davidrambo lulu keymap (qmk#19448) Co-authored-by: Joel Challis <[email protected]> commit c9b49cd Merge: 512c119 aeb3ed6 Author: QMK Bot <[email protected]> Date: Wed Mar 1 17:06:15 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit aeb3ed6 Author: Paul Enrico N. Viola <[email protected]> Date: Thu Mar 2 01:05:36 2023 +0800 added Polly40 keyboard (qmk#19936) Co-authored-by: Ryan <[email protected]> Co-authored-by: jack <[email protected]> commit 512c119 Merge: 9b09e7c 3fc9c03 Author: QMK Bot <[email protected]> Date: Wed Mar 1 02:56:03 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 3fc9c03 Author: Joel Challis <[email protected]> Date: Wed Mar 1 02:55:14 2023 +0000 Remove `all` from list of animations in `info.json` (qmk#19978) commit 9b09e7c Author: Ryan <[email protected]> Date: Wed Mar 1 12:51:18 2023 +1100 Check all rows have the correct number of columns when parsing `g_led_config` (qmk#19954) commit f1894e4 Author: Huckies <[email protected]> Date: Wed Mar 1 09:44:40 2023 +0800 Improve robustness of AW20216 driver (qmk#19849) * added soft reset and auto lowpower for AW20216 commit 791ab00 Merge: c9b206f 5372706 Author: QMK Bot <[email protected]> Date: Tue Feb 28 20:29:48 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 5372706 Author: Joel Challis <[email protected]> Date: Tue Feb 28 20:27:11 2023 +0000 Disable safe.directory check (qmk#19970) commit c9b206f Merge: 7a518e5 d35cdcc Author: QMK Bot <[email protected]> Date: Tue Feb 28 20:25:54 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit d35cdcc Author: gkeyboard <[email protected]> Date: Wed Mar 1 03:24:35 2023 +0700 [Keyboard] Add GPAD8-2R (gpad8_2r) Macro Pad (qmk#19914) Co-authored-by: jack <[email protected]> commit 7a518e5 Merge: 0472399 b85a9ab Author: QMK Bot <[email protected]> Date: Tue Feb 28 20:24:24 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit b85a9ab Author: Michal S <[email protected]> Date: Tue Feb 28 20:23:47 2023 +0000 [Keymap] sofle/keymaps/michal: rewrite (qmk#19938) commit 0472399 Merge: 209e652 ee90ad2 Author: QMK Bot <[email protected]> Date: Tue Feb 28 20:23:02 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit ee90ad2 Author: studiokestra <[email protected]> Date: Tue Feb 28 13:22:14 2023 -0700 [Keyboard] Add FRL84 PCB. (qmk#19942) Co-authored-by: jack <[email protected]> commit 209e652 Merge: fc05929 e142543 Author: QMK Bot <[email protected]> Date: Tue Feb 28 20:10:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit e142543 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 28 20:10:08 2023 +0000 Bump tj-actions/changed-files from 34 to 35 (qmk#19971) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 34 to 35. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@v34...v35) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit fc05929 Author: Joel Challis <[email protected]> Date: Tue Feb 28 19:15:54 2023 +0000 Strip whitespace from CONVERT_TO variables (qmk#19948) commit 184c1e5 Merge: 7a82652 0596720 Author: QMK Bot <[email protected]> Date: Tue Feb 28 19:15:33 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 0596720 Author: Shawn Meier <[email protected]> Date: Tue Feb 28 12:15:19 2023 -0700 [Keyboard] remove non-existent method from ploopy documentation (qmk#19957) commit 0514011 Author: Drashna Jaelre <[email protected]> Date: Tue Feb 28 11:14:48 2023 -0800 [Keymap] Drashna updates for 0.20.0 (qmk#19960) commit 7a82652 Author: Ryan <[email protected]> Date: Wed Mar 1 02:06:11 2023 +1100 Remove `"w":1` and `"h":1` from info.json (qmk#19961) commit bfeccf3 Merge: 4ac8476 05631b2 Author: QMK Bot <[email protected]> Date: Tue Feb 28 14:19:21 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 05631b2 Author: Joel Challis <[email protected]> Date: Tue Feb 28 14:18:43 2023 +0000 Flag "builddefs" as core changes (qmk#19950)
freznel10 · Mar 6, 2023 · 7de0858 · 7de0858
1 parent d57a142
commit 7de0858
Show file tree

Hide file tree

Showing 812 changed files with 11,217 additions and 9,814 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -5,6 +5,7 @@ core:
   - tests/**/*
   - util/**/*
   - platforms/**/*
+  - builddefs/**/*
   - Makefile
   - '*.mk'
 dependencies:

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -21,9 +21,13 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
     - name: Run tests

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -22,6 +22,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -32,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v34
+      uses: tj-actions/changed-files@v35
 
     - name: Run qmk formatters
       shell: 'bash {0}'

diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
@@ -16,6 +16,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,6 +15,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -24,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v34
+      uses: tj-actions/changed-files@v35
 
     - name: Print info
       run: |

diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml
@@ -16,6 +16,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
 
     - name: Run qmk generators

diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
@@ -16,6 +16,9 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
+    - name: Disable safe.directory check
+      run : git config --global --add safe.directory '*'
+
     - uses: actions/checkout@v3
 
     - name: Run qmk generators

diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,6 @@ quantum/version.h
 .idea/
 .project
 .settings/
-.vagrant/
 
 # ?
 .dep

diff --git a/Vagrantfile b/Vagrantfile
diff --git a/builddefs/converters.mk b/builddefs/converters.mk
@@ -7,7 +7,12 @@ endif
 
 # TODO: opt in rather than assume everything uses a pro micro
 PIN_COMPATIBLE ?= promicro
+
+# Remove whitespace from any rule.mk provided vars
+#   - env cannot be overwritten but cannot have whitespace anyway
+CONVERT_TO:=$(strip $(CONVERT_TO))
 ifneq ($(CONVERT_TO),)
+
     # stash so we can overwrite env provided vars if needed
     ACTIVE_CONVERTER=$(CONVERT_TO)
 
@@ -23,13 +28,13 @@ ifneq ($(CONVERT_TO),)
     TARGET := $(TARGET)_$(CONVERT_TO)
 
     # Configure any defaults
-    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
-    OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
+    OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')
+    OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\"
     OPT_DEFS += -DCONVERTER_ENABLED
     VPATH += $(CONVERTER)
 
     # Configure for "alias" - worst case it produces an idential define
-    OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERT_TO_$(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')
 
     # Finally run any converter specific logic
     include $(CONVERTER)/converter.mk

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -23,6 +23,7 @@
         }
     },
     "type": "object",
+    "not": { "required": [ "vendorId", "productId" ] }, // reject via keys...
     "properties": {
         "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
         "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"},

diff --git a/docs/_summary.md b/docs/_summary.md
@@ -41,7 +41,6 @@
     * [Keymap Overview](keymap.md)
     * Development Environments
       * [Docker Guide](getting_started_docker.md)
-      * [Vagrant Guide](getting_started_vagrant.md)
     * Flashing
       * [Flashing](flashing.md)
       * [Flashing ATmega32A (ps2avrgb)](flashing_bootloadhid.md)

diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
@@ -34,7 +34,7 @@ The next Breaking Change is scheduled for May 28, 2023.
 
 ## What changes will be included?
 
-To see a list of breaking changes merge candidates you can look at the [`core` label](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Acore+is%3Apr). This label is applied whenever a PR is raised or changed, but only if the PR includes changes to core areas of QMK Firmware. A PR with that label applied is not guaranteed to be merged in the current cycle. New changes might be added between now and when `develop` is closed, and it is generally the responsibility of the submitter to handle conflicts. There is also another label used by QMK Collaborators -- `breaking_change_YYYYqN` -- which signifies to maintainers that it is a strong candidate for inclusion, and should be prioritised for review.
+To see a list of breaking changes merge candidates you can look at the [`core` label](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Acore+is%3Apr). This label is applied whenever a PR is raised or changed, but only if the PR includes changes to core areas of QMK Firmware. A PR with that label applied is not guaranteed to be merged in the current cycle. New changes might be added between now and when `develop` is closed, and it is generally the responsibility of the submitter to handle conflicts. There is also another label used by QMK Collaborators -- `breaking_change_YYYYqN` -- which signifies to maintainers that it is a strong candidate for inclusion, and should be prioritized for review.
 
 If you want your breaking change to be included in this round you need to create a PR and have it accepted by QMK Collaborators before `develop` closes. After `develop` closes, new submissions will be deferred to the next breaking changes cycle.
 
@@ -127,12 +127,12 @@ This happens immediately after the previous `develop` branch is merged to `maste
     * Validate each submodule SHA1 matches the qmk fork, e.g. for ChibiOS:
         * Go to [qmk/ChibiOS](https://github.com/qmk/ChibiOS)
         * Compare the commit hash in the above output to the commit hash in the repository
-        * If there's a mismatch, that repository needs to have its `master` branch updated to match (otherwise Configurator won't work):
+        * If there's a mismatch, that repository needs to have its `qmk-master` branch updated to match (otherwise Configurator won't work):
             * `cd lib/chibios`
             * `git fetch --all`
-            * `git checkout master`
+            * `git checkout qmk-master`
             * `git reset --hard <commit hash>`
-            * `git push origin master --force-with-lease`
+            * `git push origin qmk-master --force-with-lease`
 
 * Announce that both `master` and `develop` are now unlocked -- message `@Breaking Changes Updates` on `#qmk_firmware` in Discord:
     * `@Breaking Changes Updates -- Hey folks, develop has now been merged into master -- newest batch of changes are now available for everyone to use!`

diff --git a/docs/chibios_upgrade_instructions.md b/docs/chibios_upgrade_instructions.md
@@ -4,7 +4,7 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra
 
 ## Getting ChibiOS
 
-* `svn` Initialisation:
+* `svn` Initialization:
     * Only needed to be done once
     * You might need to separately install `git-svn` package in your OS's package manager
     * `git svn init --stdlayout --prefix='svn/' http://svn.osdn.net/svnroot/chibios/`
@@ -21,7 +21,7 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra
 
 ## Getting ChibiOS-Contrib
 
-* `git` Initialisation:
+* `git` Initialization:
     * `git clone [email protected]:qmk/ChibiOS-Contrib`
     * `git remote add upstream https://github.com/ChibiOS/ChibiOS-Contrib`
     * `git checkout -b chibios-20.3.x upstream/chibios-20.3.x`
@@ -57,3 +57,16 @@ ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a bra
     * `git commit -am 'Update ChibiOS to 99.9.9'`
     * `git push --set-upstream origin chibios-version-bump`
 * Make a PR to qmk_firmware with the new branch
+
+## When merging a PR containing an upgrade of ChibiOS/ChibiOS-Contrib:
+
+* Update the target branch if the merge target was `master`:
+    * `git checkout qmk-master`
+    * `git reset --hard develop_YYYY_qN`
+    * `git push origin qmk-master --force-with-lease`
+* Update the target branch if the merge target was `develop`:
+    * `git checkout qmk-develop`
+    * `git reset --hard develop_YYYY_qN`
+    * `git push origin qmk-develop --force-with-lease`
+
+Note that when merging `develop` to `master`, the first workflow should still be followed.
diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md
diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md
@@ -38,7 +38,6 @@
     * [キーマップの概要](ja/keymap.md)
     * 開発環境
       * [Docker のガイド](ja/getting_started_docker.md)
-      * [Vagrant のガイド](ja/getting_started_vagrant.md)
     * 書き込み
       * [書き込み](ja/flashing.md)
       * [ATmega32A の書き込み (ps2avrgb)](ja/flashing_bootloadhid.md)
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,6 @@ quantum/version.h @@
     .idea/
     .project
     .settings/
-    .vagrant/
     # ?
     .dep
@@ Expand Down @@