Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 550ac2a95ca0f6fdd6351e495d4f2a0fd6401b46
Author: freznel10 <[email protected]>
Date:   Mon May 8 17:34:52 2023 +0800

    new

commit e5816f1bfe8915c908715ce05d33e6a0fab01c2a
Author: freznel10 <[email protected]>
Date:   Mon May 8 17:33:02 2023 +0800

    Squashed commit of the following:

    commit 3ae915bfd762785b22f4fba919a022ddb7830fe6
    Author: Stefan Kerkmann <[email protected]>
    Date:   Tue May 2 18:47:23 2023 +0200

        Add combo unit-tests and hot-fix process_record_tap_hint

        ...as this function tries to lookup the combo keys passed in. This will
        be refactored in a later pr.

    commit 45f17ac
    Author: Pete Sevander <[email protected]>
    Date:   Tue May 2 10:02:29 2023 +0300

        Update quantum/process_keycode/process_combo.c

        Co-authored-by: Sergey Vlasov <[email protected]>

    commit 109342a
    Author: Pete Sevander <[email protected]>
    Date:   Tue May 2 09:27:57 2023 +0300

        Fix formatting

    commit 42211c3
    Author: Pete Sevander <[email protected]>
    Date:   Tue May 2 09:20:15 2023 +0300

        Add keyevent for combo keyrecord

