Merge branch 'master' into sjb/all-keyboard

* master: (557 commits) [Keyboard] Add ErgoStrafer keyboard (qmk#21195) [Keyboard] Add ScottoNum macropad (qmk#21208) [Keyboard] Add ScottoFrog macropad (qmk#21209) [Keyboard] Add orba keyboard (qmk#21132) [Keyboard] Add ScottoSplit Keyboard (qmk#20945) [Keyboard] Add Flashquark Horizon Z (qmk#21055) [Keyboard] Add Scotto34 (PCB Edition) (qmk#21085) [Keyboard] Add Scotto9 handwired macropad (qmk#21105) [Keyboard] Add kibou/winter (qmk#21161) [Keyboard] Adding OSAv2 Topre PCB (qmk#21080) Atreyu: correct layout data (qmk#21197) [Keymap] thunderbird2086 layer status with RGB lighting/matrix (qmk#21063) Up keymap (qmk#20769) EC Alveus (qmk#20840) Update newbs docs with some rp2040 stuff (qmk#21186) Typo Correction in planck/rev7 readme.md (qmk#21194) [Keyboard] Add ScottoGame Keyboard (qmk#20940) Remove some keymap-level info.jsons (qmk#21191) Fix typo (qmk#21189) Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (qmk#21175) ...
SjB · Jun 13, 2023 · 9499416 · 9499416
2 parents 35be514 + dabbc93
commit 9499416
Show file tree

Hide file tree

Showing 13,966 changed files with 524,284 additions and 499,616 deletions.
diff --git a/.clangd b/.clangd
@@ -0,0 +1,4 @@
+CompileFlags:
+  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
+  Remove: [-W*, -mcall-prologues]
+  Compiler: clang
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   api_data:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'

diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
@@ -4,6 +4,7 @@ permissions:
   contents: write
 
 on:
+  workflow_dispatch:
   push:
     branches:
     - master
@@ -31,7 +32,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.62.0
+      uses: anothrNick/github-tag-action@1.66.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         keymap: [default, via]
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -18,7 +18,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   generate:
     runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     # protect against those who develop with their fork on master
     if: github.repository == 'qmk/qmk_firmware'
@@ -37,7 +37,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/[email protected].1
+      uses: JamesIves/[email protected].2
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -19,7 +19,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
@@ -35,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v36
 
     - name: Run qmk formatters
       shell: 'bash {0}'

diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
@@ -13,7 +13,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check
@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v36
 
     - name: Print info
       run: |

diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml
@@ -13,7 +13,7 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check

diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
@@ -13,7 +13,7 @@ jobs:
   regen:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - name: Disable safe.directory check

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -23,7 +23,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: qmkfm/qmk_cli
+    container: ghcr.io/qmk/qmk_cli
 
     steps:
     - uses: actions/checkout@v3

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

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

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -26,6 +26,9 @@
     },
     "python.formatting.provider": "yapf",
     "[json]": {
-	    "editor.formatOnSave": false
-    }
+        "editor.formatOnSave": false
+    },
+    "clangd.arguments": [
+        "--header-insertion=never"
+    ]
 }
diff --git a/Dockerfile b/Dockerfile
diff --git a/Vagrantfile b/Vagrantfile
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
@@ -343,6 +343,15 @@ $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
 
 generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 
+generated-files: $(KEYMAP_OUTPUT)/src/info_deps.d
+
+$(KEYMAP_OUTPUT)/src/info_deps.d:
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-make-dependencies -kb $(KEYBOARD) -km $(KEYMAP) -o $(KEYMAP_OUTPUT)/src/info_deps.d)
+	@$(BUILD_CMD)
+
+-include $(KEYMAP_OUTPUT)/src/info_deps.d
+
 .INTERMEDIATE : generated-files
 
 # Userspace setup and definitions
@@ -446,6 +455,14 @@ $(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))
 
+# 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)

diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk
@@ -75,6 +75,10 @@ $(TEST)_SRC += \
 	tests/test_common/main.cpp \
 	$(QUANTUM_PATH)/logging/print.c
 
+ifneq ($(strip $(INTROSPECTION_KEYMAP_C)),)
+$(TEST)_DEFS += -DINTROSPECTION_KEYMAP_C=\"$(strip $(INTROSPECTION_KEYMAP_C))\"
+endif
+
 $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
 $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
 $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ quantum/version.h @@
     .idea/
     .project
     .settings/
-    .vagrant/
     # ?
     .dep
@@ Expand Down @@