From 5caed18f96db98dfcfbcefe636502f3eff0f6f2e Mon Sep 17 00:00:00 2001 From: freznel10 Date: Mon, 8 May 2023 17:38:53 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 550ac2a95ca0f6fdd6351e495d4f2a0fd6401b46 Author: freznel10 Date: Mon May 8 17:34:52 2023 +0800 new commit e5816f1bfe8915c908715ce05d33e6a0fab01c2a Author: freznel10 Date: Mon May 8 17:33:02 2023 +0800 Squashed commit of the following: commit 3ae915bfd762785b22f4fba919a022ddb7830fe6 Author: Stefan Kerkmann 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 45f17ac90f5a4511241c758a703f32614044c694 Author: Pete Sevander Date: Tue May 2 10:02:29 2023 +0300 Update quantum/process_keycode/process_combo.c Co-authored-by: Sergey Vlasov commit 109342aea67588fd03d9797863a34233260ce667 Author: Pete Sevander Date: Tue May 2 09:27:57 2023 +0300 Fix formatting commit 42211c34ee3c330799c225e9957b31fedbb2933d Author: Pete Sevander Date: Tue May 2 09:20:15 2023 +0300 Add keyevent for combo keyrecord commit a8f11136fd907eafbe4e2aeba2f8d98f0fe0b2aa Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun May 7 19:10:46 2023 -0700 Pearl Boards Pearl Layout Addition (#20765) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_625u_space commit b2ea303671e37ef09508e56b653d0595b70096b0 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun May 7 01:11:44 2023 -0700 Pearl Boards Pandora Layout Additions (#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 69369976477600776d2da49e6faabe558cc3e6f6 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 23:02:42 2023 -0700 P3D Glitch Layout Addition (#20763) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_2u_bs commit e41893b55791ca6390cf27d8afa13f8bebef26fe Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 20:25:44 2023 -0700 One Key Co Dango40 Touch-Up and Layout Addition (#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 7cbbdfe333c6b14e35c19128310791b60b23c63c Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 20:01:48 2023 -0700 Odelia Touch-Up (#20754) * rename LAYOUT_all to LAYOUT Only one layout is supported. * info.json: apply friendly formatting commit 4810cce0414cc98d9903452e0ec52a7c2861df48 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 18:55:48 2023 -0700 Nightly Boards/DeskDaily Daily60 Layout Additions (#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 0b04ee7ed6d89434e0d96e4f69a1fe83e800c6f1 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 18:35:18 2023 -0700 Noxary Valhalla Layout Addition (#20752) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_2u_bs commit 2e374457d20cc292f6cffae08ec5dca4f657bb29 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 17:19:54 2023 -0700 Noxary 378 Layout Addition (#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 7581d34735a70a68f30cf1dac163f213db85f1b7 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 16:59:21 2023 -0700 NovelKeys NK87B Touch-Up (#20750) * add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan commit 88c87e2535b16dcaf674ce1155975a8a45dc34c3 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 16:39:13 2023 -0700 NovelKeys NK87 Touch-Up (#20749) * add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan commit af5c25d6c36d0555567f755524ebbbd6f5d45444 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 15:34:21 2023 -0700 Kastenwagen 48 Layout Addition (#20748) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_7u_space commit 4e2e089b173855d61d4cc71724cc7cedfc037204 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 15:07:17 2023 -0700 Kastenwagen 1840 Layout Addition (#20747) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_7u_space commit 58939cf30e9573d0e3ba555a07f425c60718cb4c Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 14:30:16 2023 -0700 Nix Keyboards Day Off 60 Touch-Up and Layout Additions (#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 6099f03d1154b34595c03bdb3dcf3cceb5167cae Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 14:03:34 2023 -0700 MTBKeys MTB60 Solder Layout Additions (#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 d8b57f045592251b158bb13fb911f28e7e50565e Merge: 854fa2b34a db229d7341 Author: QMK Bot Date: Sat May 6 20:33:54 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit db229d7341ae0b0f04a25870350b817cfb966943 Author: eatmyvenom Date: Sat May 6 13:32:51 2023 -0700 Add vnmm keymaps and userspace (#20446) Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Co-authored-by: Drashna Jaelre commit 854fa2b34a0eee66eb624d27417305cdfeb9471f Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 12:49:50 2023 -0700 Monstargear XO87 Soldered Layout Additions (#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 635bb4bee0019bc3fe45099fc8c2a94931c2072f Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 12:23:33 2023 -0700 Mode SeventyFive H Layout Addition (#20743) * add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_ansi_blocker * add LAYOUT_ansi_blocker_tsangan commit db22cad79d893ffe62cc36e15bd895534f8c45c4 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 12:01:04 2023 -0700 Mode SixtyFive S Layout Additions (#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 9c1f73ad4bd3665c2ea418e7e5512f24e684fd8c Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 11:44:46 2023 -0700 MNK75 Layout Additions (#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 bd95fe071fbedb8eae3f523adddde86a13f6ecaa Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 11:29:28 2023 -0700 MNK1800s Layout Addition (#20740) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_2u_bs with reference keymap commit 05b04266c7161da7894e5cfe25d07584d51a5f6d Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 10:54:41 2023 -0700 MisterKnife Knife66 ISO Layout Addition (#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 0a8f023488fe1b64475a58b35612928465bd838b Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 10:24:49 2023 -0700 MechWild Mercutio Layout Addition (#20738) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_625u_space with reference keymap commit 38a3f6ef173c2681bd680e86dc67bb4fa6c49ed2 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 10:03:27 2023 -0700 Mechlovin Studio Serratus Layout Additions (#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 50e99864dd347805f805b123a18dfefd70010ad2 Merge: 25c4a480b1 88780bf710 Author: QMK Bot Date: Sat May 6 14:53:53 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 88780bf710a0f9a3a204d0feebac90755a2f3fff Author: Nick Brassel Date: Sun May 7 00:53:14 2023 +1000 Fixup QP font rendering when `--no-ascii` is specified. (#20637) commit 25c4a480b1500f78756fbddc0854856fa7b42b56 Merge: 59eb8940b0 a4be9b0ccb Author: QMK Bot Date: Sat May 6 14:46:39 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit a4be9b0ccbdf5c03b97099ba9efb60a1235694f9 Author: DeskDaily <65656486+DeskDaily@users.noreply.github.com> Date: Sat May 6 22:46:01 2023 +0800 [Keyboard] Navi60 Keymap Edit (#20758) Co-authored-by: Neil Brian Ramirez Co-authored-by: Neil Brian Ramirez commit 59eb8940b028bfa2a215231719b8eeca57701ed1 Author: Drashna Jaelre Date: Sat May 6 06:38:45 2023 -0700 Make Pointing Device Auto Layer more configurable (#20061) Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> commit 578102b40056693de8a92b49cd0c48e51ff4ad4a Author: Ryan Date: Sat May 6 23:00:27 2023 +1000 Fix `test_json2c_no_json()` (#20756) commit dea9912cc996053e659be679c61f55c4bf46deda Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 02:42:09 2023 -0700 Mechlovin.Studio Olly JF Layout Additions (#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 7d1e84833f02e3197672ac33f2347226f4be1384 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat May 6 02:10:30 2023 -0700 Mechlovin.Studio Infinity87 Rev.2 Layout Additions (#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 5f78bd9148c3c7dc63c9cbbb8fa26dd7fbdd5bd2 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 20:14:40 2023 -0700 Mechlovin.Studio Infinity87 RGB Rev1 Layout Additions (#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 31378d18da45ef463ad071b09248922f482ab2cd Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 17:25:52 2023 -0700 Mechlovin9 Layout Addition (#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 d4c5db7b0400f2cc76b8843342df58ae9fe57d69 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 16:42:49 2023 -0700 Mechlovin.Studio infinity87 Rev.1 Layout Additions (#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 0e9615755b5dfc4faf4d9000318a30b0a2de82e7 Author: jack <0x6A73@pm.me> Date: Fri May 5 16:50:19 2023 -0600 Fixup 1upkeyboards/pi50 (#20733) commit fa3f5d0a682974c3cb0cd9ecaf242eb5206b189a Author: Tom Barnes Date: Fri May 5 21:57:38 2023 +0100 1upkeyboards/pi50 WS2812_DI_PIN patch for develop (#20731) commit 9c5d6ed20e4c8457885a39e3187e5f672c35bca4 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 11:54:54 2023 -0700 Mechlovin.Studio Rouge87 Rev.1 Layout Additions (#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 744be2f615fe3815fe643d6229f4885869c92c30 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 11:17:38 2023 -0700 Mechlovin.Studio Rogue87 Rev.1 Layout Additions (#20724) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_tkl_ansi_wkl * add LAYOUT_tkl_iso_wkl commit 795746bfde8b159b958059af954023321d1a2844 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri May 5 09:21:49 2023 -0700 Mechlovin Studio Hex6C Layout Additions (#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 3a1fe9281a7590ce45867f37bda59fb15a3bfdc3 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 21:13:01 2023 -0700 Matrix Lab 8XV1.2 OG Layout Updates (#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 108ad0929cc4dfdc4df0e9f2303b85da92606e92 Author: Ryan Date: Fri May 5 09:28:17 2023 +1000 Escape Unicode characters in info.json (#20698) commit c19b468d3180d8bc0d7782912072515b1b4fab51 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 16:25:20 2023 -0700 Leftover30 Layout Addition (#20718) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_isoenter with reference keymap commit db7e21bbda53dce5b889070e074fefea47714e96 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 15:46:21 2023 -0700 Lucid Phantom Soldered Layout Additions (#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 57a3ec978e390557d0862131c0ce68d4df23ac36 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 15:00:13 2023 -0700 Lucid Alexa Solder Layout Additions (#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 6cb4a46125192875c4b3c97b7aa9e0ee53a9ab1b Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 14:30:34 2023 -0700 Loki65 Layout Additions (#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 a1e4b34aac5f79bb2bf2539abffc1825223440de Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 13:48:17 2023 -0700 Lefty Touch-Up (#20714) * rename LAYOUT_all to LAYOUT * info.json: apply friendly formatting * refactor keymaps commit 1bb2ed773d33089bcdc5f5ea922bc461db792ac1 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 13:13:01 2023 -0700 kopibeng XT8x Layout Additions (#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 0f4c958ba1950ff0f6ab3dd3d9eb98565de2db90 Merge: 7381d2c6e7 7f413e9f01 Author: QMK Bot Date: Thu May 4 19:30:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 7f413e9f01d5e95da9593976b4fa3fefc055a3c9 Author: ziptyze Date: Thu May 4 15:29:45 2023 -0400 [Keyboard] Add 1upkeyboards pi50 (#20242) Co-authored-by: Drashna Jaelre Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Ryan commit 7381d2c6e770692d0ad793713ba756004d2c69cc Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 12:10:12 2023 -0700 kopibeng XT60_SINGA Layout Additions (#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 8593409ac0434173efcecc50b22862bd7f9d6b82 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 11:34:42 2023 -0700 kopibeng XT60 Layout Additions (#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 e43c560ddacfd6843a52986edde70bfdf5433f89 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 10:58:21 2023 -0700 kopibeng Typ65+ Layout Additions (#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 0c7962449217a4b00c56a8116c91e68556a1944e Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 02:55:50 2023 -0700 kopibeng MNK65 Layout Additions (#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 ef6a712899f4ac3cf75f989221351c1cfb57f3b9 Author: Ryan Date: Thu May 4 19:09:59 2023 +1000 Even more `info.json` whitespace cleanups (#20703) commit a49c87b22517b1541fbfc09ad857ab46e6afec35 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu May 4 01:46:38 2023 -0700 kkatano Bakeneko 65 V3 Layout Additions (#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 e28833ae919c0c6c5b9e14f20924d91fff8fe00c Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 21:37:39 2023 -0700 Kiko's Lab Ellora65 Layout Additions (#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 ef5bbe818a8b967a1e2f3da1984aa0772b5ad775 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 20:45:13 2023 -0700 Kegen G-Boy Layout Additions (#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 c13982e6abe7ce8eff1233fc3dcc9106a1ef225d Merge: a662d366fe a4b36f0b4b Author: QMK Bot Date: Thu May 4 02:08:15 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit a4b36f0b4b45a09ab940910b11b9be52356c721a Author: IreuN Date: Thu May 4 04:07:32 2023 +0200 `sofle/via` encoder map & doc handedness update (#20630) commit a662d366fe8f579a487b154bcdd4c3f03beb3034 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 18:06:58 2023 -0700 keebzdotnet FMe Layout Additionns (#20696) * add matrix_diagram.md * add LAYOUT_1x2u with reference keymap * add LAYOUT_2x1u with reference keymap commit 4efd6a805ced1faabff59a91cd8231166d31a35a Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 17:36:43 2023 -0700 KBDfans Odin Soldered Layout Additions and Touch-Up (#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 d579d82cacd9c69634790d9a9de5edeeaa19226f Author: Ryan Date: Thu May 4 10:14:08 2023 +1000 Helix rev2: remove 4 rows option (#20667) commit 13e139779e646388d13a5070c4e28893522e5be6 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 17:13:31 2023 -0700 KBDfans Odin RGB Touch-Up (#20694) * add matrix_diagram.md * info.json: apply friendly formatting * info.json: correct layout data * rename LAYOUT_all to LAYOUT commit 4615aa748e1f2d66735952fc1fed99b1517fa84f Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 16:50:08 2023 -0700 KBDfans KBD66 Layout Additions and Refactor (#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 dcd934ba0077df995a7a64f22d58f539dfd9a5d2 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 16:22:36 2023 -0700 KBDfans Bounce75 Hotswap Touch-Up (#20692) * add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_ansi_rwkl * touch-up keymap keycode alignment commit 461b0d6c86f7330562ee21d10922edbec5897b4f Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 15:18:57 2023 -0700 KBDfans Bella Soldered Layout Macro Additions (#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 5c464df600f0ed8a5f67a275250f745a611c7c25 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 14:35:38 2023 -0700 TheDogKeyboard Layout Macro Addition (#20689) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_fullsize_ansi * enable Community Layout support * refactor default keymap for readability commit f6c685bcb6f59f841c3c8053c18e5fe471664807 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 14:12:49 2023 -0700 JKeys Design Gentleman65 Suited Edition Layout Macro Addition (#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 29759031ae48ee24c77f23479108726a31addc74 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 13:51:59 2023 -0700 JKeys Design Gentleman65 Layout Macro Addition and Touch-Up (#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 528891b62308310bcd65fc69dc0b2e3c8d7fd289 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 12:08:58 2023 -0700 Iron180 Layout Macro Additions (#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 7dacff6c89fd0dbf6a35e59ea8354658b1653a00 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 11:35:59 2023 -0700 Irene Layout Macro Additions (#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 5926f1f75c3a1a450797b82a1664af8fd7c0c7f2 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 00:50:50 2023 -0700 Iris Keyboards Iris60 Layout Macro Additions (#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 f556b466f33b7a8d336adfeb1cb922de6bc17c91 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed May 3 00:17:09 2023 -0700 Volcano660 Layout Macro Additions (#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 fb48db4c8f59feb2ad64b41d53d708a0673b0df4 Author: Ryan Date: Wed May 3 12:24:37 2023 +1000 Remove more junk files and scripts (#20682) commit 8b47aafdab5dee26c0effbbcf7b8d214f363f821 Author: Ryan Date: Wed May 3 12:21:05 2023 +1000 kinesis/alvicstep: remove kicad project files (#20681) commit a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Author: Ryan Date: Wed May 3 12:19:34 2023 +1000 More `info.json` whitespace cleanups (#20665) commit 97a86b89a9f38f9acf5c9d52123e7da58af86336 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue May 2 18:07:30 2023 -0700 Primus75 Layout Macro Additions (#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 982ac061b16aa6c47015f0badec5f4fad84be4ca Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue May 2 15:36:29 2023 -0700 Alicia Cook Layout Macro Additions (#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 e77ebe6889d5c42f36b9a9a050a4dcfbb470c37b Author: Ryan Date: Wed May 3 07:41:59 2023 +1000 Remove use of layout macros for LFKeyboards LED config (#20666) commit 3ab3101b28589fe685f6168d286a8734e23416f5 Author: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue May 2 12:59:17 2023 -0700 Wakizashi40 Handwired Touch-Up (#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 4bdf546e311adf000554f623caec930559ad0c27 Author: Jeff Epler Date: Tue May 2 09:48:46 2023 -0500 yttyx: convert to utf-8 encoding (#20672) --- quantum/action.c | 4 ++ quantum/action_tapping.c | 10 +++-- quantum/process_keycode/process_combo.c | 1 + tests/combo/config.h | 8 ++++ tests/combo/test.mk | 4 ++ tests/combo/test_combo.cpp | 53 +++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 tests/combo/config.h create mode 100644 tests/combo/test.mk create mode 100644 tests/combo/test_combo.cpp diff --git a/quantum/action.c b/quantum/action.c index f079be6abd19..f2e6108be181 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -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) { diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c index 362b15105c6b..f94e5e6f693c 100644 --- a/quantum/action_tapping.c +++ b/quantum/action_tapping.c @@ -167,8 +167,10 @@ 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"); @@ -176,13 +178,13 @@ bool process_tapping(keyrecord_t *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; diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index b1b49d301955..2670ccabed7f 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -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); diff --git a/tests/combo/config.h b/tests/combo/config.h new file mode 100644 index 000000000000..805293263433 --- /dev/null +++ b/tests/combo/config.h @@ -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 diff --git a/tests/combo/test.mk b/tests/combo/test.mk new file mode 100644 index 000000000000..ce6f9fc2b010 --- /dev/null +++ b/tests/combo/test.mk @@ -0,0 +1,4 @@ +# Copyright 2023 Stefan Kerkmann (@KarlK90) +# SPDX-License-Identifier: GPL-2.0-or-later + +COMBO_ENABLE = yes diff --git a/tests/combo/test_combo.cpp b/tests/combo/test_combo.cpp new file mode 100644 index 000000000000..61ccc61f9a8d --- /dev/null +++ b/tests/combo/test_combo.cpp @@ -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); +}