commit a8f1113
Author: James Young <[email protected]>
Date:   Sun May 7 19:10:46 2023 -0700

    Pearl Boards Pearl Layout Addition (qmk#20765)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_625u_space

commit b2ea303
Author: James Young <[email protected]>
Date:   Sun May 7 01:11:44 2023 -0700

    Pearl Boards Pandora Layout Additions (qmk#20764)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi_tsangan_split_rshift

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_ansi

    * add LAYOUT_60_iso_split_bs_rshift

    * add LAYOUT_60_iso

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit 6936997
Author: James Young <[email protected]>
Date:   Sat May 6 23:02:42 2023 -0700

    P3D Glitch Layout Addition (qmk#20763)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_2u_bs

commit e41893b
Author: James Young <[email protected]>
Date:   Sat May 6 20:25:44 2023 -0700

    One Key Co Dango40 Touch-Up and Layout Addition (qmk#20755)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * remove matrix position K3B

    Based on photos of the keyboard and renders of the PCB, I'm not convinced it exists.

    * add LAYOUT_625u_space

commit 7cbbdfe
Author: James Young <[email protected]>
Date:   Sat May 6 20:01:48 2023 -0700

    Odelia Touch-Up (qmk#20754)

    * rename LAYOUT_all to LAYOUT

    Only one layout is supported.

    * info.json: apply friendly formatting

commit 4810cce
Author: James Young <[email protected]>
Date:   Sat May 6 18:55:48 2023 -0700

    Nightly Boards/DeskDaily Daily60 Layout Additions (qmk#20753)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_ansi

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * add LAYOUT_60_ansi_tsangan_split_space_split_bs_rshift

    * add LAYOUT_60_ansi_tsangan_split_space

    * add LAYOUT_60_iso_split_bs_rshift

    * add LAYOUT_60_iso

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan

    * add LAYOUT_60_iso_tsangan_split_space_split_bs_rshift

    * add LAYOUT_60_iso_tsangan_split_space

    * enable Community Layout support

commit 0b04ee7
Author: James Young <[email protected]>
Date:   Sat May 6 18:35:18 2023 -0700

    Noxary Valhalla Layout Addition (qmk#20752)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_2u_bs

commit 2e37445
Author: James Young <[email protected]>
Date:   Sat May 6 17:19:54 2023 -0700

    Noxary 378 Layout Addition (qmk#20751)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_65_xt_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_xt_ansi_blocker_tsangan

commit 7581d34
Author: James Young <[email protected]>
Date:   Sat May 6 16:59:21 2023 -0700

    NovelKeys NK87B Touch-Up (qmk#20750)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan

commit 88c87e2
Author: James Young <[email protected]>
Date:   Sat May 6 16:39:13 2023 -0700

    NovelKeys NK87 Touch-Up (qmk#20749)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan

commit af5c25d
Author: James Young <[email protected]>
Date:   Sat May 6 15:34:21 2023 -0700

    Kastenwagen 48 Layout Addition (qmk#20748)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_7u_space

commit 4e2e089
Author: James Young <[email protected]>
Date:   Sat May 6 15:07:17 2023 -0700

    Kastenwagen 1840 Layout Addition (qmk#20747)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_7u_space

commit 58939cf
Author: James Young <[email protected]>
Date:   Sat May 6 14:30:16 2023 -0700

    Nix Keyboards Day Off 60 Touch-Up and Layout Additions (qmk#20746)

    * add matrix_diagram.md

    * physically arrange layout macro & keymap

    * add LAYOUT_ansi_split_bs_rshift_space

    * add LAYOUT_ansi_split_bs_rshift

    * add LAYOUT_ansi

    * add LAYOUT_iso_split_bs_rshift_space

    * add LAYOUT_iso_split_bs_rshift

    * add LAYOUT_iso

commit 6099f03
Author: James Young <[email protected]>
Date:   Sat May 6 14:03:34 2023 -0700

    MTBKeys MTB60 Solder Layout Additions (qmk#20745)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * enable Community Layout support

commit d8b57f0
Merge: 854fa2b db229d7
Author: QMK Bot <[email protected]>
Date:   Sat May 6 20:33:54 2023 +0000

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

commit db229d7
Author: eatmyvenom <[email protected]>
Date:   Sat May 6 13:32:51 2023 -0700

    Add vnmm keymaps and userspace (qmk#20446)

    Co-authored-by: Pablo Martínez <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>

commit 854fa2b
Author: James Young <[email protected]>
Date:   Sat May 6 12:49:50 2023 -0700

    Monstargear XO87 Soldered Layout Additions (qmk#20744)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_ansi_split_space

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_iso_tsangan

    * add LAYOUT_tkl_iso_split_space

    * enable Community Layout support

commit 635bb4b
Author: James Young <[email protected]>
Date:   Sat May 6 12:23:33 2023 -0700

    Mode SeventyFive H Layout Addition (qmk#20743)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_ansi_blocker

    * add LAYOUT_ansi_blocker_tsangan

commit db22cad
Author: James Young <[email protected]>
Date:   Sat May 6 12:01:04 2023 -0700

    Mode SixtyFive S Layout Additions (qmk#20742)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_65_ansi_blocker_split_bs

    * add LAYOUT_65_ansi_blocker

    * add LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * add LAYOUT_65_iso_blocker_split_bs

    * add LAYOUT_65_iso_blocker

    * add LAYOUT_65_iso_blocker_tsangan_split_bs

    * add LAYOUT_65_iso_blocker_tsangan

    * enable Community Layout support

commit 9c1f73a
Author: James Young <[email protected]>
Date:   Sat May 6 11:44:46 2023 -0700

    MNK75 Layout Additions (qmk#20741)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_ansi_split_bs

    * add LAYOUT_ansi

    * add LAYOUT_ansi_tsangan_split_bs

    * add LAYOUT_ansi_tsangan

    * add LAYOUT_iso_split_bs

    * add LAYOUT_iso

    * add LAYOUT_iso_tsangan_split_bs

    * add LAYOUT_iso_tsangan

commit bd95fe0
Author: James Young <[email protected]>
Date:   Sat May 6 11:29:28 2023 -0700

    MNK1800s Layout Addition (qmk#20740)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_2u_bs with reference keymap

commit 05b0426
Author: James Young <[email protected]>
Date:   Sat May 6 10:54:41 2023 -0700

    MisterKnife Knife66 ISO Layout Addition (qmk#20739)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_625u_space with reference keymap

    * info.json: edit listed maintainer

    Reference the maintainer's GitHub username.

commit 0a8f023
Author: James Young <[email protected]>
Date:   Sat May 6 10:24:49 2023 -0700

    MechWild Mercutio Layout Addition (qmk#20738)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_625u_space with reference keymap

commit 38a3f6e
Author: James Young <[email protected]>
Date:   Sat May 6 10:03:27 2023 -0700

    Mechlovin Studio Serratus Layout Additions (qmk#20737)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_split_bs_rshift

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_iso_split_bs_rshift

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_iso_tsangan

    * enable Community Layout support

commit 50e9986
Merge: 25c4a48 88780bf
Author: QMK Bot <[email protected]>
Date:   Sat May 6 14:53:53 2023 +0000

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

commit 88780bf
Author: Nick Brassel <[email protected]>
Date:   Sun May 7 00:53:14 2023 +1000

    Fixup QP font rendering when `--no-ascii` is specified. (qmk#20637)

commit 25c4a48
Merge: 59eb894 a4be9b0
Author: QMK Bot <[email protected]>
Date:   Sat May 6 14:46:39 2023 +0000

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

commit a4be9b0
Author: DeskDaily <[email protected]>
Date:   Sat May 6 22:46:01 2023 +0800

    [Keyboard] Navi60 Keymap Edit (qmk#20758)

    Co-authored-by: Neil Brian Ramirez <[email protected]>
    Co-authored-by: Neil Brian Ramirez <[email protected]>

commit 59eb894
Author: Drashna Jaelre <[email protected]>
Date:   Sat May 6 06:38:45 2023 -0700

    Make Pointing Device Auto Layer more configurable (qmk#20061)

    Co-authored-by: Pablo Martínez <[email protected]>

commit 578102b
Author: Ryan <[email protected]>
Date:   Sat May 6 23:00:27 2023 +1000

    Fix `test_json2c_no_json()` (qmk#20756)

commit dea9912
Author: James Young <[email protected]>
Date:   Sat May 6 02:42:09 2023 -0700

    Mechlovin.Studio Olly JF Layout Additions (qmk#20736)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * info.json: correct layout data

    * add LAYOUT_ansi_split_bs_rshift

    * add LAYOUT_ansi

    * add LAYOUT_iso_split_bs_rshift

    * add LAYOUT_iso

    * add reference keymaps

commit 7d1e848
Author: James Young <[email protected]>
Date:   Sat May 6 02:10:30 2023 -0700

    Mechlovin.Studio Infinity87 Rev.2 Layout Additions (qmk#20735)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_split_bs_rshift

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_ansi_wkl_split_bs_rshift

    * add LAYOUT_tkl_ansi_wkl

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_iso_split_bs_rshift

    * add LAYOUT_tkl_iso_tsangan

    * add LAYOUT_tkl_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_iso_wkl

    * add LAYOUT_tkl_iso_wkl_split_bs_rshift

    * enable Community Layout support

    * Apply suggestions from code review

commit 5f78bd9
Author: James Young <[email protected]>
Date:   Fri May 5 20:14:40 2023 -0700

    Mechlovin.Studio Infinity87 RGB Rev1 Layout Additions (qmk#20727)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_split_bs_rshift

    * add LAYOUT_tkl_iso_split_bs_rshift

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_iso_tsangan

    * add LAYOUT_tkl_ansi_wkl_split_bs_rshift

    * add LAYOUT_tkl_iso_wkl_split_bs_rshift

    * add LAYOUT_tkl_ansi_wkl

    * add LAYOUT_tkl_iso_wkl

    * enable Community Layout support

    * info.json: remove extra line breaks

commit 31378d1
Author: James Young <[email protected]>
Date:   Fri May 5 17:25:52 2023 -0700

    Mechlovin9 Layout Addition (qmk#20728)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * enable Community Layout support

commit d4c5db7
Author: James Young <[email protected]>
Date:   Fri May 5 16:42:49 2023 -0700

    Mechlovin.Studio infinity87 Rev.1 Layout Additions (qmk#20726)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_split_bs_rshift

    * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_ansi_wkl_split_bs_rshift

    * add LAYOUT_tkl_iso_split_bs_rshift

    * add LAYOUT_tkl_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_iso_wkl_split_bs_rshift

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_ansi_wkl

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_iso_tsangan

    * add LAYOUT_tkl_iso_wkl

    * enable Community Layout support

    * info.json: remove extra line breaks

    * add default and via keymaps

    * Update keyboards/mechlovin/infinity87/rev1/standard/info.json

commit 0e96157
Author: jack <[email protected]>
Date:   Fri May 5 16:50:19 2023 -0600

    Fixup 1upkeyboards/pi50 (qmk#20733)

commit fa3f5d0
Author: Tom Barnes <[email protected]>
Date:   Fri May 5 21:57:38 2023 +0100

    1upkeyboards/pi50 WS2812_DI_PIN patch for develop (qmk#20731)

commit 9c5d6ed
Author: James Young <[email protected]>
Date:   Fri May 5 11:54:54 2023 -0700

    Mechlovin.Studio Rouge87 Rev.1 Layout Additions (qmk#20725)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_ansi_wkl

    * add LAYOUT_tkl_iso_tsangan

    * add LAYOUT_tkl_iso_wkl

    * enable Community Layout support

commit 744be2f
Author: James Young <[email protected]>
Date:   Fri May 5 11:17:38 2023 -0700

    Mechlovin.Studio Rogue87 Rev.1 Layout Additions (qmk#20724)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_ansi_wkl

    * add LAYOUT_tkl_iso_wkl

commit 795746b
Author: James Young <[email protected]>
Date:   Fri May 5 09:21:49 2023 -0700

    Mechlovin Studio Hex6C Layout Additions (qmk#20722)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_ansi_split_bs_rshift

    * add LAYOUT_ansi

    * add LAYOUT_ansi_tsangan_split_bs_rshift

    * add LAYOUT_ansi_tsangan

    * add LAYOUT_ansi_wkl_split_bs_rshift

    * add LAYOUT_ansi_wkl

    * add LAYOUT_iso_split_bs_rshift

    * add LAYOUT_iso

    * add LAYOUT_iso_tsangan_split_bs_rshift

    * add LAYOUT_iso_tsangan

    * add LAYOUT_iso_wkl_split_bs_rshift

    * add LAYOUT_iso_wkl

commit 3a1fe92
Author: James Young <[email protected]>
Date:   Thu May 4 21:13:01 2023 -0700

    Matrix Lab 8XV1.2 OG Layout Updates (qmk#20720)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * info.json: correct layout data

    * rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_ansi_wkl

    * enable Community Layout support

commit 108ad09
Author: Ryan <[email protected]>
Date:   Fri May 5 09:28:17 2023 +1000

    Escape Unicode characters in info.json (qmk#20698)

commit c19b468
Author: James Young <[email protected]>
Date:   Thu May 4 16:25:20 2023 -0700

    Leftover30 Layout Addition (qmk#20718)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_isoenter with reference keymap

commit db7e21b
Author: James Young <[email protected]>
Date:   Thu May 4 15:46:21 2023 -0700

    Lucid Phantom Soldered Layout Additions (qmk#20717)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_65_ansi_blocker_split_bs

    * add LAYOUT_65_ansi_blocker

    * add LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * add LAYOUT_65_iso_blocker_split_bs

    * add LAYOUT_65_iso_blocker

    * add LAYOUT_65_iso_blocker_tsangan_split_bs

    * add LAYOUT_65_iso_blocker_tsangan

    * enable Community Layout support

    * update keyboard metadata

    - update listed maintainer (use GitHub username)
    - update product links

commit 57a3ec9
Author: James Young <[email protected]>
Date:   Thu May 4 15:00:13 2023 -0700

    Lucid Alexa Solder Layout Additions (qmk#20716)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_65_ansi_blocker_split_bs

    * add LAYOUT_65_ansi_blocker

    * add LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * add LAYOUT_65_iso_blocker_split_bs

    * add LAYOUT_65_iso_blocker

    * add LAYOUT_65_iso_blocker_tsangan_split_bs

    * add LAYOUT_65_iso_blocker_tsangan

    * enable Community Layout support

    * edit keyboard metadata

    - update listed maintainer (use GitHub username)
    - add availability links

commit 6cb4a46
Author: James Young <[email protected]>
Date:   Thu May 4 14:30:34 2023 -0700

    Loki65 Layout Additions (qmk#20715)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_ansi_blocker_split_bs

    * add LAYOUT_ansi_blocker

    * add LAYOUT_ansi_blocker_tsangan_split_bs

    * add LAYOUT_ansi_blocker_tsangan

    * add LAYOUT_iso_blocker_split_bs

    * add LAYOUT_iso_blocker

    * add LAYOUT_iso_blocker_tsangan_split_bs

    * add LAYOUT_iso_blocker_tsangan

commit a1e4b34
Author: James Young <[email protected]>
Date:   Thu May 4 13:48:17 2023 -0700

    Lefty Touch-Up (qmk#20714)

    * rename LAYOUT_all to LAYOUT

    * info.json: apply friendly formatting

    * refactor keymaps

commit 1bb2ed7
Author: James Young <[email protected]>
Date:   Thu May 4 13:13:01 2023 -0700

    kopibeng XT8x Layout Additions (qmk#20713)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_f13_ansi_split_bs_rshift

    * add LAYOUT_tkl_f13_ansi

    * add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_f13_ansi_tsangan

    * add LAYOUT_tkl_ansi_split_bs_rshift

    * add LAYOUT_tkl_ansi

    * add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_ansi_tsangan

    * add LAYOUT_tkl_f13_iso_split_bs_rshift

    * add LAYOUT_tkl_f13_iso

    * add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_f13_iso_tsangan

    * add LAYOUT_tkl_iso_split_bs_rshift

    * add LAYOUT_tkl_iso

    * add LAYOUT_tkl_iso_tsangan_split_bs_rshift

    * add LAYOUT_tkl_iso_tsangan

    * enable Community Layout support

commit 0f4c958
Merge: 7381d2c 7f413e9
Author: QMK Bot <[email protected]>
Date:   Thu May 4 19:30:51 2023 +0000

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

commit 7f413e9
Author: ziptyze <[email protected]>
Date:   Thu May 4 15:29:45 2023 -0400

    [Keyboard] Add 1upkeyboards pi50 (qmk#20242)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Less/Rikki <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 7381d2c
Author: James Young <[email protected]>
Date:   Thu May 4 12:10:12 2023 -0700

    kopibeng XT60_SINGA Layout Additions (qmk#20712)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_ansi

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * add LAYOUT_60_iso_split_bs_rshift

    * add LAYOUT_60_iso

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit 8593409
Author: James Young <[email protected]>
Date:   Thu May 4 11:34:42 2023 -0700

    kopibeng XT60 Layout Additions (qmk#20711)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_ansi

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * add LAYOUT_60_iso_split_bs_rshift

    * add LAYOUT_60_iso

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit e43c560
Author: James Young <[email protected]>
Date:   Thu May 4 10:58:21 2023 -0700

    kopibeng Typ65+ Layout Additions (qmk#20710)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT back to LAYOUT_all

    Preparing to add new layouts, so we need `LAYOUT_all` back.

    * add LAYOUT_ansi_blocker_split_bs

    * add LAYOUT_ansi_blocker

    * add LAYOUT_ansi_blocker_tsangan_split_bs

    * add LAYOUT_ansi_blocker_tsangan

    * add LAYOUT_iso_blocker_split_bs

    * add LAYOUT_iso_blocker

    * add LAYOUT_iso_blocker_tsangan_split_bs

    * add LAYOUT_iso_blocker_tsangan

commit 0c79624
Author: James Young <[email protected]>
Date:   Thu May 4 02:55:50 2023 -0700

    kopibeng MNK65 Layout Additions (qmk#20708)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_65_ansi_blocker_split_bs

    * add LAYOUT_65_ansi_blocker

    * add LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * add LAYOUT_65_iso_blocker_split_bs

    * add LAYOUT_65_iso_blocker

    * add LAYOUT_65_iso_blocker_tsangan_split_bs

    * add LAYOUT_65_iso_blocker_tsangan

    * enable Community Layout support

commit ef6a712
Author: Ryan <[email protected]>
Date:   Thu May 4 19:09:59 2023 +1000

    Even more `info.json` whitespace cleanups (qmk#20703)

commit a49c87b
Author: James Young <[email protected]>
Date:   Thu May 4 01:46:38 2023 -0700

    kkatano Bakeneko 65 V3 Layout Additions (qmk#20706)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs

    * add LAYOUT_65_ansi_blocker

    * add LAYOUT_65_ansi_blocker_tsangan_split_bs

    * add LAYOUT_65_ansi_blocker_tsangan

    * enable Community Layout support

commit e28833a
Author: James Young <[email protected]>
Date:   Wed May 3 21:37:39 2023 -0700

    Kiko's Lab Ellora65 Layout Additions (qmk#20699)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_ansi_blocker_split_bs

    * add LAYOUT_ansi_blocker

    * add LAYOUT_ansi_blocker_tsangan_split_bs

    * add LAYOUT_ansi_blocker_tsangan

    * add LAYOUT_iso_blocker_split_bs

    * add LAYOUT_iso_blocker

    * add LAYOUT_iso_blocker_tsangan_split_bs

    * add LAYOUT_iso_blocker_tsangan

commit ef5bbe8
Author: James Young <[email protected]>
Date:   Wed May 3 20:45:13 2023 -0700

    Kegen G-Boy Layout Additions (qmk#20697)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * patch diagram

    * add LAYOUT_65_ansi_split_bs

    * add LAYOUT_65_ansi

    * add LAYOUT_65_ansi_rwkl_split_bs

    * add LAYOUT_65_ansi_rwkl

    * add LAYOUT_65_ansi_wkl_split_bs

    * add LAYOUT_65_ansi_wkl

    * add LAYOUT_65_iso_split_bs

    * add LAYOUT_65_iso

    * add LAYOUT_65_iso_rwkl_split_bs

    * add LAYOUT_65_iso_rwkl

    * add LAYOUT_65_iso_wkl_split_bs

    * add LAYOUT_65_iso_wkl

    * enable Community Layout support

commit c13982e
Merge: a662d36 a4b36f0
Author: QMK Bot <[email protected]>
Date:   Thu May 4 02:08:15 2023 +0000

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

commit a4b36f0
Author: IreuN <[email protected]>
Date:   Thu May 4 04:07:32 2023 +0200

    `sofle/via` encoder map & doc handedness update (qmk#20630)

commit a662d36
Author: James Young <[email protected]>
Date:   Wed May 3 18:06:58 2023 -0700

    keebzdotnet FMe Layout Additionns (qmk#20696)

    * add matrix_diagram.md

    * add LAYOUT_1x2u with reference keymap

    * add LAYOUT_2x1u with reference keymap

commit 4efd6a8
Author: James Young <[email protected]>
Date:   Wed May 3 17:36:43 2023 -0700

    KBDfans Odin Soldered Layout Additions and Touch-Up (qmk#20695)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * info.json: correct layout data

    * add LAYOUT_ansi

    * add LAYOUT_iso

    * add LAYOUT_ansi_split_bs_rshift

    * add LAYOUT_iso_split_bs_rshift

    * refactor default and via keymaps

    - use four-space indent
    - grid-align keycodes

commit d579d82
Author: Ryan <[email protected]>
Date:   Thu May 4 10:14:08 2023 +1000

    Helix rev2: remove 4 rows option (qmk#20667)

commit 13e1397
Author: James Young <[email protected]>
Date:   Wed May 3 17:13:31 2023 -0700

    KBDfans Odin RGB Touch-Up (qmk#20694)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * info.json: correct layout data

    * rename LAYOUT_all to LAYOUT

commit 4615aa7
Author: James Young <[email protected]>
Date:   Wed May 3 16:50:08 2023 -0700

    KBDfans KBD66 Layout Additions and Refactor (qmk#20693)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_66_ansi_split_space

    * add LAYOUT_66_iso_split_space

    * refactor default keymap

    - use four-space indent
    - use QMK-native keycode aliases directly
    - use `enum` statement for layer names
    - grid-align keycodes

    * refactor ansi keymap

    - use four-space indent
    - use QMK-native keycode aliases directly
    - use `enum` statement for layer names
    - grid-align keycodes

    * refactor iso keymap

    - use four-space indent
    - use QMK-native keycode aliases directly
    - use `enum` statement for layer names
    - grid-align keycodes

    * change layout macro for ansi keymap

    Refactors the `ansi` keymap to use the `LAYOUT_66_ansi_split_space` macro, and renames the keymap to `default_ansi_split_space`.

    * change layout macro for iso keymap

    Refactors the `iso` keymap to use the `LAYOUT_66_iso_split_space` macro, and renames the keymap to `default_iso_split_space`.

    * add LAYOUT_66_ansi

    The column for the spacebar key may be wrong; I was unable to find high-resolution images of the PCB.

    * add LAYOUT_66_iso

    The column for the spacebar key may be wrong; I was unable to find high-resolution images of the PCB.

    * enable Community Layout support

commit dcd934b
Author: James Young <[email protected]>
Date:   Wed May 3 16:22:36 2023 -0700

    KBDfans Bounce75 Hotswap Touch-Up (qmk#20692)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_ansi_rwkl

    * touch-up keymap keycode alignment

commit 461b0d6
Author: James Young <[email protected]>
Date:   Wed May 3 15:18:57 2023 -0700

    KBDfans Bella Soldered Layout Macro Additions (qmk#20691)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_ansi_rwkl_split_bs

    * add LAYOUT_ansi_rwkl

    * add LAYOUT_ansi_wkl_split_bs

    * add LAYOUT_ansi_wkl

    * add LAYOUT_iso_rwkl_split_bs

    * add LAYOUT_iso_rwkl

    * add LAYOUT_iso_wkl_split_bs

    * add LAYOUT_iso_wkl

    * refactor keymaps

    - use four-space indent
    - add layer indices
    - grid-align keycodes

commit 5c464df
Author: James Young <[email protected]>
Date:   Wed May 3 14:35:38 2023 -0700

    TheDogKeyboard Layout Macro Addition (qmk#20689)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_fullsize_ansi

    * enable Community Layout support

    * refactor default keymap for readability

commit f6c685b
Author: James Young <[email protected]>
Date:   Wed May 3 14:12:49 2023 -0700

    JKeys Design Gentleman65 Suited Edition Layout Macro Addition (qmk#20685)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_65_ansi_rwkl_split_bs

    * add LAYOUT_65_ansi_wkl_split_bs

    * Update keyboards/jkeys_design/gentleman65_se_s/info.json

commit 2975903
Author: James Young <[email protected]>
Date:   Wed May 3 13:51:59 2023 -0700

    JKeys Design Gentleman65 Layout Macro Addition and Touch-Up (qmk#20684)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * info.json: correct `name` to `keyboard_name`

    * rename LAYOUT_all to LAYOUT_65_ansi_rwkl_split_bs

    * add LAYOUT_65_isoenter_rwkl_split_bs

    * Update keyboards/jkeys_design/gentleman65/info.json

commit 528891b
Author: James Young <[email protected]>
Date:   Wed May 3 12:08:58 2023 -0700

    Iron180 Layout Macro Additions (qmk#20680)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_tkl_f13_ansi_split_bs_rshift

    * add LAYOUT_tkl_f13_ansi

    * add LAYOUT_tkl_f13_ansi_tsangan

    * add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

    * add LAYOUT_tkl_f13_iso_split_bs_rshift

    * add LAYOUT_tkl_f13_iso

    * add LAYOUT_tkl_f13_iso_tsangan

    * add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

    * enable Community Layout support

commit 7dacff6
Author: James Young <[email protected]>
Date:   Wed May 3 11:35:59 2023 -0700

    Irene Layout Macro Additions (qmk#20679)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT_alice_split_bs

    * add LAYOUT_alice

    * add LAYOUT_alice_full_rshift

    * add LAYOUT_alice_split_bs_full_rshift

    * enable Community Layout support

    * Apply suggestions from code review

commit 5926f1f
Author: James Young <[email protected]>
Date:   Wed May 3 00:50:50 2023 -0700

    Iris Keyboards Iris60 Layout Macro Additions (qmk#20678)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_60_ansi_split_bs_rshift

    * add LAYOUT_60_ansi

    * add LAYOUT_60_tsangan_hhkb

    * add LAYOUT_60_ansi_tsangan

    * add LAYOUT_60_iso_split_bs_rshift

    * add LAYOUT_60_iso

    * add LAYOUT_60_iso_tsangan_split_bs_rshift

    * add LAYOUT_60_iso_tsangan

    * enable Community Layout support

commit f556b46
Author: James Young <[email protected]>
Date:   Wed May 3 00:17:09 2023 -0700

    Volcano660 Layout Macro Additions (qmk#20677)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_66_ansi_split_bs

    * add LAYOUT_66_ansi

    * enable Community Layout support

    * edit listed maintainer (reference GitHub username)

commit fb48db4
Author: Ryan <[email protected]>
Date:   Wed May 3 12:24:37 2023 +1000

    Remove more junk files and scripts (qmk#20682)

commit 8b47aaf
Author: Ryan <[email protected]>
Date:   Wed May 3 12:21:05 2023 +1000

    kinesis/alvicstep: remove kicad project files (qmk#20681)

commit a5e46d8
Author: Ryan <[email protected]>
Date:   Wed May 3 12:19:34 2023 +1000

    More `info.json` whitespace cleanups (qmk#20665)

commit 97a86b8
Author: James Young <[email protected]>
Date:   Tue May 2 18:07:30 2023 -0700

    Primus75 Layout Macro Additions (qmk#20676)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add matrix position [5, 2] to LAYOUT_all

    The PCB supports four 1u mod keys to the left of the Spacebar, but this was not implemented in the original submission to QMK.

    * add LAYOUT_ansi_split_bs

    * add LAYOUT_ansi

    * add LAYOUT_ansi_blocker_split_bs

    * add LAYOUT_ansi_blocker

    * add LAYOUT_ansi_blocker_tsangan_split_bs

    * add LAYOUT_ansi_blocker_tsangan

    * add LAYOUT_iso_split_bs

    * add LAYOUT_iso

    * add LAYOUT_iso_blocker_split_bs

    * add LAYOUT_iso_blocker

    * add LAYOUT_iso_blocker_tsangan_split_bs

    * add LAYOUT_iso_blocker_tsangan

commit 982ac06
Author: James Young <[email protected]>
Date:   Tue May 2 15:36:29 2023 -0700

    Alicia Cook Layout Macro Additions (qmk#20675)

    * add matrix_diagram.md

    * info.json: apply friendly formatting

    * add LAYOUT_long_lspace

    * add LAYOUT_long_rspace

    * add LAYOUT_long_spaces

    * Update keyboards/ibnuda/alicia_cook/info.json

commit e77ebe6
Author: Ryan <[email protected]>
Date:   Wed May 3 07:41:59 2023 +1000

    Remove use of layout macros for LFKeyboards LED config (qmk#20666)

commit 3ab3101
Author: James Young <[email protected]>
Date:   Tue May 2 12:59:17 2023 -0700

    Wakizashi40 Handwired Touch-Up (qmk#20671)

    * info.json: correct layout data

    * info.json: apply friendly formatting

    * rename LAYOUT_all to LAYOUT

    Only one layout is supported. Alias is maintained for backward compatibility.

commit 4bdf546
Author: Jeff Epler <[email protected]>
Date:   Tue May 2 09:48:46 2023 -0500

    yttyx: convert to utf-8 encoding (qmk#20672)
  • Loading branch information
@freznel10
freznel10 committed May 8, 2023
1 parent 0e20c44 commit 5caed18
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 4 deletions.
4 changes: 4 additions & 0 deletions quantum/action.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ __attribute__((weak)) void post_process_record_quantum(keyrecord_t *record) {}
* FIXME: Needs documentation.
*/
void process_record_tap_hint(keyrecord_t *record) {
if (!IS_KEYEVENT(record->event)) {
return;
}

action_t action = layer_switch_get_action(record->event.key);

switch (action.kind.id) {
Expand Down
10 changes: 6 additions & 4 deletions quantum/action_tapping.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,22 +167,24 @@ bool process_tapping(keyrecord_t *keyp) {

// state machine is in the "reset" state, no tapping key is to be
// processed
if (IS_NOEVENT(tapping_key.event) && IS_EVENT(event)) {
if (event.pressed && is_tap_record(keyp)) {
if (IS_NOEVENT(tapping_key.event)) {
if (!IS_EVENT(event)) {
// early return for tick events
} else if (event.pressed && is_tap_record(keyp)) {
// the currently pressed key is a tapping key, therefore transition
// into the "pressed" tapping key state
ac_dprintf("Tapping: Start(Press tap key).\n");
tapping_key = *keyp;
process_record_tap_hint(&tapping_key);
waiting_buffer_scan_tap();
debug_tapping_key();
return true;
} else {
// the current key is just a regular key, pass it on for regular
// processing
process_record(keyp);
return true;
}

return true;
}

TAP_DEFINE_KEYCODE;
Expand Down
1 change: 1 addition & 0 deletions quantum/process_keycode/process_combo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ void apply_combo(uint16_t combo_index, combo_t *combo) {
// this in the end executes the combo when the key_buffer is dumped.
record->keycode = combo->keycode;
record->event.type = COMBO_EVENT;
record->event.key = MAKE_KEYPOS(0, 0);

qrecord->combo_index = combo_index;
ACTIVATE_COMBO(combo);
Expand Down
8 changes: 8 additions & 0 deletions tests/combo/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2023 Stefan Kerkmann (@KarlK90)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include "test_common.h"

#define TAPPING_TERM 200
4 changes: 4 additions & 0 deletions tests/combo/test.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright 2023 Stefan Kerkmann (@KarlK90)
# SPDX-License-Identifier: GPL-2.0-or-later

COMBO_ENABLE = yes
53 changes: 53 additions & 0 deletions tests/combo/test_combo.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Copyright 2023 Stefan Kerkmann (@KarlK90)
// Copyright 2023 @filterpaper
// SPDX-License-Identifier: GPL-2.0-or-later

#include "keyboard_report_util.hpp"
#include "quantum.h"
#include "keycode.h"
#include "test_common.h"
#include "test_driver.hpp"
#include "test_fixture.hpp"
#include "test_keymap_key.hpp"

extern "C" {
enum combos { modtest, COMBO_LENGTH };
uint16_t COMBO_LEN = COMBO_LENGTH;

uint16_t const modtest_combo[] PROGMEM = {KC_Y, KC_U, COMBO_END};

// clang-format off
combo_t key_combos[] = {
[modtest] = COMBO(modtest_combo, RSFT_T(KC_SPACE))
};
// clang-format on
}

using testing::_;
using testing::InSequence;

class Combo : public TestFixture {};

TEST_F(Combo, combo_tapped) {
TestDriver driver;
KeymapKey key_y(0, 0, 1, KC_Y);
KeymapKey key_u(0, 0, 2, KC_U);
set_keymap({key_y, key_u});

EXPECT_REPORT(driver, (KC_SPACE));
EXPECT_EMPTY_REPORT(driver);
tap_combo({key_y, key_u});
VERIFY_AND_CLEAR(driver);
}

TEST_F(Combo, combo_held_longer_than_tapping_term) {
TestDriver driver;
KeymapKey key_y(0, 0, 1, KC_Y);
KeymapKey key_u(0, 0, 2, KC_U);
set_keymap({key_y, key_u});

EXPECT_REPORT(driver, (KC_RIGHT_SHIFT));
EXPECT_EMPTY_REPORT(driver);
tap_combo({key_y, key_u}, TAPPING_TERM + 1);
VERIFY_AND_CLEAR(driver);
}

0 comments on commit 5caed18

Please sign in to comment.