Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b8d7f28
Merge: ae1e6b7 38700f7
Author: QMK Bot <hello@qmk.fm>
Date:   Tue Apr 11 01:44:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 38700f7
Author: Joel Challis <git@zvecr.com>
Date:   Tue Apr 11 02:43:45 2023 +0100

    Reject info.json at keymap level (qmk#20408)

commit ae1e6b7
Merge: 6f77559 ed72c42
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 22:50:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ed72c42
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 10 23:49:53 2023 +0100

    Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407)

    Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.62.0.
    - [Release notes](https://github.com/anothrNick/github-tag-action/releases)
    - [Commits](anothrNick/github-tag-action@1.61.0...1.62.0)

    ---
    updated-dependencies:
    - dependency-name: anothrNick/github-tag-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6f77559
Merge: d3b8179 bc6db28
Author: QMK Bot <hello@qmk.fm>
Date:   Mon Apr 10 19:33:02 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit bc6db28
Author: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Date:   Tue Apr 11 03:32:16 2023 +0800

    [Keyboard] Update angle65 VID/PID (qmk#20401)

commit d3b8179
Author: Ricardo Hermida Ruiz <rhruiz@gmail.com>
Date:   Mon Apr 10 09:45:25 2023 -0300

    Prevent Tri-Layer keys from stopping caps words (qmk#20398)
  • Loading branch information
freznel10 committed Apr 11, 2023
1 parent d5632cd commit 04ba651
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fetch-depth: 0

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.61.0
uses: anothrNick/github-tag-action@1.62.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: 'patch'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ quantum/version.h
*.qmk
*.uf2

# DD config at wrong location
/keyboards/**/keymaps/*/info.json

# Old-style QMK Makefiles
/keyboards/**/Makefile

Expand Down
4 changes: 2 additions & 2 deletions keyboards/vertex/angle65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"url": "",
"maintainer": "EasonQian1, Vertex-kb",
"usb": {
"vid": "0x7374",
"pid": "0x9770",
"vid": "0x9954",
"pid": "0x9970",
"device_version": "0.0.1"
},
"processor": "STM32F103",
Expand Down
1 change: 1 addition & 0 deletions quantum/process_keycode/process_caps_word.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
// Ignore AltGr.
case KC_RALT:
case OSM(MOD_RALT):
Expand Down
5 changes: 5 additions & 0 deletions tests/caps_word/test_caps_word.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,11 @@ INSTANTIATE_TEST_CASE_P(
"OSL", OSL(1), 1, KC_NO, true},
CapsWordPressUserParams{
"LT_held", LT_1_KC_A, TAPPING_TERM + 1, KC_NO, true},
// Tri-Layer keys are ignored and continue Caps Word.
CapsWordPressUserParams{
"TL_LOWR", TL_LOWR, 1, KC_NO, true},
CapsWordPressUserParams{
"TL_UPPR", TL_UPPR, 1, KC_NO, true},
// AltGr keys are ignored and continue Caps Word.
CapsWordPressUserParams{
"KC_RALT", KC_RALT, 1, KC_NO, true},
Expand Down

0 comments on commit 04ba651

Please sign in to comment.