Merge branch 'main' into disable-endpoint-fallback

.devcontainer/devcontainer.json

@@ -9,6 +9,7 @@
   "mounts": [
     "type=volume,source=zmk-root-user,target=/root",
     "type=volume,source=zmk-config,target=/workspaces/zmk-config",
+    "type=volume,source=zmk-modules,target=/workspaces/zmk-modules",
     "type=volume,source=zmk-zephyr,target=${containerWorkspaceFolder}/zephyr",
     "type=volume,source=zmk-zephyr-modules,target=${containerWorkspaceFolder}/modules",
     "type=volume,source=zmk-zephyr-tools,target=${containerWorkspaceFolder}/tools"

.github/dependabot.yml

@@ -8,3 +8,50 @@ updates:
     directory: "/docs"
     schedule:
       interval: "daily"
+    groups:
+      docusaurus-major:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        patterns:
+          - "@docusaurus/*"
+        update-types:
+          - "major"
+      docusaurus-minor-patch:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        patterns:
+          - "@docusaurus/*"
+        update-types:
+          - "minor"
+          - "patch"
+      tree-sitter:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        patterns:
+          - "tree-sitter-devicetree"
+          - "web-tree-sitter"
+      prod-other-major:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        exclude-patterns:
+          - "@docusaurus/*"
+          - "tree-sitter-devicetree"
+          - "web-tree-sitter"
+        update-types:
+          - "major"
+      prod-other-minor-patch:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        exclude-patterns:
+          - "@docusaurus/*"
+          - "tree-sitter-devicetree"
+          - "web-tree-sitter"
+        update-types:
+          - "minor"
+          - "patch"
+      development:
+        applies-to: "version-updates"
+        dependency-type: "development"
+        update-types:
+          - "minor"
+          - "patch"

.github/pull_request_template.md

@@ -1,15 +1,8 @@
-<!-- If you're adding a board/shield please fill out this check-list, otherwise you can delete it -->
+<!-- Note: ZMK is generally not accepting PRs for new keyboards. New generic controller PRs *may* still be accepted, please discuss on the Discord server first. -->
 
-## Board/Shield Check-list
+## PR check-list
 
-- [ ] This board/shield is tested working on real hardware
-- [ ] Definitions follow the general style of other shields/boards upstream ([Reference](https://zmk.dev/docs/development/new-shield))
-- [ ] `.zmk.yml` metadata file added
+- [ ] Branch has a [clean commit history](https://zmk.dev/docs/development/contributing/pull-requests#clean-commit-history)
+- [ ] Additional tests are included, if changing behaviors/core code that is testable.
 - [ ] Proper Copyright + License headers added to applicable files (Generally, we stick to "The ZMK Contributors" for copyrights to help avoid churn when files get edited)
-- [ ] General consistent formatting of DeviceTree files
-- [ ] Keymaps do not use deprecated key defines (Check using the [upgrader tool](https://zmk.dev/docs/codes/keymap-upgrader))
-- [ ] `&pro_micro` used in favor of `&pro_micro_d/a` if applicable
-- [ ] If split, no name added for the right/peripheral half
-- [ ] Kconfig.defconfig file correctly wraps _all_ configuration in conditional on the shield symbol
-- [ ] `.conf` file has optional extra features commented out
-- [ ] Keyboard/PCB is part of a shipped group buy or is generally available in stock to purchase (OSH/personal projects without general availability should create a zmk-config repo instead)
+- [ ] [Pre-commit](https://zmk.dev/docs/development/local-toolchain/pre-commit) used to check formatting of files, commit messages, etc.

.github/workflows/release-please.yml

@@ -0,0 +1,38 @@
+on:
+  push:
+    branches:
+      - main
+      - "v*.*-branch"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: release-please
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with:
+          token: ${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}
+          target-branch: ${{ github.ref_name }}
+      - uses: actions/checkout@v4
+        if: ${{ steps.release.outputs.release_created }}
+      - name: create major, minor branch
+        if: ${{ steps.release.outputs.release_created && steps.release.outputs.patch == '0' }}
+        run: |
+          git remote add gh-token-branch "https://x-access-token:${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}@github.com/${{ github.repository }}.git"
+          git checkout -b v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}-branch
+          git push gh-token-branch v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}-branch
+      - name: tag major and minor versions
+        if: ${{ steps.release.outputs.release_created }}
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+          git remote add gh-token "https://x-access-token:${{ secrets.ZMK_RELEASE_PLEASE_TOKEN }}@github.com/${{ github.repository }}.git"
+          git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
+          git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
+          git push --force gh-token v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}

.gitlint

@@ -0,0 +1,138 @@
+# Edit this file as you like.
+#
+# All these sections are optional. Each section with the exception of [general] represents
+# one rule and each key in it is an option for that specific rule.
+#
+# Rules and sections can be referenced by their full name or by id. For example
+# section "[body-max-line-length]" could also be written as "[B1]". Full section names are
+# used in here for clarity.
+#
+[general]
+# Ignore certain rules, this example uses both full name and id
+# ignore=title-trailing-punctuation, T3
+
+# verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
+# verbosity = 2
+
+# By default gitlint will ignore merge, revert, fixup, fixup=amend, and squash commits.
+# ignore-merge-commits=true
+# ignore-revert-commits=true
+# ignore-fixup-commits=true
+# ignore-fixup-amend-commits=true
+# ignore-squash-commits=true
+
+# Ignore any data sent to gitlint via stdin
+# ignore-stdin=true
+
+# Fetch additional meta-data from the local repository when manually passing a
+# commit message to gitlint via stdin or --commit-msg. Disabled by default.
+# staged=true
+
+# Hard fail when the target commit range is empty. Note that gitlint will
+# already fail by default on invalid commit ranges. This option is specifically
+# to tell gitlint to fail on *valid but empty* commit ranges.
+# Disabled by default.
+# fail-without-commits=true
+
+# Whether to use Python `search` instead of `match` semantics in rules that use
+# regexes. Context: https://github.com/jorisroovers/gitlint/issues/254
+# Disabled by default, but will be enabled by default in the future.
+# regex-style-search=true
+
+# Enable debug mode (prints more output). Disabled by default.
+# debug=true
+
+# Enable community contributed rules
+# See http://jorisroovers.github.io/gitlint/contrib_rules for details
+contrib=contrib-title-conventional-commits,CT1,contrib-disallow-cleanup-commits,CC2
+
+# Set the extra-path where gitlint will search for user defined rules
+# See http://jorisroovers.github.io/gitlint/user_defined_rules for details
+# extra-path=examples/
+
+[title-max-length]
+line-length=80
+
+# Conversely, you can also enforce minimal length of a title with the
+# "title-min-length" rule:
+# [title-min-length]
+# min-length=5
+
+# [title-must-not-contain-word]
+# Comma-separated list of words that should not occur in the title. Matching is case
+# insensitive. It's fine if the keyword occurs as part of a larger word (so "WIPING"
+# will not cause a violation, but "WIP: my title" will.
+# words=wip
+
+# [title-match-regex]
+# python-style regex that the commit-msg title must match
+# Note that the regex can contradict with other rules if not used correctly
+# (e.g. title-must-not-contain-word).
+# regex=^US[0-9]*
+
+# [body-max-line-length]
+# line-length=72
+
+# [body-min-length]
+# min-length=5
+
+# [body-is-missing]
+# Whether to ignore this rule on merge commits (which typically only have a title)
+# default = True
+# ignore-merge-commits=false
+
+# [body-changed-file-mention]
+# List of files that need to be explicitly mentioned in the body when they are changed
+# This is useful for when developers often erroneously edit certain files or git submodules.
+# By specifying this rule, developers can only change the file when they explicitly reference
+# it in the commit message.
+# files=gitlint-core/gitlint/rules.py,README.md
+
+# [body-match-regex]
+# python-style regex that the commit-msg body must match.
+# E.g. body must end in My-Commit-Tag: foo
+# regex=My-Commit-Tag: foo$
+
+# [author-valid-email]
+# python-style regex that the commit author email address must match.
+# For example, use the following regex if you only want to allow email addresses from foo.com
+# regex=[^@]+@foo.com
+
+# [ignore-by-title]
+# Ignore certain rules for commits of which the title matches a regex
+# E.g. Match commit titles that start with "Release"
+# regex=^Release(.*)
+
+# Ignore certain rules, you can reference them by their id or by their full name
+# Use 'all' to ignore all rules
+# ignore=T1,body-min-length
+
+# [ignore-by-body]
+# Ignore certain rules for commits of which the body has a line that matches a regex
+# E.g. Match bodies that have a line that that contain "release"
+# regex=(.*)release(.*)
+#
+# Ignore certain rules, you can reference them by their id or by their full name
+# Use 'all' to ignore all rules
+# ignore=T1,body-min-length
+
+# [ignore-body-lines]
+# Ignore certain lines in a commit body that match a regex.
+# E.g. Ignore all lines that start with 'Co-Authored-By'
+# regex=^Co-Authored-By
+
+# [ignore-by-author-name]
+# Ignore certain rules for commits of which the author name matches a regex
+# E.g. Match commits made by dependabot
+# regex=(.*)dependabot(.*)
+#
+# Ignore certain rules, you can reference them by their id or by their full name
+# Use 'all' to ignore all rules
+# ignore=T1,body-min-length
+
+# This is a contrib rule - a community contributed rule. These are disabled by default.
+# You need to explicitly enable them one-by-one by adding them to the "contrib" option
+# under [general] section above.
+# [contrib-title-conventional-commits]
+# Specify allowed commit types. For details see: https://www.conventionalcommits.org/
+# types = bugfix,user-story,epic

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     rev: v1.5.1
     hooks:
       - id: remove-tabs
-        exclude: "vendor-prefixes\\.txt$"
+        exclude: "vendor-prefixes\\.txt$|.git/COMMIT_EDITMSG"
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v18.1.8
     hooks:
@@ -16,9 +16,19 @@ repos:
     rev: v2.7.1
     hooks:
       - id: prettier
+        exclude: |
+          (?x)^(
+              .git/COMMIT_EDITMSG|
+              CHANGELOG.md|
+              .release-please-manifest.json
+          )$
         # Workaround for https://github.com/pre-commit/mirrors-prettier/issues/29
         additional_dependencies:
           - prettier@2.8.7
+  - repo: https://github.com/jorisroovers/gitlint
+    rev: v0.19.1
+    hooks:
+      - id: gitlint
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:

.release-please-manifest.json

@@ -0,0 +1 @@
+{}

app/VERSION

@@ -0,0 +1,13 @@
+# x-release-please-start-major
+VERSION_MAJOR = 0
+# x-release-please-end
+
+# x-release-please-start-minor
+VERSION_MINOR = 0
+# x-release-please-end
+
+# x-release-please-start-patch
+PATCHLEVEL = 1
+# x-release-please-end
+
+VERSION_TWEAK = 0

app/boards/arm/adv360pro/adv360pro-layouts.dtsi

@@ -0,0 +1,87 @@
+#include <physical_layouts.dtsi>
+
+/ {
+    physical_layout0: physical_layout_0 {
+        compatible = "zmk,physical-layout";
+        display-name = "Default";
+
+        keys  //                     w   h    x    y     rot    rx    ry
+            = <&key_physical_attrs 125 100    0   25       0     0     0>
+            , <&key_physical_attrs 100 100  125   25       0     0     0>
+            , <&key_physical_attrs 100 100  225    0       0     0     0>
+            , <&key_physical_attrs 100 100  325    0       0     0     0>
+            , <&key_physical_attrs 100 100  425    0       0     0     0>
+            , <&key_physical_attrs 100 100  525    0       0     0     0>
+            , <&key_physical_attrs 100 100  625    0       0     0     0>
+            , <&key_physical_attrs 100 100 1075    0       0     0     0>
+            , <&key_physical_attrs 100 100 1175    0       0     0     0>
+            , <&key_physical_attrs 100 100 1275    0       0     0     0>
+            , <&key_physical_attrs 100 100 1375    0       0     0     0>
+            , <&key_physical_attrs 100 100 1475    0       0     0     0>
+            , <&key_physical_attrs 100 100 1575   25       0     0     0>
+            , <&key_physical_attrs 125 100 1675   25       0     0     0>
+            , <&key_physical_attrs 125 100    0  125       0     0     0>
+            , <&key_physical_attrs 100 100  125  125       0     0     0>
+            , <&key_physical_attrs 100 100  225  100       0     0     0>
+            , <&key_physical_attrs 100 100  325  100       0     0     0>
+            , <&key_physical_attrs 100 100  425  100       0     0     0>
+            , <&key_physical_attrs 100 100  525  100       0     0     0>
+            , <&key_physical_attrs 100 100  625  100       0     0     0>
+            , <&key_physical_attrs 100 100 1075  100       0     0     0>
+            , <&key_physical_attrs 100 100 1175  100       0     0     0>
+            , <&key_physical_attrs 100 100 1275  100       0     0     0>
+            , <&key_physical_attrs 100 100 1375  100       0     0     0>
+            , <&key_physical_attrs 100 100 1475  100       0     0     0>
+            , <&key_physical_attrs 100 100 1575  125       0     0     0>
+            , <&key_physical_attrs 125 100 1675  125       0     0     0>
+            , <&key_physical_attrs 125 100    0  225       0     0     0>
+            , <&key_physical_attrs 100 100  125  225       0     0     0>
+            , <&key_physical_attrs 100 100  225  200       0     0     0>
+            , <&key_physical_attrs 100 100  325  200       0     0     0>
+            , <&key_physical_attrs 100 100  425  200       0     0     0>
+            , <&key_physical_attrs 100 100  525  200       0     0     0>
+            , <&key_physical_attrs 100 100  625  200       0     0     0>
+            , <&key_physical_attrs 100 100  675  400    1500   525   400>
+            , <&key_physical_attrs 100 100  775  400    1500   525   400>
+            , <&key_physical_attrs 100 100  925  400 (-1500)  1275   400>
+            , <&key_physical_attrs 100 100 1025  400 (-1500)  1275   400>
+            , <&key_physical_attrs 100 100 1075  200       0     0     0>
+            , <&key_physical_attrs 100 100 1175  200       0     0     0>
+            , <&key_physical_attrs 100 100 1275  200       0     0     0>
+            , <&key_physical_attrs 100 100 1375  200       0     0     0>
+            , <&key_physical_attrs 100 100 1475  200       0     0     0>
+            , <&key_physical_attrs 100 100 1575  225       0     0     0>
+            , <&key_physical_attrs 125 100 1675  225       0     0     0>
+            , <&key_physical_attrs 125 100    0  325       0     0     0>
+            , <&key_physical_attrs 100 100  125  325       0     0     0>
+            , <&key_physical_attrs 100 100  225  300       0     0     0>
+            , <&key_physical_attrs 100 100  325  300       0     0     0>
+            , <&key_physical_attrs 100 100  425  300       0     0     0>
+            , <&key_physical_attrs 100 100  525  300       0     0     0>
+            , <&key_physical_attrs 100 100  775  500    1500   525   400>
+            , <&key_physical_attrs 100 100  925  500 (-1500)  1275   400>
+            , <&key_physical_attrs 100 100 1175  300       0     0     0>
+            , <&key_physical_attrs 100 100 1275  300       0     0     0>
+            , <&key_physical_attrs 100 100 1375  300       0     0     0>
+            , <&key_physical_attrs 100 100 1475  300       0     0     0>
+            , <&key_physical_attrs 100 100 1575  325       0     0     0>
+            , <&key_physical_attrs 125 100 1675  325       0     0     0>
+            , <&key_physical_attrs 125 100    0  425       0     0     0>
+            , <&key_physical_attrs 100 100  125  425       0     0     0>
+            , <&key_physical_attrs 100 100  225  400       0     0     0>
+            , <&key_physical_attrs 100 100  325  400       0     0     0>
+            , <&key_physical_attrs 100 100  425  400       0     0     0>
+            , <&key_physical_attrs 100 200  575  500    1500   525   400>
+            , <&key_physical_attrs 100 200  675  500    1500   525   400>
+            , <&key_physical_attrs 100 100  775  600    1500   525   400>
+            , <&key_physical_attrs 100 100  925  600 (-1500)  1275   400>
+            , <&key_physical_attrs 100 200 1025  500 (-1500)  1275   400>
+            , <&key_physical_attrs 100 200 1125  500 (-1500)  1275   400>
+            , <&key_physical_attrs 100 100 1275  400       0     0     0>
+            , <&key_physical_attrs 100 100 1375  400       0     0     0>
+            , <&key_physical_attrs 100 100 1475  400       0     0     0>
+            , <&key_physical_attrs 100 100 1575  425       0     0     0>
+            , <&key_physical_attrs 125 100 1675  425       0     0     0>
+            ;
+    };
+};