Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 7aa3471b0598b0ec43e438c8b4d280ae2c796361
Merge: 75219a3623 5344caee66
Author: willdhorn <none>
Date:   Tue May 31 15:10:14 2022 -0400

    Merge branch 'willdhorn-current' into willdhorn-master

commit 75219a36232858953e7fe8609ef595ce28564004
Merge: a921994fb4 92b0cf679e
Author: willdhorn <none>
Date:   Tue May 31 14:56:05 2022 -0400

    Merge branch 'master' into willdhorn-master

commit a921994fb4fb50eb30c9257b4feb7b02c0d03f01
Author: willdhorn <none>
Date:   Tue May 31 14:40:03 2022 -0400

    Squashed commit of the following:

    commit 8153b55e07acb2dff9895b98eb9d9ca3161afb5a
    Author: Forrest Cahoon <forrest.cahoon@gmail.com>
    Date:   Tue May 31 06:31:47 2022 -0500

        Add trailing parens to `get_oneshot_mods` in feature_advanced_keycodes.md (#17211)

    commit d5ed3ae9676aeea4cfd4d58ba1fe0b20936ae658
    Author: moyi4681 <moyi4681@users.noreply.github.com>
    Date:   Tue May 31 16:22:07 2022 +0800

        [Keyboard] fix dz64rgb rgb sleep (#17209)

    commit cda343acbe45826225edac75eaa63216bf76d874
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Mon May 30 22:02:55 2022 -0700

        [Keymap] Drashna update for post Q2 merge (#17241)

    commit b554e4b612d24109ce714554a306043a01382cbd
    Author: trwnh <a@trwnh.com>
    Date:   Mon May 30 23:46:21 2022 -0500

        Change AW20216 SPI Mode from 0 to 3, to fix RGB LEDs on GMMK Pro (#17262)

    commit 650be92cf96440920ebf1079c11f2f36c4a9edc1
    Author: Sergey Vlasov <sigprof@gmail.com>
    Date:   Tue May 31 07:08:23 2022 +0300

        Nix shell updates (#17243)

    commit 0e11b511e4a3c48a67de6414b0907ec26dfcdf49
    Author: Joel Challis <git@zvecr.com>
    Date:   Tue May 31 03:08:56 2022 +0100

        Convert ergodone to use core mcp23018 driver (#17005)

    commit 2879573688e347fd448ac32a1621ba3bec97f5c5
    Author: Joel Challis <git@zvecr.com>
    Date:   Mon May 30 23:43:36 2022 +0100

        Fix various lint errors (#17255)

        * Fix various lint errors

        * reduce complexity

    commit 25ec68c4085e0661ccb086ae9e887654d2e983fb
    Author: Dasky <32983009+daskygit@users.noreply.github.com>
    Date:   Mon May 30 23:05:57 2022 +0100

        Fix docs typo (#17254)

    commit 3826fca63756ec9349e5e14bd20921646e796515
    Author: chalex <68408520+gaclee3b@users.noreply.github.com>
    Date:   Mon May 30 17:45:27 2022 -0400

        [Keyboard] Add str.merro60 pcb (#17097)

        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local>
        Co-authored-by: chalex <chlxbsmt@gmail.com>

    commit 15a86d5c5328981999e7400633de31bc1d17a24d
    Author: Juno Nguyen <juno.ngx@gmail.com>
    Date:   Tue May 31 02:28:35 2022 +0800

        [Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249)

    commit cc7a3f8dc775805665377f228f27bff97420a036
    Author: Seth Barberee <seth.barberee@gmail.com>
    Date:   Mon May 30 11:07:16 2022 -0700

        [Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230)

    commit a06b5cae418f570363a7b165e8b2c6fb178d6651
    Author: Joel Challis <git@zvecr.com>
    Date:   Mon May 30 15:34:20 2022 +0100

        Fix API errors (#17239)

    commit e22a183329fd05d39f88bb9dfebe98cfa7cd8402
    Author: Joel Challis <git@zvecr.com>
    Date:   Sun May 29 20:15:54 2022 +0100

        Use correct container for unit test workflow (#17242)

    commit 6a0ed63eb107d781ca1620e61b37b157edf779e3
    Author: Joel Challis <git@zvecr.com>
    Date:   Sun May 29 06:17:49 2022 +0100

        Fix quark_lp via firmware size (#17233)

    commit 07f5147621b431371241fe7c018ceb40545afa16
    Author: jack <0x6A73@pm.me>
    Date:   Sat May 28 23:09:42 2022 -0600

        Fixup iron165r2 (#17119)

        * initial

        * revert some defines

        * formatting

        * apply changes

        * update readme

        * suggestion

    commit 89a5d5aea095172c23b6e886217078ffe404ecec
    Author: Nick Brassel <nick@tzarc.org>
    Date:   Sun May 29 09:07:11 2022 +1000

        Fixup command sequencing for master/develop. (#17227)

    commit b835171008eaeaa992a1b8e390af8bce6f5f0b8f
    Merge: f5d091a9d5 0c8f78020d
    Author: Nick Brassel <nick@tzarc.org>
    Date:   Sun May 29 07:57:11 2022 +1000

        Merge branch 'develop' -- breaking changes 2022-05-28.

    commit 0c8f78020d01ee5c45481d7d93b9b0d9f7b95103
    Author: Nick Brassel <nick@tzarc.org>
    Date:   Sun May 29 07:53:50 2022 +1000

        Merge point for 2022-05-28 Breaking Change

    commit d0af56da3349052856b58d3d85759ac4b9022839
    Author: Nick Brassel <nick@tzarc.org>
    Date:   Sun May 29 07:50:21 2022 +1000

        Breaking changes for 2022q2. (#17221)

    commit ebd402788346aa6e88bde1486b2a835684d40d39
    Author: Joel Challis <git@zvecr.com>
    Date:   Thu May 26 21:07:42 2022 +0100

        Refactor legacy quantum keycodes in default-ish keymaps (#17150)

    commit d83fda01cf97bb9d693e6056a74a65407f327cc0
    Merge: 23732068a4 f5d091a9d5
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 25 12:11:52 2022 +0000

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

    commit f5d091a9d58c8349437e9d52de87294258cbd256
    Author: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
    Date:   Wed May 25 21:11:13 2022 +0900

        Small update to Symmetric70 keyboard readme (#17188)

        Added a little description to reademe.md under `handwired/symmetric70_proto/{matrix_debug|matrix_fast}`.

    commit 23732068a4383bcaa7f07927d6517d5f6d720dba
    Merge: 6342354cf6 c3ff06c534
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 24 17:09:41 2022 +0000

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

    commit c3ff06c5345bbf781141c88ebbcca2bc575ead42
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Tue May 24 10:08:37 2022 -0700

        SkeletonNumPad Configurator Key Sequence Fix (#17204)

        * info.json: apply friendly formatting

        * info.json: fix key sequence

    commit 6342354cf6f018c37944e88810efe237656e2c65
    Author: zvecr <git@zvecr.com>
    Date:   Tue May 24 02:35:59 2022 +0100

        Disable python formatting for some files

    commit cbc68dfd21ec5c93dce682d9f63c94fc01853ca8
    Author: zvecr <git@zvecr.com>
    Date:   Tue May 24 02:20:12 2022 +0100

        Update keyboard aliases

    commit de6360feca6ecea4ca7a409d93b8fc347323409c
    Author: zvecr <git@zvecr.com>
    Date:   Tue May 24 01:55:34 2022 +0100

        stub changelog

    commit f5e1d2f76a1c9e7432aedd2c75a8c09f7db70774
    Merge: 64e2dbedc3 00fcfd9181
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 23 06:22:01 2022 +0000

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

    commit 00fcfd9181cadb2b322a5441f06af0cb24473838
    Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
    Date:   Mon May 23 16:21:23 2022 +1000

        [Keyboard][Fix] Change default keymap tilde to grv (#17185)

    commit 64e2dbedc3a3b4c7b74fbb4f6a26bdb4a6570467
    Merge: 0bef2bfeb6 5aef750379
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 23 06:11:55 2022 +0000

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

    commit 5aef750379ac3005eb36130b4068ab0a57f129be
    Author: Ramon Imbao <ramonimbao@gmail.com>
    Date:   Mon May 23 14:11:17 2022 +0800

        [Keyboard] Add plywrks Ahgase (#17191)

    commit 0bef2bfeb63b8a999fb8c358831408e07496027a
    Merge: 1c7e8b9a9d c9abb03662
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 23 06:04:11 2022 +0000

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

    commit c9abb03662674bec139cd56b1d997e0405555858
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Mon May 23 14:03:38 2022 +0800

        [Keyboard] mj64 Increase LED count (#17194)

    commit 1c7e8b9a9de0f379bad0823e3f0d1c8d9762ea6c
    Author: Joy Lee <chang.li@westberrytech.com>
    Date:   Mon May 23 13:57:24 2022 +0800

        Added support for Wb32fq95 (#16871)

    commit 1182f5b4be6f6ed7ee7a86bd11ef2226a8b04f8e
    Merge: ac1c5f8dfe 416c59fc52
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 23 05:06:35 2022 +0000

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

    commit 416c59fc52e5148bd13e95895054f443336861f8
    Author: Xyverz <xyverz@gmail.com>
    Date:   Sun May 22 22:05:55 2022 -0700

        [Keyboard] Atreus62update (#17179)

        Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
        Co-authored-by: Ian Sterling <80361942+iansterlingaaa@users.noreply.github.com>
        Co-authored-by: Ian Sterling <xyverz@paeroa-arch.localdomain>

    commit ac1c5f8dfec978fea7e1d94cbfce87dd811b6547
    Merge: f5b3f12544 a1fb86b17a
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 21 22:54:42 2022 +0000

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

    commit a1fb86b17a0e334c232bf18d62d958ad8ac4c1d5
    Author: -k <slowdive@me.com>
    Date:   Sat May 21 15:54:09 2022 -0700

        Add massdrop/alt:charlesrocket keymap (#17173)

    commit f5b3f1254498be90f2fe63b394a008429098ca24
    Merge: afdf1c23dc e6071b891a
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 21 16:37:24 2022 +0000

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

    commit e6071b891af47c26ec13c94f094d53abe6ce924e
    Author: Diego Palacios <diepala@gmail.com>
    Date:   Sat May 21 18:36:54 2022 +0200

        Added Cantor keyboard (#16552)

    commit afdf1c23dc0c4760741a068beb6c09605c66568e
    Merge: bb7572b42f 0103f7877a
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 17:23:16 2022 +0000

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

    commit 0103f7877a8524ab7ee8ddcfcf31aec8b117bdcf
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Fri May 20 10:23:03 2022 -0700

        PJB Eros Community Layout Support (#17158)

    commit a9c8a88e432dd24cf2a7689cf2bf0b6958f7a8b2
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Fri May 20 10:22:42 2022 -0700

        Ryan Skidmore rskeys100 Community Layout Support (#17159)

    commit bb7572b42f3cd8b70a2abf9e976713577458156d
    Merge: b5725c05bd caa5dcc672
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 17:13:33 2022 +0000

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

    commit caa5dcc67243215d0c9f1732cf1408353fd1e904
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Fri May 20 10:12:58 2022 -0700

        Dailycraft Sandbox Configurator Data (#17169)

    commit b5725c05bda7b539677f89fde5e60a09cd8823f8
    Merge: 9fa106f76e 2a544710d7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 17:10:54 2022 +0000

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

    commit 2a544710d7e360271563964f0d2ef2304f044298
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Fri May 20 10:10:17 2022 -0700

        Small Markdown Patch for docs/feature_rgb_matrix.md (#17171)

    commit 9fa106f76e266f1cf965df3f1c6ca840d088069f
    Merge: 5ac861efa5 f296e1d1e2
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 16:15:13 2022 +0000

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

    commit f296e1d1e2b1b49b60aca544bf312ef7a759559e
    Author: jpe230 <pablin.123.ra@gmail.com>
    Date:   Fri May 20 11:13:40 2022 -0500

        [Docs] Align LED Matrix docs with RGB matrix docs (#17140)

    commit 5ac861efa58eb40a7adaa0b1f443f41a9d662741
    Merge: 90f3e139e6 799a7f98ce
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 16:12:15 2022 +0000

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

    commit 799a7f98ce82fe3057d2b11b2c2515ab28e80b51
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Sat May 21 00:10:31 2022 +0800

        [Keyboard] yeti LED index correction (#17138)

    commit c60c19e8d5ebb1066193e8cb73b0c9f235bc5b36
    Author: Kyle McCreery <mccreery.kyle@gmail.com>
    Date:   Fri May 20 12:10:05 2022 -0400

        [Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 (#17126)

    commit 90f3e139e65c59a41ce2cb9fd1b9bf49bbb8d437
    Merge: f155db37d4 713ce7b276
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 16:09:40 2022 +0000

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

    commit 713ce7b276d96fe6a05e40dacec60cc2c2a33024
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Sat May 21 00:09:19 2022 +0800

        [Keyboard] rskeys100 LED index correction (#17139)

    commit f155db37d473a0340a90b1aab891ccce98110e8a
    Merge: c421ecdc37 d5aab127d2
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 16:09:04 2022 +0000

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

    commit d5aab127d2d6d1179320c87b73177f38d1c4f40f
    Author: Kyle McCreery <mccreery.kyle@gmail.com>
    Date:   Fri May 20 12:09:00 2022 -0400

        [Docs] Update Steno Keycode Table (#17155)

    commit e1759cd638e87366036df2f322c96c1e2e06026a
    Author: AnthonyNguyen168 <89651736+AnthonyNguyen168@users.noreply.github.com>
    Date:   Fri May 20 23:08:33 2022 +0700

        [Keyboard] Update Layouts for MB-65S and MB-65H (#17160)

    commit c421ecdc37d7587b0f15d8149e0385aa38e0fb31
    Merge: becf0307d7 92548bb3e7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 05:51:48 2022 +0000

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

    commit 92548bb3e71b6f36632fb373278cc60f1d72127d
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 19 22:51:11 2022 -0700

        [CI] Format code according to conventions (#17164)

    commit becf0307d7501c908af0984679fc800bbe325d04
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 19 22:50:48 2022 -0700

        [CI] Format code according to conventions (#17165)

    commit 1557455f7f8dceef876209370b0735808292429c
    Merge: 0dbaa7e057 90612fce92
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 05:44:45 2022 +0000

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

    commit 90612fce92f560b4d8963482d75f36e642c1fb9f
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Fri May 20 13:44:28 2022 +0800

        [Keyboard] 0xc_pad LED index correction (#17120)

    commit 559148974764f296ed1ef06694dca29d20d8e162
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Fri May 20 13:44:08 2022 +0800

        [Keyboard] launch_1 LED index correction (#17118)

    commit 0dbaa7e057d8614b9f7edc7568f3fa8ba17cee2b
    Merge: 8b33ca9fe2 94d89dfe82
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 05:38:49 2022 +0000

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

    commit 94d89dfe82b6c631c69f041e211b7710b5a2f744
    Author: aadriance <primaryartemis@outlook.com>
    Date:   Thu May 19 22:38:15 2022 -0700

        [Keyboard] Add Eu isolation Keyboard (#17102)

        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: TuckTuckFloof <stnashmore@gmail.com>

    commit 8b33ca9fe28186cafbe4e017d43838d863421a92
    Merge: a97ed8a1fd c7e114e0bb
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 05:29:11 2022 +0000

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

    commit c7e114e0bb1d8ecb76de632c93db165695f06873
    Author: anubhav dhiman <104914147+anubhavd7@users.noreply.github.com>
    Date:   Fri May 20 10:58:41 2022 +0530

        [Keyboard] add rad keyboard (#17088)

        Co-authored-by: zvecr <git@zvecr.com>

    commit a97ed8a1fd18c9fda89bcb72d7c8e994613b2fc9
    Merge: 83fa6fe916 38073c3d44
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 20 04:38:48 2022 +0000

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

    commit 38073c3d44f5e1093a529803cb724b744af91160
    Author: takashicompany <t@kashi.company>
    Date:   Fri May 20 13:38:00 2022 +0900

        [Keyboard] Add miniZone keyboard (#16644)

        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit 83fa6fe916bfd7d337f05d7805f0a51ad86c8b43
    Author: GloriousThrall <74627436+GloriousThrall@users.noreply.github.com>
    Date:   Thu May 19 19:47:22 2022 -0500

        Move GMMK Pro to allow for multiple revisions (#16423)

        * Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility.

        * GMMK PRO MCU Updates only (removed other kbs)

        * fix problems

        * Optimize the code.

        * Update form develop branch

        * Update

        * Updater from qmk/develop

        * Update

        * Update config.h

        * Update config.h

        * Remove gmmk pro rev2

        * move moults31/keymap.c

        * Update

        * tidy up

        Co-authored-by: Joy <chang.li@westberrytech.com>
        Co-authored-by: zvecr <git@zvecr.com>

    commit b5608cbb6d8a5a24d9c3b928521acbc57726831f
    Author: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
    Date:   Thu May 19 17:39:00 2022 -0700

        Continue Caps Word when AltGr (right Alt) is held. (#17156)

        This is a minor bug fix for Caps Word. Currently, Caps Word turns off
        whenever a non-shift mod becomes active. This is done to avoid
        interfering with hotkeys.

        This commit makes an exception to continue Caps Word when AltGr (right
        Alt) is held. Outside the US, the AltGr key is used to type additional
        symbols (https://en.wikipedia.org/wiki/AltGr_key). Depending on the
        language, these may include symbols used within words like accented
        letters where it would be desirable to continue Caps Word.

    commit 36c8462f0a64e64a6ad832053368109f7c1ebf67
    Merge: b4d65aac7f c4c67f2eb2
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 19 20:26:30 2022 +0000

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

    commit c4c67f2eb2d27bff909110e2b7fceb937e92277b
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Thu May 19 13:25:56 2022 -0700

        KBDfans Tiger80 Community Layout Support and Keymap Touch-Up (#17149)

        * info.json: apply friendly formatting

        * rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan

        * enable Community Layout support

        * refactor keymaps to use grid alignment

    commit b4d65aac7f4069fd9ee4a024f3d4510438794ddf
    Merge: 19e6e6d1de 394f147897
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 19 17:55:45 2022 +0000

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

    commit 394f1478979e2581beb376e6a56cce052c96ce95
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Thu May 19 10:54:57 2022 -0700

        KBDfans Phase One Layout Macro Additions and Configurator Data (#17148)

        * phaseone.h: add matrix diagram

        * add QMK Configurator data

        * add LAYOUT_65_ansi_blocker_split_bs macro

        * add LAYOUT_65_ansi_wkl_split_bs macro

        * add LAYOUT_65_iso_blocker macro

        * add LAYOUT_65_iso_blocker_split_bs macro

        * add LAYOUT_65_iso_wkl macro

        * add LAYOUT_65_iso_wkl_split_bs macro

        * rename LAYOUT_65_ansi_wkl to LAYOUT_65_ansi_blocker_tsangan_wkl

        Differentiates the layout supported here from QMK's `65_ansi_blocker_tsangan` Community Layout, which is equivalent to this but with a 1u GUI key between Left Ctrl and Left Alt.

        * rename new layout macros for codebase consistency

        - `LAYOUT_65_ansi_wkl_split_bs` -> `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs`
        - `LAYOUT_65_iso_wkl` -> `LAYOUT_65_iso_blocker_tsangan_wkl`
        - `LAYOUT_65_iso_wkl_split_bs` -> `LAYOUT_65_iso_blocker_tsangan_wkl_split_bs`

        * add reference keymaps

        Add keymaps which demonstrate the layout macro implementations.

    commit 19e6e6d1deafcd2c98b2c909f008628346615a5e
    Merge: ce9a5aaef3 89e0fba75d
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 19 07:48:36 2022 +0000

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

    commit 89e0fba75db52ee37bfae98fbae3e038496b75df
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Thu May 19 00:48:01 2022 -0700

        Hineybush Ibis Layout Additions and Configurator Rendering Update (#17132)

        * info.json: apply friendly formatting

        * info.json: remove dead space from rendering

        * info.json: insert line breaks between physical rows in layout data

        * info.json: fix overlap in key rendering

        Fixes an issue where the ANSI Enter key renders on top of the ISO Hash/Tilde key, visually hiding the latter.

        * add LAYOUT_ansi_all macro with associated keymap

        Duplicates `LAYOUT_all`, but with the ISO Hash/Tilde and ISO Backslash keys removed.

            - ANSI Enter and 2.25u Left Shift
            - Backspace, Right Shift, Numpad Plus and Numpad Enter all split
            - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row

        * add LAYOUT_iso_all macro with associated keymap

        Duplicates `LAYOUT_all`, but with the ANSI Backslash key removed.

            - ISO Enter and 1.25u Left Shift
            - Backspace, Right Shift, Numpad Plus and Numpad Enter all split
            - 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row

    commit ce9a5aaef36ceee96fc6d44d3589caedf65b59bd
    Merge: 3904a6afbe 80405c6d96
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 18 19:58:37 2022 +0000

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

    commit 80405c6d9638c614b97f743ed036696585b242d4
    Author: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
    Date:   Thu May 19 04:58:03 2022 +0900

        Fix platforms/avr/drivers/ws2812.c (#17043)

        * Fix platforms/avr/drivers/ws2812.c

        `platforms/avr/drivers/ws2812.c` has been changed to use `DDRx_ADDRESS()` and `PORTx_ADDRESS()` instead of `_SFR_IO8()` in #8646.  To use them, `#include <pin_defs.h>` is required.

         ## Error Log
        * create new keyboard
        ```shell
        bash-3.2$ qmk new-keyboard
        Ψ Generating a new QMK keyboard directory

        Name Your Keyboard Project
        For more infomation, see:
        https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject

        Keyboard Name? ws2812_test
        ..................................
             36. WB32F3G71
        Please enter your choice:  [12]
        Ψ Created a new keyboard called ws2812_test.
        Ψ To start working on things, `cd` into keyboards/ws2812_test,
        Ψ or open the directory in your preferred text editor.
        Ψ And build with qmk compile -kb ws2812_test -km default.
        ```
        * Enable RGBLIGHT.
        ```shell
        bash-3.2$ echo RGBLIGHT_ENABLE=yes >> ./keyboards/ws2812_test/rules.mk
        bash-3.2$ echo '#define RGB_DI_PIN B1' >> ./keyboards/ws2812_test/config.h
        bash-3.2$ echo '#define RGBLED_NUM 6' >> ./keyboards/ws2812_test/config.h
        ```
        * Compile
        ```shell
        bash-3.2$ make ws2812_test:default

        QMK Firmware 0.16.9
        Making ws2812_test with keymap default

        avr-gcc (Homebrew AVR GCC 8.4.0_2) 8.4.0
        Copyright (C) 2018 Free Software Foundation, Inc.
        This is free software; see the source for copying conditions.  There is NO
        warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

        .....................
        Compiling: quantum/process_keycode/process_rgb.c                                                    [OK]
        Compiling: platforms/avr/drivers/ws2812.c                                                          platforms/avr/drivers/ws2812.c: In function 'ws2812_setleds':
        platforms/avr/drivers/ws2812.c:40:5: error: implicit declaration of function 'DDRx_ADDRESS' [-Werror=implicit-function-declaration]
             DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
             ^~~~~~~~~~~~
        In file included from <command-line>:
        ./keyboards/ws2812_test/config.h:21:20: error: 'B1' undeclared (first use in this function); did you mean 'PB1'?
         #define RGB_DI_PIN B1
                            ^~
        platforms/avr/drivers/ws2812.c:40:18: note: in expansion of macro 'RGB_DI_PIN'
             DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
                          ^~~~~~~~~~
        ./keyboards/ws2812_test/config.h:21:20: note: each undeclared identifier is reported only once for each function it appears in
         #define RGB_DI_PIN B1
                            ^~
        platforms/avr/drivers/ws2812.c:40:18: note: in expansion of macro 'RGB_DI_PIN'
             DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
                          ^~~~~~~~~~
        platforms/avr/drivers/ws2812.c:42:47: error: implicit declaration of function 'PORTx_ADDRESS' [-Werror=implicit-function-declaration]
             uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN);
                                                       ^~~~~~~~~~~~~
        In file included from /usr/local/Cellar/avr-gcc@8/8.4.0_2/avr/include/avr/io.h:99,
                         from /usr/local/Cellar/avr-gcc@8/8.4.0_2/avr/include/avr/interrupt.h:38,
                         from platforms/avr/drivers/ws2812.c:24:
        platforms/avr/drivers/ws2812.c: In function 'ws2812_sendarray_mask':
        ./keyboards/ws2812_test/config.h:21:20: error: 'B1' undeclared (first use in this function); did you mean 'PB1'?
         #define RGB_DI_PIN B1
                            ^~
        platforms/avr/drivers/ws2812.c:167:69: note: in expansion of macro 'RGB_DI_PIN'
                              : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo));
                                                                             ^~~~~~~~~~
        cc1: all warnings being treated as errors
         [ERRORS]
         |
         |
         |
        make[1]: *** [.build/obj_ws2812_test_default/ws2812.o] Error 1
        make: *** [ws2812_test:default] Error 1
        Make finished with errors
        ```

        * change include order

    commit 3904a6afbe41e35c231dc449e3e2fa839d7b35a9
    Merge: 6503987c84 33d568e29b
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 18 17:33:52 2022 +0000

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

    commit 33d568e29b454e5ead83b9e7216bd807549cc9b6
    Author: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
    Date:   Thu May 19 02:33:17 2022 +0900

        Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, helix/rev3_5rows:five_rows) (#16966)

        * add users/mtei/key_blocks.h

        This change does not alter the binary of the build result.

        Moved common macro definitions in the following files to users/mtei/key_blocks.h.
         * keyboards/helix/rev2/keymaps/five_rows/keymap.c
         * keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c

        * remove INIT_HELIX_OLED() in helix:five_rows

        This change does not alter the binary of the build result.

        * update helix/pico/keymaps/mtei/keymap.c

        Changed helix/pico/keymaps/mtei/keymap.c to use users/mtei/key_blocks.h.

        This change does not alter the binary of the build result.

        * Remove old SSD1306OLED code from users/mtei/oled_display.c

        This change does not alter the binary of the build result.

        * add options ENABLE_COLEMAK, ENABLE_DVORAK and ENABLE_EUCALYN into five_rows/keymap.c

        * add users/mtei/{config.h,rules.mk,user_featues.mk,user_options.mk}

        * move layer_names[] from users/mtei/oled_display.c to keymaps/five_rows/keymap.c

        * Update keyboards/helix/pico/keymaps/mtei/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/pico/keymaps/mtei/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/pico/keymaps/mtei/keymap.c

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev2/keymaps/five_rows/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev2/keymaps/five_rows/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev2/keymaps/five_rows/keymap.c

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/cpp_map.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/cpp_map.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/debug_config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/debug_config.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update users/mtei/layer_number_util.h

        Co-authored-by: Ryan <fauxpark@gmail.com>

        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 6503987c84994b2c6b5229db8b91c14d8bd11e41
    Author: Joel Challis <git@zvecr.com>
    Date:   Wed May 18 11:06:55 2022 +0100

        Workaround for recent -Werror=array-bounds AVR issues (#17136)

    commit 40e33d03a89575e30d94851cbc34fbdbf6a069b6
    Author: Joel Challis <git@zvecr.com>
    Date:   Tue May 17 21:50:48 2022 +0100

        Recommend pillow as part of manual MSYS install (#17133)

    commit 37eee020ed46262e98a78c4c84a8fb8804348086
    Merge: 6a11331a41 d241e80533
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 18:49:34 2022 +0000

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

    commit d241e80533b445d042e89d7eae5f0e5f88c0ce44
    Author: Ryan <fauxpark@gmail.com>
    Date:   Wed May 18 04:48:59 2022 +1000

        Keymap FAQ updates (#17130)

    commit 6a11331a4187a35e44ef96fa54e918461d0bc9d8
    Merge: 8b79f30cd5 f736828fa8
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 16:13:31 2022 +0000

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

    commit f736828fa8801748d6446ad74fb704bdbc7e599b
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Tue May 17 09:12:52 2022 -0700

        Frooastside Walnut Community Layout Support (#17112)

        * LAYOUT_iso: move Enter to home row

        This commit makes the layout macro compatible with QMK's `tkl_nofrow_iso` Community Layout.

        * rename LAYOUT_ansi to LAYOUT_tkl_nofrow_ansi

        * rename LAYOUT_iso to LAYOUT_tkl_nofrow_iso

        * enable Community Layout support

    commit 8b79f30cd5ed1f069b86ff955b633fa4d338e881
    Merge: cc8c539d00 dba5b730a3
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 13:20:51 2022 +0000

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

    commit dba5b730a3f112b40d9f19881e0c5eaa03672452
    Author: durken1 <71756879+durken1@users.noreply.github.com>
    Date:   Tue May 17 15:20:13 2022 +0200

        Update pr_checklist.md (#17122)

    commit cc8c539d002aa95e99d374c987701f396b2618f4
    Merge: 7541e75c3e 6560903350
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 12:01:31 2022 +0000

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

    commit 656090335066eed90a9b76e113fb93ee3bc8c089
    Author: John-Schreiber <56258966+John-Schreiber@users.noreply.github.com>
    Date:   Tue May 17 08:01:26 2022 -0400

        Adding VIA support for bfo-9000 (#17116)

    commit 654baebb2c3e1706a20c985dfde35a9b7bd6958a
    Author: Xelus22 <17491233+Xelus22@users.noreply.github.com>
    Date:   Tue May 17 22:00:26 2022 +1000

        fix non-working builds (#17123)

    commit 7541e75c3e257fce7c7b507fc958fa84e19fa265
    Merge: 978e2fcd14 e9e83b4da7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 05:05:36 2022 +0000

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

    commit e9e83b4da73e5594b1f864d78529e85aa5ebefe9
    Author: HorrorTroll <sonicvipduc@gmail.com>
    Date:   Tue May 17 12:05:05 2022 +0700

        [Keyboard] Fixed Gas75 info.json and keymap for M64 RGB (#17081)

    commit 978e2fcd14e4d597d5140fe1642568bd6626d773
    Merge: 1a61f1f578 b6ee006060
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 05:03:38 2022 +0000

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

    commit b6ee006060d7e0767a380a1d6e0e8126553d0482
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Tue May 17 13:03:08 2022 +0800

        [Keyboard] lulu LED index correction (#17108)

    commit 1a61f1f5787c0f176b2dc88813c1f2ac564acc4d
    Merge: 68f466db87 8b9cb030a7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 05:02:48 2022 +0000

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

    commit 8b9cb030a74ced2c50fe62e2fd259e16a93e33bf
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Tue May 17 13:02:35 2022 +0800

        [Keyboard] Latinpad LED index correction (#17109)

    commit aa970e85609e46f69ae14f09ec072fea8d165021
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Tue May 17 13:02:14 2022 +0800

        [Keyboard] mach3 LED index correction (#17110)

    commit 68f466db875d77ed9d0b28f657c2bc0e855dc833
    Merge: ac1173c3d4 467f3ae872
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 04:46:07 2022 +0000

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

    commit 467f3ae872101ed6c1c3cbf10f18384304ddbb6e
    Author: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
    Date:   Tue May 17 01:45:56 2022 -0300

        [Keyboard] Add Iron165R2 PCB support (#16948)

    commit f22e8585a148a19afa45476b69def23c6b997925
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Mon May 16 21:45:11 2022 -0700

        [Keyboard] Fix too many elements in g_led_config for quark_lp (#17117)

    commit ac1173c3d4731b4d65a4af0deef53b95c9914663
    Merge: 6f499cfa12 4b7555117a
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 03:28:01 2022 +0000

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

    commit 4b7555117ad851e1d4fda16a59636e8b705fd985
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Mon May 16 20:27:22 2022 -0700

        [Keyboard] Fix compilation issues for Quark LP (#17009)

        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 6f499cfa1248cb237ac97d168c4cd1ccbcc3a20c
    Merge: d47c4ed4d0 bc2a6cf6ae
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 17 01:45:33 2022 +0000

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

    commit bc2a6cf6aea71e0fdd622370709aa924c9de031f
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Mon May 16 18:44:34 2022 -0700

        DigiCarpice Configurator Rendering Fix (#17113)

        * info.json: apply friendly formatting

        * info.json: rebuild layout data

    commit d47c4ed4d080d3d14e4fd2205f6670b1ce0c7499
    Merge: 5816288926 6a94a9547d
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 16 11:47:33 2022 +0000

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

    commit 6a94a9547d8eca8cea58b14f98a921d485873456
    Author: moyi4681 <moyi4681@users.noreply.github.com>
    Date:   Mon May 16 19:46:37 2022 +0800

        fix tiger80 matrix error (#17107)

    commit 581628892600c422796ee4ad4ccf40d32a28b3af
    Author: Nick Brassel <nick@tzarc.org>
    Date:   Mon May 16 15:29:55 2022 +1000

        Warn about LTO with arm_atsam, not ChibiOS. (#17106)

    commit 85289e34ae32b262ef0546a2eb4b487eb5f3bea5
    Author: Joel Challis <git@zvecr.com>
    Date:   Mon May 16 00:40:56 2022 +0100

        Various fixes for g_led_config lint warnings (#17104)

    commit 608fa5154c01420ff8f0946655ef16c99dec56a4
    Author: Joel Challis <git@zvecr.com>
    Date:   Sun May 15 22:39:29 2022 +0100

        Data driven `g_led_config` (#16728)

    commit b7771ec25b96f2b88a7fa4201081e10ca6fbb9d4
    Author: Joel Challis <git@zvecr.com>
    Date:   Sun May 15 20:26:27 2022 +0100

        RESET -> QK_BOOT default keymaps (#17037)

    commit 4a8bd7b9a523601911ba467588b2a6a0aa693db6
    Author: Ryan <fauxpark@gmail.com>
    Date:   Sun May 15 21:27:01 2022 +1000

        Rename keymap_extras headers for consistency (#16939)

    commit f090881aebbd7af74294b53fabdf55a35004f190
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Sun May 15 04:24:35 2022 -0700

        [Feature] Add support for multiple switchs/solenoids to Haptic Feedback engine (#15657)

    commit 4d107feca9621ee3f342507136b04f176e8f2320
    Author: Stefan Kerkmann <karlk90@pm.me>
    Date:   Sun May 15 00:17:14 2022 +0200

        Check for ongoing transfers on the OUT endpoint (#16974)

        ...when attempting to start a receiving USB transfer. Previously, we would
        check on the IN endpoint which is the transmitting part of the USB endpoint.
        This is wrong and lead to two USB transfers being started immediately
        after each other in case of e.g. RAW HID endpoints:

        1. When finishing an OUT transfer the low level USB driver calls the out_cb
        callback, which in turn initiates another OUT transfer by calling
        qmkusbDataReceived.

        2. When the raw hid receive channel runs empty inside the raw_hid task,
        another OUT transfer is started to potentially fill the channel again. This
        happens by calling ibnotify.

        Both events occur directly after each other, thus triggering the bug.

    commit da632895051558740ca1ca8ecb607a846e2384d7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 15:14:49 2022 -0700

        Format code according to conventions (#17096)

    commit a899c097ce140c261526c93a5527f1e4e8dab613
    Merge: db887e63d7 94755308e0
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 22:09:12 2022 +0000

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

    commit 94755308e0db92bf98d2a32c0717e4a76be7ef6a
    Author: Mateusz Ż <zochowski.mateusz@outlook.com>
    Date:   Sun May 15 00:08:32 2022 +0200

        Fix anchors with <code> in table of content (#15169)

    commit db887e63d708925ad759e3504a6bc9ceef4aeb8f
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Sat May 14 15:07:08 2022 -0700

        Enhancement and fixes of "Secure" feature (#16958)

    commit baa8d07fdb32a35f9ff5020d655271b01e057ddc
    Merge: 710e8c0ccc 3a543d8990
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 21:29:01 2022 +0000

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

    commit 3a543d899088268127ed17a6b978fd7cc84b566a
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Sat May 14 14:28:29 2022 -0700

        Eason Capsule65 Community Layout Support (#17090)

        * capsule65.h: modify matrix diagram

        Taken from the VIA layout data.

        * rename LAYOUT to LAYOUT_all

        * add LAYOUT_65_ansi macro

        * add LAYOUT_65_ansi_blocker macro

        * add LAYOUT_65_ansi_blocker_tsangan macro

        * add LAYOUT_65_ansi_split_bs macro

        * add LAYOUT_65_ansi_blocker_split_bs macro

        * add LAYOUT_65_ansi_blocker_tsangan_split_bs macro

        * add LAYOUT_65_iso macro

        * add LAYOUT_65_iso_split_bs macro

        * add LAYOUT_65_iso_blocker macro

        * add LAYOUT_65_iso_blocker_split_bs macro

        * add LAYOUT_65_iso_blocker_tsangan macro

        * add LAYOUT_65_iso_blocker_tsangan_split_bs macro

        * enable Community Layout support

        * info.json: update maintainer value

        This field is meant to reference the maintainer's GitHub username.

    commit 710e8c0cccac803b79131bc3334a8158b8f52981
    Merge: c0f0f594d4 90a43f9884
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 21:25:09 2022 +0000

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

    commit 90a43f98840db96ac41670748326c5067799e95d
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Sat May 14 14:23:58 2022 -0700

        Axolstudio Foundation Gamma: Community Layout Support (#17080)

        * LAYOUT_tkl_f13_ansi_tsangan support

        Renames `LAYOUT_ansi_tsangan` to `LAYOUT_tkl_f13_ansi_tsangan`. Also enables Community Layout support.

        * LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift support

    commit c0f0f594d4d6d91920403ce6109ecc06dfb27231
    Merge: 78a9e1708a 8c58af39af
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 21:23:13 2022 +0000

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

    commit 8c58af39af2374a5ec8d41ef07ada4e717ae5ff2
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Sat May 14 14:22:39 2022 -0700

        Avalanche: add QMK Configurator data (#17092)

        * avalanche/v1: add info.json

        * avalanche/v2: add info.json

        * avalanche/v3: add info.json

    commit 78a9e1708aedebe2dc83429df25320917fc96210
    Merge: cd8d2b7f7f 24f378e6c3
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 21:22:05 2022 +0000

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

    commit 24f378e6c3d35f7001f81b7d8c217ef034f5fe30
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Sat May 14 14:21:31 2022 -0700

        Clickety Split Leeloo: QMK Configurator Fixes (#17093)

        * info.json: fix key sequence error

        * info.json: fix visual rendering

        Clarify the physical locations of the keys.

        * info.json: update maintainer field

        This field is meant to reference the maintainer's GitHub username.

    commit cd8d2b7f7f0611f04b503479181fd7e9acbe8358
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Sat May 14 13:03:07 2022 -0700

        Revert "Fix kinetic mouse mode (#16951)" (#17095)

    commit 3eb6558602e2c21e79de550a1826d4d50d264972
    Merge: 68b16bba68 2f9197cfcd
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 16:15:06 2022 +0000

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

    commit 2f9197cfcdd11a661cdc1877a8dee9015c4f18de
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Sat May 14 09:14:19 2022 -0700

        F13 TKL with Split Backspace and Split Right Shift Community Layouts (#17082)

        * add tkl_f13_ansi_split_bs_rshift Community Layout

        * add tkl_f13_ansi_tsangan_split_bs_rshift Community Layout

        * add tkl_f13_iso_split_bs_rshift Community Layout

        * add tkl_f13_iso_tsangan_split_bs_rshift Community Layout

    commit 68b16bba68d79c63bbd649a5be58756e937c96da
    Author: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
    Date:   Fri May 13 23:00:32 2022 -0700

        [Core] Add Caps Word feature to core (#16588)

        Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit 90eef4cd153cdc1b00d973e6abb029828f656294
    Author: Yorick Peterse <git@yorickpeterse.com>
    Date:   Sat May 14 07:26:12 2022 +0200

        Fix kinetic mouse mode (#16951)

        Co-authored-by: Jan Christoph Ebersbach <jceb@e-jc.de>

    commit 787a68948fa0d5e251e22a623071082c8c0561b1
    Author: Drashna Jaelre <drashna@live.com>
    Date:   Fri May 13 20:35:49 2022 -0700

        [Core] Add Reboot keycode to core (#15990)

    commit 425c54cf8c459b1cc33deaa53955e2db41aa0b01
    Merge: e0cdeab951 8e2b8413b4
    Author: QMK Bot <hello@qmk.fm>
    Date:   Sat May 14 03:17:20 2022 +0000

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

    commit 8e2b8413b4b0c464da383def06d0269d85aa47cb
    Author: HorrorTroll <sonicvipduc@gmail.com>
    Date:   Sat May 14 10:16:46 2022 +0700

        [Keyboard] Add M64 RGB (#17069)

    commit e0cdeab951bdc80eb276c4b1323d129f1d3d8da5
    Merge: 158dc6829a 82828c3205
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 16:54:39 2022 +0000

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

    commit 82828c3205848ff0e5c1400c2da7018f6c260a0f
    Author: takashicompany <t@kashi.company>
    Date:   Sat May 14 01:53:43 2022 +0900

        [Keyboard] Add keyboard "Spreadwriter" (#17031)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit 158dc6829add1b1618a85c175178aa44ce2b62a7
    Merge: 75a32de441 3a80275fa1
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 16:35:28 2022 +0000

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

    commit 3a80275fa1720aabf95eedb5e2c644d81a764a01
    Author: HorrorTroll <sonicvipduc@gmail.com>
    Date:   Fri May 13 23:34:47 2022 +0700

        [Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (#17070)

    commit 75a32de441ddb7c53192cb411dd0276d628b7012
    Merge: c4b2e9101d e5e7039368
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 06:36:47 2022 +0000

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

    commit e5e7039368f2efd03005ce6b37a49d591608e8dc
    Author: Stephon Parker <sgparker62@gmail.com>
    Date:   Fri May 13 02:36:12 2022 -0400

        [Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update layout (#16787)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: Stephon Parker <stephonparker@Stephons-MacBook-Pro.local>

    commit c4b2e9101d82fcb146569dca2d81a1c6564a055d
    Merge: ff8c962d2e ffe16386f0
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 06:34:42 2022 +0000

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

    commit ffe16386f0d4ad280fe8eb6a97e3fac082930f83
    Author: Josh Hinnebusch <joshhinnebusch@gmail.com>
    Date:   Fri May 13 02:33:53 2022 -0400

        [Keyboard] H60 updates (#16999)

        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit ff8c962d2ec8586637e40e6fcc72c258bf6bc79e
    Merge: 478f83f711 fc3d3ef076
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 06:22:36 2022 +0000

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

    commit fc3d3ef0764c9b3703e9aa5b57ec298b1ab24c6a
    Author: Andrew Kannan <andrew.kannan@gmail.com>
    Date:   Fri May 13 02:22:03 2022 -0400

        [Keyboard] Add caps and num indicators to Balance keyboard (#17075)

    commit 478f83f711ac8305966b28cf4fa7fa0cee46c46e
    Merge: e53e75f4ce c199514372
    Author: QMK Bot <hello@qmk.fm>
    Date:   Fri May 13 06:21:56 2022 +0000

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

    commit c199514372b40dea4b79cb02a65558715e1a628e
    Author: Kyle McCreery <mccreery.kyle@gmail.com>
    Date:   Fri May 13 02:21:25 2022 -0400

        [Bug] Updated Cirque Pinnacle SPI driver to read data correctly (#17074)

    commit e53e75f4cef45b03d2fe15e6d7206afd7246238f
    Merge: 6b39a38212 58c37c0814
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 20:11:40 2022 +0000

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

    commit 58c37c08149ca0bd754a13a32fc4ee6946e07662
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Thu May 12 13:11:02 2022 -0700

        65_iso_split_bs Community Layout keymap bugfix (#17072)

        Fix the layout macro reference in the `keymap.c` file, which caused this keymap to not be able to be compiled.

    commit 6b39a38212f72bc88f3dde441b7b87cf0b5ebeea
    Merge: a8183340d0 b26ba52bdd
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 18:24:53 2022 +0000

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

    commit b26ba52bdde82ec2920fa258079026f31d14b192
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Thu May 12 11:24:40 2022 -0700

        [Keyboard] KBIC65 Refactor (#17066)

    commit 59fa34a6fab9a3dfa281e8595bdbd08f728dacb8
    Author: jack <0x6A73@pm.me>
    Date:   Thu May 12 12:24:03 2022 -0600

        [Keyboard] Refactor mechwild/mokulua (#17068)

    commit a8183340d0986ed2080de906bc29725f05d9183d
    Merge: ec7801e2cb c0ab4ed539
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 06:49:59 2022 +0000

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

    commit c0ab4ed539bad0a490e19ee86c093d3c3f5e02c2
    Author: Astrid Yu <astrid@astrid.tech>
    Date:   Wed May 11 23:49:15 2022 -0700

        Allow overriding Niv inputs in shell.nix (#16602)

    commit ec7801e2cbfaae5208a147e85157f82ceb0f1dbe
    Merge: ff9aca781a 8a4ef2b3c4
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 05:52:09 2022 +0000

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

    commit 8a4ef2b3c4a388a563c95e75eb744514a210dfe2
    Author: HorrorTroll <sonicvipduc@gmail.com>
    Date:   Thu May 12 12:51:37 2022 +0700

        [Keyboard] Move M63 RGB into maker folder (#17061)

    commit ff9aca781aa7c9448033cfcaaa0f3e013993cf9f
    Merge: 56ca807f85 77aba32bc6
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 05:28:32 2022 +0000

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

    commit 77aba32bc61a47d551b030f61cae582599652712
    Author: jack <0x6A73@pm.me>
    Date:   Wed May 11 23:27:58 2022 -0600

        initial (#17067)

    commit 56ca807f85fdb4254f04bff87d9052a343c310ec
    Merge: a284b99876 d6e1de8c83
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 04:49:18 2022 +0000

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

    commit d6e1de8c83996e4cef8ca8df6b2745281c46c754
    Author: Kyle McCreery <mccreery.kyle@gmail.com>
    Date:   Thu May 12 00:49:11 2022 -0400

        [Keyboard] Add Mokulua keyboard (#17055)

        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit 4d1332b62c53282631aa8d24fee1105c6322352a
    Author: JX <572673807@qq.com>
    Date:   Thu May 12 12:48:47 2022 +0800

        [Keyboard] Cleanup zhou65 and add nz64 keyboard (#17032)

        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit a284b99876168b6034d02b91ee2254293324a6ee
    Merge: b03daac76b ffa1b37634
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 04:48:35 2022 +0000

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

    commit ffa1b37634418a4928e7d2b64cb08f31512dcedf
    Author: HorrorTroll <sonicvipduc@gmail.com>
    Date:   Thu May 12 11:47:41 2022 +0700

        [Keyboard] Add Black E6.5 keyboard (#16807)

    commit b03daac76b094c2ffbfbc3390fce7405db3e6ab8
    Merge: 12fe4c49de 7fd05afb10
    Author: QMK Bot <hello@qmk.fm>
    Date:   Thu May 12 00:09:49 2022 +0000

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

    commit 7fd05afb100966032ebd10378f68d0446e23ed71
    Author: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
    Date:   Thu May 12 10:09:10 2022 +1000

        [Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#16917)

        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit 12fe4c49de6c8a68d65486086dadb7a38fc19280
    Merge: d3443a4e8b 37417d531d
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 23:55:09 2022 +0000

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

    commit 37417d531d524d674ea7b1dcf8678f6679738e2f
    Author: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
    Date:   Thu May 12 09:54:27 2022 +1000

        [Keyboard] remove handwired/reddot as per #14211 (#17033)

    commit d3443a4e8b713adb828ae8b7bab7d3d75a6acdaa
    Merge: da02de5413 fa6fe11c33
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 23:40:13 2022 +0000

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

    commit fa6fe11c33354699a84023a7a6a2dcdf5f0b46b3
    Author: sauvehoo <76417304+sauvehoo@users.noreply.github.com>
    Date:   Wed May 11 16:39:59 2022 -0700

        [Keyboard] Add ano keyboard (#16885)

        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 767e7db0edb4a5d3b40699cdb350c8eba37ebd19
    Author: TJ <tom.campie@gmail.com>
    Date:   Wed May 11 18:39:35 2022 -0500

        [Keyboard] Littlefoot lx dev (#16771)

        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit da02de54136ebd19ea64b295b1c5a2e6fe7d6217
    Merge: bc6956909a ddba52325c
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 23:38:15 2022 +0000

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

    commit ddba52325cee971c83aeb030536340f79db37204
    Author: 4pplet <mail@4pplet.com>
    Date:   Thu May 12 00:37:43 2022 +0100

        [Keyboard] Yakiimo PCB (#16984)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: 4pplet <4pplet@protonmail.com>
        Co-authored-by: 4pplet <stefan.ess@gmail.com>

    commit bc6956909a3caf3e5ec73340072fce60d1a1304b
    Merge: be08c86451 df9c266f45
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 23:09:53 2022 +0000

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

    commit df9c266f45c947a2ae71f213096ef0d832f3e336
    Author: Minke Zhang <minke.zhang@gmail.com>
    Date:   Wed May 11 16:09:14 2022 -0700

        [Keyboard] Update YMDK Split 64 config (#16979)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit be08c86451e79b6e1c9a229a8caef62e944f375e
    Merge: 6024ade4fa ba59927018
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 22:39:48 2022 +0000

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

    commit ba599270189242a728a230e7879b9c189a22053f
    Author: Daniel Osipishin <88534270+subrezon@users.noreply.github.com>
    Date:   Thu May 12 00:39:08 2022 +0200

        [Keyboard] Add subrezon/la_nc keyboard (#16833)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>
        Co-authored-by: Daniel Osipishin <daniel.osipishin@retarus.de>

    commit 6024ade4faa4dabd3fa3501335a93bcb34f7ab17
    Merge: 48eafd98ef 8e9a81a860
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 19:52:13 2022 +0000

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

    commit 8e9a81a86077349b98b6c381d7f75ff10b161295
    Author: James Young <18669334+noroadsleft@users.noreply.github.com>
    Date:   Wed May 11 12:51:39 2022 -0700

        KBDfans KBD75 Refactor - 2022 Edition (#17052)

        * add license headers

        * tidy-up revision rules.mk files

        - convert tabs to spaces
        - align inline comments
        - update rule ordering

        * touch-up readme.md

        * touch-up rev1/rev1.h

        - convert tabs to spaces
        - convert to QMK 3-character notation for matrix positions

        * rev1/rev1.h: add matrix diagram

        * touch-up rev2/rev2.h

        - convert tabs to spaces
        - convert to QMK 3-character notation for matrix positions

        * rev2/rev2.h: add matrix diagrams

        * rev1/info.json: apply friendly formatting

        * rev2/info.json: apply friendly formatting

        * refactor layout macros

        - switch `LAYOUT_ansi_1u` with `LAYOUT_75_ansi`
          - makes `LAYOUT_75_ansi` the canonical macro name, with `LAYOUT_ansi_1u` as an alias for backwards compatibility
          - move `LAYOUT_ansi_1u` alias to `info.json` files from revision headers
        - remove `LAYOUT_iso_1u` (was unused)
        - rename `LAYOUT_ansi` to `LAYOUT_75_ansi_rwkl`
        - rename `LAYOUT_iso` to `LAYOUT_75_iso_rwkl`

        * refactor default keymap

        - use four-space indent
        - update grid alignment

        * refactor iso keymap

        - refactor to use `LAYOUT_75_iso` macro
          - change from Split to 2u Backspace
          - change from Split to Standard Spacebar
          - change `KC_BSLS` keycode to `KC_NUHS`, and place on home row
        - use four-space indent
        - update grid alignment

        * refactor via keymap

        - use four-space indent
        - update grid alignment

        * touch-up readme.md again

        Fix a broken link.

        * update section comments in revision header files

        * add Full Winkeyless layouts

        - add `LAYOUT_75_ansi_wkl` and `LAYOUT_75_iso_wkl` layout macros

    commit 48eafd98efcdd3bead54da281d3b3bea126c5313
    Merge: 8c16efabaf c9e336fde6
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 11:30:44 2022 +0000

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

    commit c9e336fde6c69b87ab7f57832c762c67222ff06c
    Author: Willy Breitenbach <willybr@me.com>
    Date:   Wed May 11 13:30:05 2022 +0200

        [Keyboard] fix tf65rgbv2 keyboard layout (#17029)

    commit 8c16efabaf479d772ee1d0539369582ee1162d89
    Merge: 7a7a413730 214d2a31ed
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 11:13:23 2022 +0000

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

    commit 214d2a31ed51bebde1b0635ec0591dd444d2d706
    Author: Albert Y <76888457+filterpaper@users.noreply.github.com>
    Date:   Wed May 11 19:12:47 2022 +0800

        [Keyboard] Add usable tap-hold defaults for ferris via (#16696)

    commit 7a7a413730b75ea9e0155829a9fe35f24f185e3c
    Merge: 869b3a030e 371499c3a7
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 10:58:18 2022 +0000

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

    commit 371499c3a79227d55ac481d23060074edc8c155a
    Author: peepeetee <43021794+peepeetee@users.noreply.github.com>
    Date:   Wed May 11 18:57:46 2022 +0800

        [Keyboard] Momokai Tap Trio (#16463)

        * add winry3m3w

        * change name to Momokai Tap Trio

        * Delete settings.json

        * add rgb effects

        * amend default keymap

        * add limited RGB controls to default keymap

        * fix VAD

        * Update keyboards/momokai/tap_trio/tap_trio.h

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/momokai/tap_trio/tap_trio.h

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/momokai/tap_trio/config.h

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update keyboards/momokai/tap_trio/rules.mk

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * implement RGB matrix, change default keymap

        * change keymaps

        * change rgb effects

        * comment out the RGB matrix and switch back to RGB light due to VIA not playing ball

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 869b3a030ef74de9d53940078af8cc381efd23ab
    Merge: 6641c4cecb f3fdd6ae5d
    Author: QMK Bot <hello@qmk.fm>
    Date:   Wed May 11 10:15:08 2022 +0000

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

    commit f3fdd6ae5d150f39df75ed1524c72b184e06d3a6
    Author: kb-elmo <lorwel@mailbox.org>
    Date:   Wed May 11 12:13:50 2022 +0200

        [Keyboard] Add Axostudio Yeti hotswap version (#16820)

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 6641c4cecb7c04299a1120a5c22209a9bd6b3fa5
    Merge: bda47ad467 615dbd62e9
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 10 18:07:59 2022 +0000

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

    commit 615dbd62e945fde4c26335ed24774d1feeb1dadf
    Author: takashicompany <t@kashi.company>
    Date:   Wed May 11 03:07:01 2022 +0900

        [Keyboard] Fix led num for center_enter/qoolee (#17050)

    commit bda47ad4677e8fa58543620c6b3cd0d09287f95f
    Merge: 4957a633e9 a3e057e779
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 10 16:01:25 2022 +0000

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

    commit a3e057e779ae1d9f827a859722428f03c2b118f1
    Author: Eugene-Yuan Kou <r02323025@ntu.edu.tw>
    Date:   Wed May 11 00:00:30 2022 +0800

        Adding akira (#16982)

        * keyboard:akira initial commit

        * Update keyboards/ekow/akira/akira.h

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/ekow/akira/keymaps/via/rules.mk

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/ekow/akira/readme.md

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update .gitignore

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update readme.md

        * Update keyboards/ekow/akira/rules.mk

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update rules.mk

        remove redundant content.

        * added keyboard/ekow/keymaps/via/keymap.c

        * remove .ccls-cache

        * add instructions of enter the bootloader

        * add instructions of enter the bootloader

        * modify ekow/akira:via

        * Update keyboards/ekow/akira/readme.md

        Co-authored-by: Ryan <fauxpark@gmail.com>

        * Update keyboards/ekow/akira/keymaps/via/rules.mk

        Co-authored-by: Ryan <fauxpark@gmail.com>

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>
        Co-authored-by: Ryan <fauxpark@gmail.com>

    commit 4957a633e922a09660d4fc60f4367a0ebe84d500
    Merge: bfa04efada 796ededd59
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 10 12:26:23 2022 +0000

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

    commit 796ededd5950e0378a9466288fbbdc219251f968
    Author: 8bits4ever <87928173+8bits4ever@users.noreply.github.com>
    Date:   Tue May 10 14:25:42 2022 +0200

        converter/a1200/mistress1200: further firmware shrinking to fit on Atmega16U4 (16kb) (#17040)

        * Create dummy.txt

        * Add files via upload

        * Add files via upload

        * Delete dummy.txt

        * Update config.h

        * Update rules.mk

        * Update keymap.c

        * Update keyboards/converter/a1200/mistress1200/rules.mk

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/converter/a1200/mistress1200/rules.mk

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/converter/a1200/mistress1200/rules.mk

        Co-authored-by: Joel Challis <git@zvecr.com>

        * Update keyboards/converter/a1200/mistress1200/config.h

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update keyboards/converter/a1200/mistress1200/config.h

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update keyboards/converter/a1200/mistress1200/config.h

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update keyboards/converter/a1200/mistress1200/rules.mk

        Co-authored-by: Drashna Jaelre <drashna@live.com>

        * Update config.h

        * Update rules.mk

        * Update readme.md

        * Update config.h

        * Update rules.mk

        * Update config.h

        * Update keyboards/converter/a1200/mistress1200/config.h

        Co-authored-by: Joel Challis <git@zvecr.com>

        Co-authored-by: Joel Challis <git@zvecr.com>
        Co-authored-by: Drashna Jaelre <drashna@live.com>

    commit bfa04efada377b7cac2cfcb92e8cf50ef4202b0a
    Merge: f1c69e5d2c 120d5d5520
    Author: QMK Bot <hello@qmk.fm>
    Date:   Tue May 10 01:29:03 2022 +0000

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

    commit 120d5d5520eff41a06f6544df42547ec4602d007
    Author: Jay Greco <jayv.greco@gmail.com>
    Date:   Mon May 9 18:28:16 2022 -0700

        Update RMKB to support SNAP (#17042)

    commit f1c69e5d2c81961d2705bcf46601c517d1fd2c51
    Merge: 7177434a02 76eff706f6
    Author: QMK Bot <hello@qmk.fm>
    Date:   Mon May 9 01:05:49 2022 +0000

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

    commit 76eff706f6f0a5a4599be52aa5553465449cccc0
    Author: Guillaume Gérard <1322081+GreatWizard@users.noreply.github.com>
    Date:   Mon May 9 03:05:05 2022 +0200

        feat: add support for JJ50 VIA (#16420)

    commit 7177434a02496793e8e8b4ff5d43da8aad3cf029
    Author: Ryan <fauxpark@gmail.com>
    Date:   Sat May 7 22:01:46 2022 +1000

        MSYS2 install: add some Python dependencies through Pacman (#17025)

    commit 785444199eac4d9ced15d90c7ef8dfbec86b8fd8
    Merge: 4e9a811e58 5acdb4c921
    Author: …
  • Loading branch information
willdhorn committed May 31, 2022
1 parent 5344cae commit 4b40d0e
Show file tree
Hide file tree
Showing 5,955 changed files with 121,302 additions and 27,249 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/api.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
SOURCE_DIR: 'api_data'
SOURCE_DIR: '.build/api_data'
18 changes: 18 additions & 0 deletions .github/workflows/auto_approve.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Automatic Approve

on:
schedule:
- cron: "*/5 * * * *"

jobs:
automatic_approve:
runs-on: ubuntu-latest

if: github.repository == 'qmk/qmk_firmware'

steps:
- uses: mheap/automatic-approve-action@v1
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
workflows: "format.yml,lint.yml,unit_test.yml"
dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
0 .github/workflows/auto_tag.yaml → .github/workflows/auto_tag.yml
View file
File renamed without changes.
6 changes: 4 additions & 2 deletions .github/workflows/develop_api.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ jobs:
persist-credentials: false

- name: Generate API Data
run: qmk generate-api
run: |
python3 -m pip install -r requirements-dev.txt
qmk generate-api
- name: Upload API Data
uses: jakejarvis/s3-sync-action@master
Expand All @@ -35,4 +37,4 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
SOURCE_DIR: 'api_data'
SOURCE_DIR: '.build/api_data'
9 changes: 1 addition & 8 deletions .github/workflows/develop_update.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- master


jobs:
develop_update:
runs-on: ubuntu-latest
Expand All @@ -15,21 +14,15 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0

- name: Checkout develop
run: |
git fetch origin master develop
git checkout develop
- name: Check if branch locked
id: check_locked
uses: andstor/file-existence-action@v1
with:
files: ".locked"

- name: Update develop from master
if: steps.check_locked.outputs.files_exists == 'false'
run: |
git config --global user.name "QMK Bot"
git config --global user.email "hello@qmk.fm"
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/feature_branch_update.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Update feature branches after develop merge

on:
push:
branches:
- develop

jobs:
feature_branch_update:
runs-on: ubuntu-latest

if: github.repository == 'qmk/qmk_firmware'

strategy:
matrix:
branch:
- xap

steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.QMK_BOT_TOKEN }}
fetch-depth: 0

- name: Checkout branch
run: |
git fetch origin develop ${{ matrix.branch }}
git checkout ${{ matrix.branch }}
- name: Update branch from develop
run: |
git config --global user.name "QMK Bot"
git config --global user.email "hello@qmk.fm"
git merge origin/develop
git push origin ${{ matrix.branch }}
0 .github/workflows/format.yaml → .github/workflows/format.yml
View file
File renamed without changes.
0 .github/workflows/format_push.yaml → .github/workflows/format_push.yml
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion .github/workflows/unit_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ jobs:
test:
runs-on: ubuntu-latest

container: qmkfm/base_container
container: qmkfm/qmk_cli

steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Install dependencies
run: pip3 install -r requirements-dev.txt
- name: Run tests
run: make test:all
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@ user_song_list.h
compile_commands.json
.clangd/
.cache/

# VIA(L) json files that don't belong in QMK repo
via*.json
1 change: 0 additions & 1 deletion api_data/_config.yml
View file

This file was deleted.

10 changes: 10 additions & 0 deletions builddefs/bootloader.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,18 @@ ifeq ($(strip $(BOOTLOADER)), halfkay)
OPT_DEFS += -DBOOTLOADER_HALFKAY
BOOTLOADER_TYPE = halfkay

# Teensy 2.0
ifeq ($(strip $(MCU)), atmega32u4)
BOOTLOADER_SIZE = 512
endif
# Teensy 2.0++
ifeq ($(strip $(MCU)), at90usb1286)
BOOTLOADER_SIZE = 1024
endif
# Teensy LC, 3.x
ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK66FX1M0))
FIRMWARE_FORMAT = hex
endif
endif
ifeq ($(strip $(BOOTLOADER)), caterina)
OPT_DEFS += -DBOOTLOADER_CATERINA
Expand Down Expand Up @@ -202,6 +208,10 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
OPT_DEFS += -DBOOTLOADER_MD_BOOT
BOOTLOADER_TYPE = md_boot
endif
ifeq ($(strip $(BOOTLOADER)), wb32-dfu)
OPT_DEFS += -DBOOTLOADER_WB32_DFU
BOOTLOADER_TYPE = wb32_dfu
endif

ifeq ($(strip $(BOOTLOADER_TYPE)),)
$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
Expand Down
36 changes: 23 additions & 13 deletions builddefs/build_keyboard.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,22 +159,20 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")

# Add rules to generate the keymap files - indentation here is important
$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
@$(BUILD_CMD)

$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H))
@$(BUILD_CMD)

generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c

endif

ifeq ($(strip $(CTPC)), yes)
CONVERT_TO_PROTON_C=yes
endif

ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
include platforms/chibios/boards/QMK_PROTON_C/convert_to_proton_c.mk
endif
include $(BUILDDEFS_PATH)/converters.mk

include $(BUILDDEFS_PATH)/mcu_selection.mk

Expand Down Expand Up @@ -324,17 +322,29 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
endif

CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c

$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h)
@$(BUILD_CMD)

$(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.c)
@$(BUILD_CMD)

$(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
@$(BUILD_CMD)

$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
$(eval CMD=$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h)
@$(BUILD_CMD)

generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h

.INTERMEDIATE : generated-files

Expand Down
2 changes: 2 additions & 0 deletions builddefs/build_test.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ endif

.DEFAULT_GOAL := all

OPT = g

include paths.mk
include $(BUILDDEFS_PATH)/message.mk

Expand Down
11 changes: 9 additions & 2 deletions builddefs/common_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
endif
endif

QUANTUM_PAINTER_ENABLE ?= no
ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
include $(QUANTUM_DIR)/painter/rules.mk
endif

VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi
EEPROM_DRIVER ?= vendor
ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
Expand Down Expand Up @@ -646,8 +651,9 @@ ifeq ($(strip $(HAPTIC_ENABLE)),yes)
endif

ifeq ($(strip $(HD44780_ENABLE)), yes)
SRC += platforms/avr/drivers/hd44780.c
OPT_DEFS += -DHD44780_ENABLE
COMMON_VPATH += $(DRIVER_PATH)/lcd
SRC += hd44780.c
endif

VALID_OLED_DRIVER_TYPES := SSD1306 custom
Expand Down Expand Up @@ -695,7 +701,8 @@ endif

ifeq ($(strip $(UNICODE_COMMON)), yes)
OPT_DEFS += -DUNICODE_COMMON_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c \
$(QUANTUM_DIR)/utf8.c
endif

MAGIC_ENABLE ?= yes
Expand Down
6 changes: 3 additions & 3 deletions builddefs/common_rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ endif
# -Wall...: warning level
# -Wa,...: tell GCC to pass this to the assembler.
ifeq ($(strip $(LTO_ENABLE)), yes)
ifeq ($(PLATFORM),CHIBIOS)
$(info Enabling LTO on ChibiOS-targeting boards is known to have a high likelihood of failure.)
ifeq ($(PLATFORM),ARM_ATSAM)
$(info Enabling LTO on arm_atsam-targeting boards is known to have a high likelihood of failure.)
$(info If unsure, set LTO_ENABLE = no.)
endif
CDEFS += -flto
Expand Down Expand Up @@ -316,7 +316,7 @@ gccversion :
@$(BUILD_CMD)

%.uf2: %.hex
$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex -o $(BUILD_DIR)/$(TARGET).uf2 -c -f $(UF2_FAMILY) >/dev/null 2>&1)
$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex --output $(BUILD_DIR)/$(TARGET).uf2 --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
@$(BUILD_CMD)
Expand Down
37 changes: 37 additions & 0 deletions builddefs/converters.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Note for new boards -- CTPC and CONVERT_TO_PROTON_C are deprecated terms
# and should not be replicated for new boards. These will be removed from
# documentation as well as existing keymaps in due course.
ifeq ($(strip $(CTPC)), yes)
CONVERT_TO_PROTON_C=yes
endif
ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
CONVERT_TO=proton_c

cpfirmware: ctpc_warning
.INTERMEDIATE: ctpc_warning
ctpc_warning: elf
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
$(info The `CONVERT_TO_PROTON_C` and `CTPC` options are soon to be deprecated.)
$(info Boards should be changed to use `CONVERT_TO=proton_c` instead.)
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
endif

# TODO: opt in rather than assume everything uses a pro micro
PIN_COMPATIBLE ?= promicro
ifneq ($(CONVERT_TO),)
# glob to search each platfrorm and/or check for valid converter
CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
ifeq ($(CONVERTER),)
$(call CATASTROPHIC_ERROR,Converting from '$(PIN_COMPATIBLE)' to '$(CONVERT_TO)' not possible!)
endif

TARGET := $(TARGET)_$(CONVERT_TO)

# Configure any defaults
OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
OPT_DEFS += -DCONVERTER_ENABLED
VPATH += $(CONVERTER)

# Finally run any converter specific logic
include $(CONVERTER)/converter.mk
endif
3 changes: 3 additions & 0 deletions builddefs/generic_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ SPACE_CADET_ENABLE ?= yes
GRAVE_ESC_ENABLE ?= yes

GENERIC_FEATURES = \
CAPS_WORD \
COMBO \
COMMAND \
DEFERRED_EXEC \
Expand All @@ -25,12 +26,14 @@ GENERIC_FEATURES = \
DYNAMIC_KEYMAP \
DYNAMIC_MACRO \
ENCODER \
ENCODER_MAP \
GRAVE_ESC \
HAPTIC \
KEY_LOCK \
KEY_OVERRIDE \
LEADER \
PROGRAMMABLE_BUTTON \
SECURE \
SPACE_CADET \
SWAP_HANDS \
TAP_DANCE \
Expand Down
Loading

0 comments on commit 4b40d0e

Please sign in to comment.