Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KEYBOARD] Add Viktus SP Mini #14069

Merged
merged 29 commits into from
Aug 29, 2021
Merged

[KEYBOARD] Add Viktus SP Mini #14069

merged 29 commits into from
Aug 29, 2021

Conversation

jrfhoutx
Copy link
Contributor

Description

Initial commit to add support for the Viktus SP Mini

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@jrfhoutx
initial commit for SP Mini
dbd3156 
Begin SP Mini development
@jrfhoutx
Update to config.h
c133f72 
made corrections to config.h
@jrfhoutx
more changes
1ff46aa 
changes to spumoni firmware
@jrfhoutx
updates
b7b3a12 
corrections or changes to code
@jrfhoutx
updates
b3800d8 
corrections and changes made to fix bugs and errors
@jrfhoutx
production commit for spumoni
5ba8a37 
files for final production version
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Aug 19, 2021
@jrfhoutx jrfhoutx closed this Aug 19, 2021
@jrfhoutx jrfhoutx reopened this Aug 19, 2021
@jrfhoutx
Copy link
Contributor Author

sorry about that had to clean up a few files that somehow made it in the production commit.
everything seems to be good now.

fauxpark
fauxpark requested changes Aug 19, 2021
View reviewed changes
keyboards/viktus/sp_mini/sp_mini.h Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/rules.mk Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/rules.mk Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/readme.md Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/default/config.h Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/info.json Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/config.h Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/config.h Outdated Show resolved Hide resolved
drashna
drashna requested changes Aug 19, 2021
View reviewed changes
keyboards/viktus/sp_mini/config.h Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/config.h Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/via/keymap.c Show resolved Hide resolved
jrfhoutx and others added 9 commits August 20, 2021 09:43
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/sp_mini.h
409b7e6 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/rules.mk
03b5ec9 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/rules.mk
cc755ee 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/info.json
aec99cb 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/config.h
f51e264 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @fauxpark
Update keyboards/viktus/sp_mini/config.h
0f5e187 
Co-authored-by: Ryan <[email protected]>
@jrfhoutx @drashna
Update keyboards/viktus/sp_mini/keymaps/default/keymap.c
b642bfa 
Co-authored-by: Drashna Jaelre <[email protected]>
@jrfhoutx @drashna
Update keyboards/viktus/sp_mini/keymaps/default/keymap.c
aea5eb5 
Co-authored-by: Drashna Jaelre <[email protected]>
@jrfhoutx
Updates
bc522a5 
Updates to files per requests
@jrfhoutx jrfhoutx requested a review from drashna August 20, 2021 20:13
fauxpark
fauxpark requested changes Aug 21, 2021
View reviewed changes
keyboards/viktus/sp_mini/readme.md Outdated Show resolved Hide resolved
@jrfhoutx jrfhoutx requested a review from fauxpark August 22, 2021 21:11
drashna
drashna requested changes Aug 23, 2021
View reviewed changes
keyboards/viktus/sp_mini/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/viktus/sp_mini/sp_mini.c Show resolved Hide resolved
@jrfhoutx jrfhoutx requested a review from drashna August 26, 2021 18:04
@drashna drashna merged commit ef7fdee into qmk:master Aug 29, 2021
jiaxin96 added a commit to Oh-My-Mechanical-Keyboard/qmk_firmware that referenced this pull request Aug 30, 2021
@jiaxin96
Squashed commit of the following:
6177305 
commit 52d1e434c5031b11c024a6086f15a705a7dc8c34
Author: JX <[email protected]>
Date:   Mon Aug 30 11:57:37 2021 +0800

    Squashed commit of the following:

    commit baa4230
    Author: Zach White <[email protected]>
    Date:   Sun Aug 29 16:46:36 2021 -0700

        ensure that the directory for sys.executable is in the user's path (qmk#14229)

    commit b705020
    Author: Zach White <[email protected]>
    Date:   Sun Aug 29 16:41:56 2021 -0700

        move everything from qmkfm/base_container to qmkfm/qmk_cli (qmk#14230)

    commit 13a2da9
    Author: peott-fr <[email protected]>
    Date:   Sun Aug 29 14:52:49 2021 -0700

        Nyquist (qmk#14202)

        * adding my Nyquist keymap

        * Updating Nyquist keymap with licensing.

        * Cleaning-up and improving Nyquist keymap.

        * Cleaning-up and improving Nyquist keymap.

    commit a1866a9
    Author: Sergey Vlasov <[email protected]>
    Date:   Mon Aug 30 00:24:43 2021 +0300

        Update the nix-shell environment (qmk#13316)

        * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`

        The `$PATH` modifications performed by the Nix wrapper for the `qmk`
        executable prevent `bin/qmk` from working properly (the changed `$PATH`
        contains a wrong `python3` executable which does not have the needed
        Python modules in its module path).  As a workaround, disable the
        generation of that wrapper for the `qmk` Python package (there is yet
        another wrapper generated while building the Python environment, which
        would still set the Python module path properly when running `qmk`).

        Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
        some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
        these invocations working is useful.

        * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`

        Update the Python dependency information used by Poetry to match the
        current state of the qmk_firmware code.

        * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps

        Update Python dependencies for nix-shell to the most recent releases:

         - dotty-dict: 1.3.0 -> no longer used
         - milc: 1.4.2 -> 1.6.2
         - pep8-naming: 0.11.1 -> 0.12.1
         - pygments: 2.9.0 -> 2.10.0
         - pyrsistent: 0.17.3 -> 0.18.0
         - pyusb: 1.1.1 -> 1.2.1
         - setuptools-scm: 6.0.1 -> no longer used
         - qmk: 0.1.0 -> 1.0.0
         - qmk-dotty-dict: not used -> 1.3.0.post1
         - yapf: 0.30.0 -> 0.31.0

        Note to self: The command to update Python dependencies changed to:

            ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )

    commit ef7fdee
    Author: J.Flanagan <[email protected]>
    Date:   Sun Aug 29 14:18:56 2021 -0500

        [Keyboard] Add Viktus SP Mini (qmk#14069)

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

commit 5b6ec115dfeeb5742ee8a74d7417db9f3ce06cb3
Author: JX <[email protected]>
Date:   Mon Aug 30 11:55:34 2021 +0800

    del yr kbs

commit b79ac2d8951ae95869af933b38a42a1b3572b3de
Author: JX <[email protected]>
Date:   Mon Aug 30 11:54:48 2021 +0800

    rebase

commit 3cf068dd3a4192b78dcdfed1bf54bf57284291a7
Merge: 0755243 5c3d45a2d2
Author: JX <[email protected]>
Date:   Mon Aug 30 11:51:45 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 5c3d45a2d27cb950c3052e0c007bfc6b99bb3301
Merge: a210ace14d f87cd8e
Author: JX <[email protected]>
Date:   Sun Aug 29 23:58:54 2021 +0800

    Merge pull request #1 from qmk/master

    update to qmk

commit a210ace14ddb30502d106254cacda306c869cb25
Author: JX <[email protected]>
Date:   Sun Aug 29 23:57:05 2021 +0800

    del master yr kbs

commit 2ce5192
Author: JX <[email protected]>
Date:   Sun Aug 29 22:57:58 2021 +0800

    update local file

commit 6e09953
Author: JX <[email protected]>
Date:   Sat Aug 28 01:49:54 2021 +0800

    del u80

commit c673215
Author: JX <[email protected]>
Date:   Sat Aug 28 01:28:15 2021 +0800

    Delete uchen80v1.zip

commit bc37cfc
Author: JX <[email protected]>
Date:   Sat Aug 28 01:25:01 2021 +0800

    add yr kbs

commit 0755243
Author: JX <[email protected]>
Date:   Fri Aug 27 14:00:43 2021 +0800

    Distinguish product id between versions of one kb

commit d7b6051
Author: JX <[email protected]>
Date:   Fri Aug 27 13:33:08 2021 +0800

    add info.json for kbs waiting to push into qmk master

commit 4d52f89
Author: JX <[email protected]>
Date:   Fri Aug 27 11:23:03 2021 +0800

    fix all init make readme

commit 04ed3a3
Author: JX <[email protected]>
Date:   Fri Aug 27 11:15:21 2021 +0800

    move WS69v2 to whiteMouse69

commit ef4ee0c
Author: JX <[email protected]>
Date:   Fri Aug 27 00:59:31 2021 +0800

    add zhou65 via config file

commit b1381d3
Author: JX <[email protected]>
Date:   Thu Aug 26 20:49:16 2021 +0800

    fix e75 keymap

commit 1e183b4
Merge: 3b8a86c 2ceec5c
Author: JX <[email protected]>
Date:   Thu Aug 26 01:40:09 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 3b8a86c
Author: JX <[email protected]>
Date:   Thu Aug 26 01:34:56 2021 +0800

    fix share ep bug

commit 2ceec5c
Merge: f58a2d6 bb1b822
Author: JX <[email protected]>
Date:   Wed Aug 25 18:33:57 2021 +0800

    Merge pull request #7 from qmk/master

    update to qmk master

commit f58a2d6
Author: JX <[email protected]>
Date:   Wed Aug 25 01:03:32 2021 +0800

    fix e75 pin bug and add zhou75 solder version

commit f78926d
Author: JX <[email protected]>
Date:   Sun Aug 22 19:19:54 2021 +0800

    add boyPad

commit fe2769f
Author: JX <[email protected]>
Date:   Sun Aug 22 15:45:43 2021 +0800

    del hotdox76 v2 kb

commit b99e2e0
Author: JX <[email protected]>
Date:   Sun Aug 22 03:22:15 2021 +0800

    Update hotdox76_V2.c

commit 7888677
Author: JX <[email protected]>
Date:   Sun Aug 22 03:05:10 2021 +0800

    fix split oled layer state and current input not sync

commit a54bf3a
Author: JX <[email protected]>
Date:   Thu Aug 19 17:32:12 2021 +0800

    fix avr oled

commit 4b68c3b
Author: JX <[email protected]>
Date:   Tue Aug 17 23:33:33 2021 +0800

    add hotswap version for m69

commit 8fea4d1
Author: JX <[email protected]>
Date:   Mon Aug 16 01:23:25 2021 +0800

    add Eureka75 and hotdox76_V2

commit d9ab3ed
Author: JX <[email protected]>
Date:   Sun Aug 8 23:46:56 2021 +0800

    add hotdox76 v2 kb (prelim)

commit b4e8c50
Author: JX <[email protected]>
Date:   Sat Aug 7 03:37:57 2021 +0800

    add yp87ble and fix zhou75 encoder pin error

commit 2a560b8
Author: JX <[email protected]>
Date:   Sat Aug 7 01:37:07 2021 +0800

    fix eep path

    Change the EEP path to automatically obtain the absolute path of the current directory

commit 5888f9f
Author: JX <[email protected]>
Date:   Sun Aug 1 23:17:01 2021 +0800

    fix 69 keymap

commit fba647d
Author: JX <[email protected]>
Date:   Sun Aug 1 23:10:01 2021 +0800

    fix whitemouse69 rgb position

commit 260a647
Author: JX <[email protected]>
Date:   Sun Aug 1 22:27:30 2021 +0800

    fix zhou75 encoder

commit 01be073
Author: JX <[email protected]>
Date:   Sun Aug 1 21:51:30 2021 +0800

    add zhou75, boy40ble and yp980ble

commit 183a9f8
Author: JX <[email protected]>
Date:   Tue Jul 27 15:59:41 2021 +0800

    Update config.h

commit a0572b4
Author: JX <[email protected]>
Date:   Tue Jul 27 15:38:50 2021 +0800

    add led indicate for m69

commit bd7e66b
Author: JX <[email protected]>
Date:   Tue Jul 27 15:15:32 2021 +0800

    add M69(87%)

commit 551ed94
Merge: 98a0816 bbdcb0b
Author: JX <[email protected]>
Date:   Thu Jul 22 16:10:36 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 98a0816
Author: JX <[email protected]>
Date:   Thu Jul 22 16:05:09 2021 +0800

    添加keep函数

commit bbdcb0b
Merge: e869849 07ae72e
Author: JX <[email protected]>
Date:   Sun Jul 18 22:17:29 2021 +0800

    Merge pull request #6 from qmk/master

    update to the upstream of qmk master

commit e869849
Author: JX <[email protected]>
Date:   Sun Jul 18 22:06:10 2021 +0800

    add ws69v2 keyboard

commit 0c625e7
Author: JX <[email protected]>
Date:   Thu Jul 15 14:23:22 2021 +0800

    Create chibios.mk

commit b9183ce
Author: JX <[email protected]>
Date:   Thu Jul 15 13:46:58 2021 +0800

    Update main.c

commit b6e16c4
Author: JX <[email protected]>
Date:   Thu Jul 15 13:00:20 2021 +0800

    更新白鼠69为spi驱动需要更改spi的频率，qmk的bug

commit be78933
Author: JX <[email protected]>
Date:   Fri Jul 9 16:57:49 2021 +0800

    更新白鼠69 rgb矩阵

commit a4c0819
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 28 23:54:21 2021 +0800

    v-alpha1

commit 574b709
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 27 00:42:05 2021 +0800

    添加新键盘

commit 42b0038
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 27 00:40:48 2021 +0800

    修改重启nrf

commit ee800f1
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 26 00:10:13 2021 +0800

    Update biu_nrf52.cpp

commit 79e2882
Author: JX <[email protected]>
Date:   Thu Jun 24 18:58:11 2021 +0800

    Update keymap.c

commit cf51e9c
Merge: 7595114 d77cd42
Author: jiaxin96 <[email protected]>
Date:   Tue Jun 22 14:15:07 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 7595114
Author: jiaxin96 <[email protected]>
Date:   Tue Jun 22 14:11:26 2021 +0800

    add sleep

commit d77cd42
Author: JX <[email protected]>
Date:   Mon Jun 21 22:47:27 2021 +0800

    Update getRgbMtrixPosition.js

commit 6db9a90
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:48:18 2021 +0800

    Update biu_nrf52.cpp

commit dda8139
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:41:29 2021 +0800

    add ble unpair current interface

commit 8d0cf13
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:39:49 2021 +0800

    add final80v2 and yp980ble

commit 50e5c4b
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 15:22:16 2021 +0800

    Update biu_nrf52.cpp

commit a3f4903
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 14:33:17 2021 +0800

    Update biu_nrf52.cpp

commit c5d6b19
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 14:08:08 2021 +0800

    restructure the nrf framework

commit 2841425
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 23:31:08 2021 +0800

    fix pre init bug（add return）

commit 44ba86c
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:55:05 2021 +0800

    Update biu_nrf52.cpp

commit ed2f91b
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:43:14 2021 +0800

    Delete uart.c

commit ffef7ec
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:42:54 2021 +0800

    Create uart.c

commit cf3c262
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:11:51 2021 +0800

    fix uart

commit df7a30c
Merge: fafaa74 1012972
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:22:03 2021 +0800

    Merge branch 'qmk-master'

commit 1012972
Merge: fafaa74 939ce6a
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:21:37 2021 +0800

    Merge branch 'master' of https://github.com/qmk/qmk_firmware into qmk-master

commit fafaa74
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:17:18 2021 +0800

    ignore vscode setting

commit f44ccff
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:13:12 2021 +0800

    add batinfo update and fix the uart setting of chibios

commit 236b1c5
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 17:02:03 2021 +0800

    add bat information update

commit 0cfbe71
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 16:05:53 2021 +0800

    add nrf52 uart module support lib

commit 67fe370
Author: jiaxin96 <[email protected]>
Date:   Thu Jun 17 11:18:42 2021 +0800

    start test usb anc ble switch

commit 278d0e7
Author: jiaxin96 <[email protected]>
Date:   Thu Jun 17 00:20:01 2021 +0800

    add adc and extern the uart buffer for f401 wm28

commit 3c0dbc5
Author: JX <[email protected]>
Date:   Wed Jun 16 15:55:34 2021 +0800

    Update settings.json

commit 5699d3d
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 20:33:37 2021 +0800

    simplify the r65 code

commit 8e30997
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 20:29:33 2021 +0800

    add wm uart map

commit eacbc03
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 19:54:03 2021 +0800

    Update getRgbMtrixPosition.js

commit 2f8235c
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 19:52:28 2021 +0800

    add tdcq rgb

commit c4ce4eb
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 17:13:10 2021 +0800

    Enables the master branch to also use the EEPROM of Stm32F4

commit ed2ccb4
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 15:49:52 2021 +0800

    fix tdcq

commit cf46f1e
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 14:17:03 2021 +0800

    fix eeprom bug

commit 21e2df3
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 13 00:23:13 2021 +0800

    Update keymap.c

commit bedd819
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 13 00:16:29 2021 +0800

    fix via col and row number for wm28

commit 65e50fc
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 12 23:52:48 2021 +0800

    add bs 28 and CUSTOM_MATRIX

commit 0d7451b
Merge: 1866908 0ef145d
Author: JX <[email protected]>
Date:   Sat Jun 12 16:23:55 2021 +0800

    Merge branch 'qmk:master' into master

commit 1866908
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 12 16:23:18 2021 +0800

    ADD bs28 TEST

commit db3f05e
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 12:12:05 2021 +0800

    fix via rgb

commit 063438b
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 12:05:03 2021 +0800

    add via info

commit 85e6ad9
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 11:49:02 2021 +0800

    Update readme.md

commit 0400d2f
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 11:48:27 2021 +0800

    add tdcq64 2s

commit 6e29f1a
Author: JX <[email protected]>
Date:   Tue Jun 8 21:56:16 2021 +0800

    Update readme.md

commit f677b10
Author: JX <[email protected]>
Date:   Mon Jun 7 19:45:12 2021 +0800

    Update readme.md

commit c70834d
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 4 12:17:37 2021 +0800

    Update config.h

commit 836cf47
Author: jiaxin96 <[email protected]>
Date:   Mon May 24 21:12:06 2021 +0800

    update tdcq68 config.h

commit 3ded209
Author: jiaxin96 <[email protected]>
Date:   Sun May 23 11:48:31 2021 +0800

    add doc for r65ble

commit 21d4461
Author: jiaxin96 <[email protected]>
Date:   Sun May 23 00:47:04 2021 +0800

    add tdcq68 and add gpl2 header

commit bf24140
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 22:30:50 2021 +0800

    fix f401_rgb

commit 4f29f66
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 21:50:04 2021 +0800

    add stm32f103 and stm32f401 f411 case

commit 6f71392
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 17:20:20 2021 +0800

    add tap code delay and format the encoder behever

commit 93e889d
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 17:05:19 2021 +0800

    add sb65p-via-json

commit d205b5a
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 16:55:52 2021 +0800

    fix part of format error and add some licenses header

commit 2549671
Merge: 244d968 40f235a
Author: JX <[email protected]>
Date:   Sat May 22 11:23:12 2021 +0800

    Merge pull request #3 from qmk/master

    update to qmk master

commit 244d968
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 11:20:54 2021 +0800

    Update keymap.c

commit 374885b
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 11:12:22 2021 +0800

    add r65ble-test

commit 02028fb
Merge: 5cb336a 63cdf80
Author: JX <[email protected]>
Date:   Wed Apr 28 14:16:40 2021 +0800

    Merge pull request #2 from qmk/master

    update to the qmk master branch

commit 5cb336a
Author: jiaxin96 <[email protected]>
Date:   Wed Apr 21 15:32:34 2021 +0800

    Update config.h

commit 9b733f3
Author: jiaxin96 <[email protected]>
Date:   Wed Apr 21 14:03:10 2021 +0800

    revision of the config.h

commit bfcf59c
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:54:14 2021 +0800

    Fix some typos

commit ad4b88d
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:43:22 2021 +0800

    add info.json for all keyboards of "y&r studio"

commit 06011cf
Merge: 2363cd4 8405d28
Author: JX <[email protected]>
Date:   Tue Apr 20 21:22:16 2021 +0800

    Merge pull request #1 from qmk/master

    update to the master of the qmk repo.

commit 2363cd4
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:20:16 2021 +0800

    add readme and correct layout naming

commit 2b475ab
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 01:15:33 2021 +0800

    add readme files

commit d6e1277
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 00:55:51 2021 +0800

    add keyboards

    add keyboards and utils for 'y&r studio'
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Sep 2, 2021
Merge remote-tracking branch 'qmk/develop' into develop
f3919f2 
* qmk/develop:
  Remove bin/qmk (qmk#14231)
  ensure that the directory for sys.executable is in the user's path (qmk#14229)
  move everything from qmkfm/base_container to qmkfm/qmk_cli (qmk#14230)
  Nyquist (qmk#14202)
  Update the nix-shell environment (qmk#13316)
  [Keyboard] Add Viktus SP Mini (qmk#14069)
  [Keyboard] Corrected layout for np24 by YMDK (qmk#14096)
  [Keymap] My Prime E keymap (qmk#14117)
  [Keyboard] Add kelownaRGB64 (qmk#14141)
  [Keyboard] fix compile error `make helix/rev2/sc:all` (qmk#14214)
  fix automatic directory for qmk lint (qmk#14215)
  Add check for non-assignment code in rules.mk (qmk#12108)
  remove qmk console, which is now part of the global cli (qmk#14206)
  Fixup upstream paths for submodules. (qmk#14205)
  Bootmagic lite docs clarity. (qmk#14204)
  add 'include keyboard_features.mk' into build_keyboard.mk (qmk#8422)
  2021Q3 pre-merge `develop` changelog, keyboard aliases (qmk#14198)
sekigon-gonnoc added a commit to sekigon-gonnoc/qmk_firmware that referenced this pull request Sep 11, 2021
@sekigon-gonnoc
Merge master 46f15cd
649a095 
commit 43614a5c5acc7cfe19f218f7e07963c7620f7441
Author: sekigon-gonnoc <[email protected]>
Date:   Sat Sep 11 15:37:47 2021 +0900

    add usb_util.c

commit 9ad77b65f6d8967382c6ff59f8fdf1e5670598ab
Merge: 86367f4db9 2a54722eab
Author: sekigon-gonnoc <[email protected]>
Date:   Sat Sep 11 15:29:20 2021 +0900

    Merge branch 'master' into merge/master/rp2040

commit 86367f4db93037621274b7f209be463a4b52df2d
Merge: 50af85756a 8a2d3a8861
Author: sekigon-gonnoc <[email protected]>
Date:   Sat Sep 11 14:58:17 2021 +0900

    Merge commit '8a2d3a8861' into merge/master/rp2040

commit 2a54722eabfa35604642047a7b9bec7d5c22cb3e
Merge: fde66d3ad7 46f15cd1a5
Author: sekigon-gonnoc <[email protected]>
Date:   Sat Sep 11 14:50:52 2021 +0900

    Merge branch 'master' into merge/master/ble_micro_pro

commit fde66d3ad752af0f488f2e2e16753afcfeca3079
Merge: 5353df9ce9 8a2d3a8861
Author: sekigon-gonnoc <[email protected]>
Date:   Sat Sep 11 14:26:01 2021 +0900

    Merge commit '8a2d3a8861' into merge/master/ble_micro_pro

commit 46f15cd1a533cce8c9f7a406b1e6ee6765e48a20
Author: yfuku <[email protected]>
Date:   Sat Sep 11 13:59:28 2021 +0900

    [Keyboard] owl8 bugfix (#14020)

commit d0b1d9f548aa39e1d267e8f62db4e0c65aae9206
Author: AKiwi92 <[email protected]>
Date:   Sat Sep 11 05:20:43 2021 +0100

    [Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: James Young <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Ash <[email protected]>

commit 6213989c3248405aed7710d68599c8e61ac5b910
Author: rarick <[email protected]>
Date:   Fri Sep 10 22:52:17 2021 -0500

    [Keymap] Add keymap for crkbd/rarick (#13240)

    * Added new keymap for crkbd/rarick

    * Delete flash.sh

    Deleted rarick crkbd flashing script, as it will not be used by most users.

    * Applied feedback, and fixed build error caused by builder updates

    * Update keyboards/crkbd/keymaps/rarick/config.h

    Removed USE_MATRIX_I2C, no longer used.

    Co-authored-by: Drashna Jaelre <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>

commit d7747a2d700eec08679011d79dc6192fe43ca402
Author: Zac Moulton <[email protected]>
Date:   Fri Sep 10 18:56:50 2021 -0700

    [Keymap] moults31 userspace and keymaps (#12025)

commit 759d1927f099ba319ad09c69a2cc71026d775713
Author: Xelus22 <[email protected]>
Date:   Sat Sep 11 05:14:39 2021 +1000

    [Keyboard] Add RS60 (#14073)

    * initial rs60

    * update

    * remove

    * Include rs60.h

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * List form readme.

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * add layout

    Co-authored-by: Joel Challis <[email protected]>

    * add license

    Co-authored-by: Joel Challis <[email protected]>

    * 2021 update

    Co-authored-by: Joel Challis <[email protected]>

    * add license

    Co-authored-by: Joel Challis <[email protected]>

    * sigprof suggested changes

    * Remove redundant define

    Co-authored-by: Ryan <[email protected]>

    * Fixup readme

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

    * Update keyboards/xelus/rs60/info.json

    Co-authored-by: Ryan <[email protected]>

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

commit 7277f1febe0e86e8a32beb779aa24e02bfdb6826
Author: Ryan <[email protected]>
Date:   Fri Sep 10 23:11:17 2021 +1000

    Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)

commit d5cb7de5e4ea60dce69764a627358d534af1f666
Author: Ryan <[email protected]>
Date:   Fri Sep 10 17:17:54 2021 +1000

    Change USBasp and bootloadHID bootloaders to lowercase (#14354)

commit 7eea780a7da2d9197b78b62b7294a6b2bc2fa572
Author: Ryan <[email protected]>
Date:   Fri Sep 10 13:35:46 2021 +1000

    Remove bootloader listings from rules.mk (#14330)

commit 2cb9219a3e655218f5380a41cf5bc5e3135caaa1
Author: Ryan <[email protected]>
Date:   Fri Sep 10 13:32:22 2021 +1000

    Remove commented out BLUETOOTH_ENABLE rules (#14361)

commit 7f80076d044d729407cc4aad35095ff4a8ff5653
Author: Joel Challis <[email protected]>
Date:   Fri Sep 10 03:57:36 2021 +0100

    Align rgb/led matrix docs with current behaviour (#14367)

commit 22499636871ae8f0b8f2da90f801f9290fb1d186
Author: Uy Bui <[email protected]>
Date:   Fri Sep 10 02:02:45 2021 +0900

    [Keyboard] Add custom pcb for Polaris (#14347)

    * [Keyboard] pcb for Polaris

    * [Keyboard] pcb for Polaris: update  layout

    * Update keyboards/wekey/polaris/info.json

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit d6dd2e0d516a67bdc9bde2b6d1680a00c48675e4
Author: Ryan <[email protected]>
Date:   Thu Sep 9 16:50:52 2021 +1000

    Fix CRLF in lyra/rev1 (#14360)

commit 4c88f76be8099d45444cea894bb2162870115832
Author: Malevolti <[email protected]>
Date:   Thu Sep 9 07:34:32 2021 +0100

    [Keyboard] add lyra (#13977)

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

commit 82ee9bd475be9723d53ea3e8e101a038bbfa1b25
Author: mechlovin <[email protected]>
Date:   Wed Sep 8 22:23:26 2021 -0700

    [Keyboard] Add Olly JF PCB (#14056)

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

commit 6d43a5daf4225cf677840d11b151d28f49e8f9e9
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 20:19:06 2021 -0700

    Backport F_CPU/F_USB hack from system76 (#14286)

    Co-authored-by: Ryan <[email protected]>

commit cb4006c0b47e9d99c2f60b74d414b19cf4b9e333
Author: Felix Jen <[email protected]>
Date:   Wed Sep 8 19:44:52 2021 -0700

    [Keymap] Fix Maker Keyboards Alexa Keymap (#14355)

commit 891ddd9a30628509b239a0d41fbdc65b4530f80a
Author: Ethan Yates <[email protected]>
Date:   Wed Sep 8 20:14:03 2021 -0600

    [Keyboard] Add 61Key (#14259)

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

commit f3bef84dace5d1d938f9d02be644bf421a4a3de1
Author: JayceFayne <[email protected]>
Date:   Thu Sep 9 03:34:49 2021 +0200

    `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (#14315)

commit da81e5c7cd700cdb3ecd750ae8044f514fb65ca2
Author: JayceFayne <[email protected]>
Date:   Thu Sep 9 03:34:34 2021 +0200

    `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (#14302)

commit 853e56d080d71ebf1be7299e3b78f6e5ec190aa5
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 18:10:43 2021 -0700

    [Keyboard] Minor tweaks to Work Board layout (#14351)

commit 9e77cdf4e66ff1cfdd7effaf77e129bf3ae9a1a5
Author: Ryan <[email protected]>
Date:   Thu Sep 9 10:27:58 2021 +1000

    Bugfix for Joystick and JSON schema (#14295)

commit 3f2a030de6a306ed72eafe7aa143a5b695f9469d
Author: rhmokey <[email protected]>
Date:   Thu Sep 9 07:57:43 2021 +0800

    [Keyboard] Add new Mokey keyboard (#14329)

    Co-authored-by: Ryan <[email protected]>

commit d510f6afa97801ea53078ac7fbdbd24824d77f4e
Author: Gastón Jorquera <[email protected]>
Date:   Wed Sep 8 16:55:12 2021 -0700

    [Keymap] Add Gaston's Lily58 custom keymap (#14334)

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Gaston Jorquera <[email protected]>

commit 4294aa0f1ee546c74a72bad3e556d7ee4e020a88
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 16:52:43 2021 -0700

    [Keyboard] Tractyl Manuform - configuration updates (#14314)

    * [Keyboard] Tractyl Manuform - configuration updates

    * Update readmes

    * Add more details

    * Fix issues with encoder pins

    * Additional fixes for pin config

    * Fix up some comments

commit 8f8411a98a60ffe9e8410e892bff946d9122d3a9
Author: Keenan Brock <[email protected]>
Date:   Wed Sep 8 19:02:50 2021 -0400

    [Keyboard] Add VIA keymap for the reviung39 (#14234)

commit 2e0659f7fddd4c872b230c4a7d2e2a5517042414
Author: Joel Challis <[email protected]>
Date:   Wed Sep 8 23:44:18 2021 +0100

    Fixes for recent i2c migrations (#14352)

commit 9c175f180138558748b0b240e76cb04fa11f9927
Author: jackytrabbit <[email protected]>
Date:   Wed Sep 8 15:34:36 2021 +0800

    [Keyboard] Update VIA support for lazydesigners/the40 (#14240)

    Co-authored-by: Joel Challis <[email protected]>

commit 541e1012912e320e0f65ac1e24f9f8659a5571a8
Author: Gabriel Bustamante <[email protected]>
Date:   Wed Sep 8 03:53:33 2021 -0300

    [Keymap] New keymap for bm40 (#14182)

commit 3ef01a3482b76a956ba2f9f399a14d9e2f86b362
Author: Rifaa Subekti <[email protected]>
Date:   Wed Sep 8 12:07:00 2021 +0800

    [Keyboard] add wang ergo (#14245)

    Co-authored-by: Ryan <[email protected]>

commit 1ebaec96e7a9695578813916ba2e1651101e385b
Author: James Young <[email protected]>
Date:   Wed Sep 8 03:23:45 2021 +0000

    Sneakbox Ava tidy-up (#14298)

commit 267ffb9914fd04026aa9841c6c15e51ee6841811
Author: IFo Hancroft <[email protected]>
Date:   Wed Sep 8 06:01:58 2021 +0300

    [Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342)

commit 0b8d6df39037e58b6b699332d2bbbc448889c6b2
Author: Drashna Jaelre <[email protected]>
Date:   Tue Sep 7 18:53:55 2021 -0700

    [Keyboard] Fix issues with 3w6 rev2 matrix (#14346)

commit 60c5bd7b5e0e75f48d9731118b92a3add3342efd
Author: Joel Challis <[email protected]>
Date:   Wed Sep 8 02:23:11 2021 +0100

    handwired/dactyl - Refactor use of legacy i2c implementation (#14344)

commit 04c0704b280c4847c43b164335e9741b19219131
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:35:13 2021 +0100

    3w6 - Refactor use of AVR only I2C functions (#14339)

    * Refactor use of legacy i2c functions

    * Align rev2

    * Review fixes

commit e7a5c006d9777a4009da934f408961aa2d2e6fb1
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:34:59 2021 +0100

    Refactor use of legacy i2c implementation (#14341)

commit 2d6635214ab05858271f312619c5447bf317cf51
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:33:29 2021 +0100

    ergodone - Refactor use of legacy i2c implementation (#14340)

    * Refactor use of legacy i2c implementation

    * copy-paste error

commit 1dbe4e7dd0e0b1516997d84d16228e1d1ce29462
Author: shiftux <[email protected]>
Date:   Mon Sep 6 21:44:39 2021 +0200

    [Keyboard] Redox media (#13084)

    * adding a new revision 'media' to the redox keyboard

    * readme update

    * encoder fix

    * video link

    * drashna change requests

    * removing SPLIT_USB_TIMEOUT

    * intermediate rename

    * lowercase

    * drashna comments

    * include if defined KEYBOARD_redox_media

    * lowercase readme, tmp step

    * lowercase readme

    * drashna changes

    * more drashna comments

    * readme update

    * readme update

    * fauxpark and drashna comments

    * fauxpark comments

    * Update keyboards/redox/media/readme.md

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 85a14ac25bca14e91a21f1820e06079b9c3a078e
Author: Monksoffunk <[email protected]>
Date:   Mon Sep 6 22:49:09 2021 +0900

    [Keyboard] Zinc: fix RGBLED_NUM bug (#13287)

commit 1a494da288509d162593aaa07f4f9ca36b6b3dbd
Author: Joel Challis <[email protected]>
Date:   Sun Sep 5 23:56:10 2021 +0100

    Fix eeprom for Durgod boards (#14324)

commit 1e1be4c229651703ef7c62784b704a859a3d13cf
Author: Drashna Jaelre <[email protected]>
Date:   Sun Sep 5 15:35:42 2021 -0700

    [Bug] Fix compile issues for boards with custom matrix (#14323)

commit 8d6d8cfadfd1522b3dd2cc8ac1ce7393b45bbe64
Author: Joel Challis <[email protected]>
Date:   Sun Sep 5 21:36:43 2021 +0100

    Tidy up defines within STM EEPROM emulation (#14275)

    * Tidy up defines within stm eeprom emulation

    * Fix tests

    * Resolve todo

    * Still use page notion in clear

    * Remove more f4 refs

commit fe6d6cf76dc827adb2f46d55217dc189eae21b02
Author: Ryan <[email protected]>
Date:   Mon Sep 6 06:36:31 2021 +1000

    Remove empty override functions (#14312)

    * Remove empty override functions, 0-9

    * Remove empty override functions, A-D

    * Remove empty override functions, E-H

    * Remove empty override functions, handwired

    * Remove empty override functions, I-L

    * Remove empty override functions, M-P

    * Remove empty override functions, Q-T

    * Remove empty override functions, U-Z

commit 8a8fdd9a728a4cdc0ddce54fab9bf3b4ff8bf942
Author: Niko Wenselowski <[email protected]>
Date:   Sun Sep 5 21:36:16 2021 +0200

    Highlight keycode (#14317)

    This should make it consistent with other docs and hopefully will make less people miss this detail.

commit 767f2c02844acd77c86ea84fb86a1a7f49f379b0
Author: JayceFayne <[email protected]>
Date:   Sun Sep 5 18:09:20 2021 +0200

    [Core] Add `is_oled_scrolling` (#14305)

commit 0471429c018b85ebbccfe8c823621235c99458b2
Author: kb-elmo <[email protected]>
Date:   Sun Sep 5 18:05:55 2021 +0200

    [Keyboard] Fix rotary encoder function for Voice65 (#14316)

    Co-authored-by: Ryan <[email protected]>

commit 014aa0661e2d9cf5b67334f82869d4a841cc703f
Author: JayceFayne <[email protected]>
Date:   Sat Sep 4 16:01:56 2021 +0200

    Fix Space Cadet md link (#14300)

commit c9262cf7f8ff42741189a765ca76b531ac20fbc5
Author: Albert Y <[email protected]>
Date:   Sat Sep 4 10:02:15 2021 +0800

    Enable extra keys for Technik ortho and stagger (#14282)

    * Extra keys for technik ortho

    * Extra keys for technik staggered

    Co-authored-by: filterpaper <filterpaper@localhost>

commit b15bd128a543453f4545898ca3ad1be1b23a0cf5
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:03:15 2021 +0000

    FJLabs Ready100 Configurator Fixes (#14291)

    * grid-align keycodes; use short-form keycodes

    No logic change.

    * info.json: correct layout macro reference

    * info.json: correct LAYOUT_64key data

    Removes an extra key from the layout data.

    * 64_ansi Community Layout support

    * rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility)
    * add LAYOUTS = 64_ansi to rules.mk

    * remove width and height keys from info.json

commit 06c89e8abf072c4fe63120305d22d66ad50894ce
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:01:50 2021 +0000

    Naiping NPhhkb: 60_tsangan_hhkb Community Layout support  (#14292)

    * 60_tsangan_hhkb Community Layout support

    * rename LAYOUT to LAYOUT_60_tsangan_hhkb
    * add LAYOUTS = 60_tsangan_hhkb to rules.mk

    * correct maintainer field in info.json

    * remove width and height keys from info.json

    * fix GitHub account link on readme

commit 90909fbaf7946808970c4c5e83d9dcfdcd08b496
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:00:29 2021 +0000

    takashicompany/endzone34: correct QMK Configurator key sequence (#14290)

    * update info.json formatting

    * convert tabs to spaces
    * apply human-friendly formatting

    * correct Configurator key sequence

    * remove width and height keys from info.json

commit 5f6d9913f814edcaf4e882615b76c85ed5499805
Author: James Young <[email protected]>
Date:   Fri Sep 3 18:48:10 2021 +0000

    OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293)

    * 65_ansi_blocker Community Layout support

    * rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility)
    * add LAYOUTS = 65_ansi_blocker to rules.mk

    * remove width and height keys from info.json

commit 8574bf20d35b21c7b44ba8550fa11b4d100fdbbd
Author: Ryan <[email protected]>
Date:   Sat Sep 4 02:09:30 2021 +1000

    Remove more cruft in keyboard files (#14288)

commit 5353df9ce95986bafb818695909e604c44a2982d
Author: sekigon-gonnoc <[email protected]>
Date:   Fri Sep 3 08:18:05 2021 +0900

    kqb: Fix bug: Resolve startup error with ch559

commit a01057d19dfa208fcf5c7cd16689257cb41ac79b
Author: jhauh <[email protected]>
Date:   Thu Sep 2 18:50:17 2021 +0100

    [Keymap] Update iris fluffactually keymap (#14265)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 956cf8d7bfbca187ad9d1e0aabbe6c25348d5e07
Author: Drashna Jaelre <[email protected]>
Date:   Thu Sep 2 10:49:44 2021 -0700

    [Keyboard] Work Louder board fixup (#14247)

    * [Keyboard] Add some last minute tweaks to Work board

    * Additional fixes

    * Fix rgb pin

    * Fix ws2812 hackery

    * additional led tweaks

    * Add indicator LEDs

    * fix bootmagic settings

    * Fix up RGB stuff

    * Limit power draw for entire board

    * fixup lights and such

    * change LED order on loop

    * Fix indicators if via is not enabled

    * Enable Sleep for rgb matrix

    * Even more LED tweaks

    * Final tweaks?

    * Tweak keycodes

commit d36a7c512d14e3bc6534f311e8f1a8a69878acb3
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:17:35 2021 +0000

    PistachioPro: correct Configurator key sequence (#14277)

    * info.json: apply human-friendly formatting

    * correct LAYOUT key sequence

    Moves the Enter key object to the correct place in sequence.

commit ebfa7e14f34c274a80fffb6a4fb9a3194c045d44
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:09:38 2021 +0000

    Matrix Falcon info.json fixes (#14273)

    * apply human-friendly formatting to info.json

    * update key labels; correct maintainer field

    * add LAYOUT_all data to info.json

    * remove width and height keys from info.json (per fauxpark)

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 0290dd35471a6649c878c590fb9b4798940d05b2
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:08:35 2021 +0000

    Yoichiro Lunakey Macro: correct Configurator key sequence (#14276)

    * apply human-friendly formatting to info.json

    * correct Configurator key sequence

commit 98a2e9dc0ef7b18826e21af75fd24861ac683173
Author: jonavin <[email protected]>
Date:   Thu Sep 2 00:12:57 2021 -0400

    [Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Jonavin <=>

commit e056ae58a045d59686572ec1349c5c9f285517e5
Author: peott-fr <[email protected]>
Date:   Wed Sep 1 21:12:15 2021 -0700

    [Keymap] Fine-tuning Nyquist keymap. (#14269)

commit 37aef4ebe17b04de07a17748e2452c2f1ebe77bd
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 1 21:08:58 2021 -0700

    [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)

commit c1e5c920a9929a0434edca537e6c58aed294668c
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:50:44 2021 +0000

    naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264)

commit b55154fb0ad40d895ccc11bb09498f026e0c0773
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:47:28 2021 +0000

    neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266)

commit c0eab2a50491e7b27cb6fe8df82480a05e625068
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:46:53 2021 +0000

    wuque/serneity65: Layout Macro rework and Configurator fix (#14267)

commit cb53c4fd41885ba60192cbd0b5fd23d6a687ab17
Author: hvp <[email protected]>
Date:   Thu Sep 2 05:44:36 2021 +0200

    [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)

commit 872414f454435321b073ba747205b5f16ce0c53a
Author: peott-fr <[email protected]>
Date:   Wed Sep 1 20:44:12 2021 -0700

    [Keymap] Add peott-fr H87 keymap (#14232)

commit b6ca21c65c0d32241ed697072292bd5118b64f9a
Author: jonavin <[email protected]>
Date:   Wed Sep 1 23:42:31 2021 -0400

    [Keymap] Jonavin keymap gmmk pro (#14220)

    add rgb nightmode and optional colemak layer

    Co-authored-by: Jonavin <=>

commit cded3b75821547cd69614ab8b4a71417b6fa4bcb
Author: Christian Eiden <[email protected]>
Date:   Thu Sep 2 05:41:17 2021 +0200

    [Keymap] own scylla keymap (#14224)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit bb356a1584aa30020744432b87304ba912079ee7
Author: qieq <[email protected]>
Date:   Thu Sep 2 06:40:12 2021 +0300

    [Docs] Update path to keycode.h (#14263)

commit 7575bc23a677c9d34f4416dcfd2db6eafc1fd623
Author: James Young <[email protected]>
Date:   Wed Sep 1 17:44:03 2021 +0000

    MatchstickWorks SouthPad: correct Configurator key sequence (#14255)

    * matchstickworks/southpad: correct Configurator key sequence

    * replace tabs with spaces; apply four-space indent

commit 583f07ac58dca26183e56b14acd997eff98388c3
Author: James Young <[email protected]>
Date:   Wed Sep 1 12:20:56 2021 +0000

    owl8: add info.json file (#14256)

    * owl8: add info.json file

    * remove width and height keys (per fauxpark)

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit c573926e05ccdf71fdafa433db7cc46712d96d11
Author: Jay Greco <[email protected]>
Date:   Wed Sep 1 02:48:14 2021 -0700

    Fix snailmap compilation error (#14250)

    * Fix snailmap compilation error

    * Update keymap.c with correct OLED_ENABLE defines

commit 8d97c54770ef5205455dc7d8b004fcaf3d148168
Author: James Young <[email protected]>
Date:   Wed Sep 1 02:50:32 2021 +0000

    mnk50: Configurator Fix and Layout Macro Additions (#14257)

    Co-authored-by: Ryan <[email protected]>

commit c5ec423438696881c25ce1fe2ee189091e0510d6
Author: Casey Webster <[email protected]>
Date:   Tue Aug 31 19:50:42 2021 -0500

    [Keymap] cwebster2 Keymap and userspace updates (#14258)

commit fac5ec46564320ebbbc3d1f5575566badca2d3d7
Author: Andre Brait <[email protected]>
Date:   Wed Sep 1 01:18:35 2021 +0200

    Move GMMK Pro layouts to the correct subdir (#14241)

    Also fix a compilation issue in the mike1808 keymap

commit b7693c971c171298ca2be5c2bb4a71ca15893762
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 31 15:25:46 2021 -0700

    [Keyboard] Disable console on Iris Rev5 (#14249)

commit 92106ee0388813399df01b07cf47a4f1e89ecf2d
Author: James Young <[email protected]>
Date:   Tue Aug 31 18:29:49 2021 +0000

    emi20: remove dead space from Configurator layout (#14254)

commit b6d7b13a7a0f7a03bd44355766d35ab3fcb76feb
Author: Felix Jen <[email protected]>
Date:   Tue Aug 31 11:24:41 2021 -0700

    [Keyboard] Add FJLabs KF87 PCB (#14179)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 6f5428687c37d45cf279d9d3f44de1098a767723
Author: Ibnu Daru Aji <[email protected]>
Date:   Wed Sep 1 01:23:02 2021 +0700

    [Keymap] reflects current rick's keymap (#14169)

commit bdd0a6c09789e3e4380f4351f1f83004542d309f
Author: Salicylic-acid3 <[email protected]>
Date:   Tue Aug 31 14:19:21 2021 +0900

    [Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225)

    Co-authored-by: Joel Challis <[email protected]>

commit f2c9e82e5b3887ed28c3a5c68d27c4efaca54201
Author: Joel Challis <[email protected]>
Date:   Tue Aug 31 00:25:41 2021 +0100

    cherry pick tidy up (#14244)

commit 1e7117317fd8a51f9ca6e926777694b930c9502b
Author: coliss86 <[email protected]>
Date:   Tue Aug 31 01:13:19 2021 +0200

    Documentation: Fix links in key overrides (#14228)

    Co-authored-by: Joel Challis <[email protected]>

commit 5ed8edae498178c8a3c958d36b5e19150ef2caf2
Author: JX <[email protected]>
Date:   Tue Aug 31 03:34:19 2021 +0800

    Update ws2812_spi.c (#14237)

commit 2dc07391bd61e266ac2410ba7c0413c19eea5db5
Author: Danny <[email protected]>
Date:   Mon Aug 30 14:49:46 2021 -0400

    [Keyboard] Add Iris Rev. 5 (#13934)

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

commit 27aebba1b1eadedf2ce25efc081aef3bdbbaab7a
Author: dogspace <[email protected]>
Date:   Mon Aug 30 14:42:04 2021 -0400

    [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)

    Co-authored-by: Ryan <[email protected]>

commit c9283f4c1f073da0072638e78b3d5bf5619a89f4
Author: kb-elmo <[email protected]>
Date:   Mon Aug 30 20:29:15 2021 +0200

    [Keyboard] Add OwLab Jelly Epoch (#14190)

    Co-authored-by: Ryan <[email protected]>

commit b63114ea2963b2c6391176329e8ef6381b16aea2
Author: Rifaa Subekti <[email protected]>
Date:   Tue Aug 31 02:28:54 2021 +0800

    [Keyboard] add slamz keyboard (#14188)

    Co-authored-by: Ryan <[email protected]>

commit 9583f9f589ec4ecaafd3c8f9c709ce981dc684af
Author: Purdea Andrei <[email protected]>
Date:   Mon Aug 30 21:22:53 2021 +0300

    [Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178)

    Without this build would fail, if a keyboard had haptic feedback enabled,
    TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was
    defined in config.h.

commit 949cfd4632066eb6f5574bc360b35a73afbc616f
Author: Felix Jen <[email protected]>
Date:   Mon Aug 30 11:05:13 2021 -0700

    [Keyboard] add maker keyboards alexa (#14165)

commit 557fce7a8e7606355f4b058ff597d70d1a3e32c7
Author: peott-fr <[email protected]>
Date:   Mon Aug 30 11:04:42 2021 -0700

    [Keymap] Add peott-fr keymap for Kbd6x (#14164)

commit 9d32cb68c31c752964ea9fceee8492e4a5e7bd56
Author: Vincent Vorholter <[email protected]>
Date:   Mon Aug 30 20:03:53 2021 +0200

    [Keyboard] Changed ProductID on basketweav keyboards (#14162)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Vince Vorholter <[email protected]>

commit baa423004a870b5cb86f4d1197dcda5f8b390f49
Author: Zach White <[email protected]>
Date:   Sun Aug 29 16:46:36 2021 -0700

    ensure that the directory for sys.executable is in the user's path (#14229)

commit b705020dafd0aa7531d03cd8fa64260684a3fb79
Author: Zach White <[email protected]>
Date:   Sun Aug 29 16:41:56 2021 -0700

    move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)

commit 13a2da973f182f238d1e27bd9da6f98173dad026
Author: peott-fr <[email protected]>
Date:   Sun Aug 29 14:52:49 2021 -0700

    Nyquist (#14202)

    * adding my Nyquist keymap

    * Updating Nyquist keymap with licensing.

    * Cleaning-up and improving Nyquist keymap.

    * Cleaning-up and improving Nyquist keymap.

commit a1866a962c21a6e15f40cbde2bd09c0ff42f1454
Author: Sergey Vlasov <[email protected]>
Date:   Mon Aug 30 00:24:43 2021 +0300

    Update the nix-shell environment (#13316)

    * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`

    The `$PATH` modifications performed by the Nix wrapper for the `qmk`
    executable prevent `bin/qmk` from working properly (the changed `$PATH`
    contains a wrong `python3` executable which does not have the needed
    Python modules in its module path).  As a workaround, disable the
    generation of that wrapper for the `qmk` Python package (there is yet
    another wrapper generated while building the Python environment, which
    would still set the Python module path properly when running `qmk`).

    Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
    some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
    these invocations working is useful.

    * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`

    Update the Python dependency information used by Poetry to match the
    current state of the qmk_firmware code.

    * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps

    Update Python dependencies for nix-shell to the most recent releases:

     - dotty-dict: 1.3.0 -> no longer used
     - milc: 1.4.2 -> 1.6.2
     - pep8-naming: 0.11.1 -> 0.12.1
     - pygments: 2.9.0 -> 2.10.0
     - pyrsistent: 0.17.3 -> 0.18.0
     - pyusb: 1.1.1 -> 1.2.1
     - setuptools-scm: 6.0.1 -> no longer used
     - qmk: 0.1.0 -> 1.0.0
     - qmk-dotty-dict: not used -> 1.3.0.post1
     - yapf: 0.30.0 -> 0.31.0

    Note to self: The command to update Python dependencies changed to:

        ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )

commit ef7fdee6c803bf92bd6d892326c05ee1f473ad07
Author: J.Flanagan <[email protected]>
Date:   Sun Aug 29 14:18:56 2021 -0500

    [Keyboard] Add Viktus SP Mini (#14069)

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

commit f87cd8e8a02bf89d05737a19fd54e8ec6f63f90f
Author: Trent Hoh <[email protected]>
Date:   Sun Aug 29 19:09:43 2021 +0800

    [Keyboard] Corrected layout for np24 by YMDK (#14096)

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

commit 94d7635a4a8e335c743b4e77f8dd340665d43437
Author: peott-fr <[email protected]>
Date:   Sun Aug 29 04:08:23 2021 -0700

    [Keymap] My Prime E keymap (#14117)

commit 5d5668c3f8d77bebd841b838256f131de6ced497
Author: Weirdo <[email protected]>
Date:   Sun Aug 29 19:07:54 2021 +0800

    [Keyboard] Add kelownaRGB64 (#14141)

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

commit 9afc64cd61da5e3e1d2fd72a83602709a6e4e4b8
Author: Takeshi ISHII <[email protected]>
Date:   Sun Aug 29 15:06:00 2021 +0900

    [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)

commit dd8922d48269a0664e840d6b6a537b8b91c1826b
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 10:51:53 2021 +1000

    Fixup upstream paths for submodules. (#14205)

commit 6caebb7b619d85efc6932111f58b4a5e6d8e18eb
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 09:47:48 2021 +1000

    Bootmagic lite docs clarity. (#14204)

commit f061ca497464fe85284906fb163a33eaee7a91ef
Merge: ff65185dec 4bad375d7c
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 08:20:25 2021 +1000

    Breaking changes develop merge to master, 2021Q3 edition. (#14196)

commit 4bad375d7c09d949a9dcdd4feba147c9c7a67ec6
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 08:18:18 2021 +1000

    2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)

    * Initial changelog.

    * Data driven.

    * Submodule update.

    * Updated breaking changes docs.

    * Aliases.

    * Aliases.

commit 29ec2d8f4283212cf45c926c288f652a6727acb7
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 26 13:41:33 2021 -0700

    [Docs] Add examples to RGB Matrix Indicators docs (#12797)

commit 7e1634e2a6abac5fbdf7778ea7734a10b84ca49a
Merge: a13b0d8a6c ff65185dec
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 17:50:09 2021 +0000

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

commit ff65185dec6f97be1eb49f17cea526a0d0bbf3d6
Author: jackytrabbit <[email protected]>
Date:   Fri Aug 27 01:49:36 2021 +0800

    Add support for lazydesigners/cassette8 (#14145)

    * Add support for lazydesigners/cassette8

    Add support for lazydesigners/cassette8

    * Update keyboards/lazydesigners/cassette8/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/lazydesigners/cassette8/info.json

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Joel Challis <[email protected]>

commit a13b0d8a6cdfbb0c7873144e464c4ae13fa30854
Merge: 87cdb1cf9a 3fce5e6912
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 17:47:28 2021 +0000

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

commit 3fce5e6912d78ec9fff4124b6952e3b8a0d4d3ae
Author: jpuerto96 <[email protected]>
Date:   Thu Aug 26 13:45:48 2021 -0400

    New Keyboard - V4n4g0rth0n (#14152)

    * General: Initial commit for v4n4g0rth0n

    * Remove unecessary things|

    * General: Fix info.json

    * Finalize changes

    * Update keyboards/v4n4g0rth0n/config.h

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/v4n4g0rth0n/v1/rules.mk

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 87cdb1cf9a89a702f0c4286d4260fc84b18ae042
Author: Joel Challis <[email protected]>
Date:   Thu Aug 26 16:53:24 2021 +0100

    Update readme files (#14172)

commit 48d0ad28e789abae0413002f9dbda38f1a82924a
Author: Joel Challis <[email protected]>
Date:   Thu Aug 26 14:14:48 2021 +0100

    Move to correct location (#14171)

commit 6d646880a4d170409d784dab8be79ff3571d62ae
Merge: 2bc978437e edf35615cf
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 11:38:28 2021 +0000

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

commit edf35615cf4052e94024101e1f4ccb3ed838ce47
Author: kb-elmo <[email protected]>
Date:   Thu Aug 26 13:37:55 2021 +0200

    Skeletn87 - Fix RGB pin (#14170)

    * add Skeletn87

    * update skeletn87 files

    * update skeletn87 soldered

    * update readme image

    * update readme (again)

    * fix skeletn87 indicator LEDs

    * fix led pin for production PCB

commit 2bc978437e98ca24dd6186a2d637272738cd54de
Merge: 0c97bc5179 ee3a1133f1
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 23:56:39 2021 +0000

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

commit ee3a1133f1283fab132f4d601e19a61da2041631
Author: Charles <[email protected]>
Date:   Thu Aug 26 01:56:09 2021 +0200

    [keyboard] Add 0x3E (#14088)

    * Add 0x3E - default config

    * Apply suggestions from code review

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Apply suggestions from code review 2

    Firmware size optimization

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Rename files as per project guidelines + remove empty

    * Update link in readme.md

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 0c97bc5179ede0911067ecb0d96745d29710df07
Merge: 329c130202 4c5334cb9e
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 23:40:04 2021 +0000

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

commit 4c5334cb9e0fef692ed3bd7a3e02579271f0f338
Author: 8bits4ever <[email protected]>
Date:   Thu Aug 26 01:39:34 2021 +0200

    [converter/a1200] Changing layout macro reference info.json (#14143)

    * Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h

    * Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk

    * Create dummy

    * Add files via upload

    * Delete dummy

    * Update readme.md

    * Update info.json

commit 329c130202229c50f83af4272eb8dc1c0beb30ed
Merge: 527b1e52aa 89f2b9486f
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 19:04:06 2021 +0000

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

commit 89f2b9486fe28685a5e53f6ef20d140ccba4aab7
Author: MechMaster48 <[email protected]>
Date:   Wed Aug 25 12:03:27 2021 -0700

    [Keymap] mechmaster48 keymap  for OLKB Preonic rev3 (#14137)

commit 527b1e52aa0c87d49b90ea18d7d3ca9728aaa9c2
Author: Joel Challis <[email protected]>
Date:   Wed Aug 25 15:27:48 2021 +0100

    Move nix folder alongside vagrant (#14132)

commit a84de5e22be25e2059dfee732f5cca3ec0953a35
Author: Joel Challis <[email protected]>
Date:   Wed Aug 25 01:16:59 2021 +0100

    Revert 14083 && 14144 (#14150)

    * Revert "Short term bodge for firmware size bloat (#14144)"

    This reverts commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0.

    * Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)"

    This reverts commit c4dbf4bf0118dd785802861beb247433b5b7411d.

commit 3855713ca0a9513c51fe70e61032d7ea89fa7e87
Merge: 622c3cac3a bb1b822247
Author: QMK Bot <[email protected]>
Date:   Tue Aug 24 22:10:04 2021 +0000

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

commit bb1b82224772fcff8518b301f12c46fd132b04fd
Author: Albert Y <[email protected]>
Date:   Wed Aug 25 06:09:26 2021 +0800

    [Keyboard] Update Technik ortholinear RGB matrix points (#14124)

    Co-authored-by: filterpaper <filterpaper@localhost>

commit 622c3cac3ab8bc25d3cfec63702e295e0b16a49a
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 17:18:25 2021 +0100

    Fix merge artifacts (#14146)

commit 2cade3a48300e0709f8aec68602faf90947b6738
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 17:07:11 2021 +0100

    Align some quantum sub-directories (#14134)

    * Misc folder tidy

    * Review comments

    * Remove redundant entry

commit 2827a3cf754c2eaca37a0d44a5901741f1855414
Merge: a8d6547346 b4867e1600
Author: QMK Bot <[email protected]>
Date:   Tue Aug 24 15:44:36 2021 +0000

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

commit b4867e1600baa615ec9b28421fc23d4b85bad8ec
Author: Yoichiro Tanaka <[email protected]>
Date:   Wed Aug 25 00:44:00 2021 +0900

    [Keyboard] Add yoichiro/lunakey_macro (#13849)

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

commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 16:09:23 2021 +0100

    Short term bodge for firmware size bloat (#14144)

commit e3b68ddfe890868ac732f28ddcc1f111c69a0bfb
Merge: c9c60d227e 097e85e930
Author: Drashna Jael're <[email protected]>
Date:   Tue Aug 24 07:32:31 2021 -0700

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

commit c9c60d227e38abdf08ca86bcdad3a0cac2579e3f
Author: Takeshi ISHII <[email protected]>
Date:   Tue Aug 24 22:34:24 2021 +0900

    add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)

commit c4dbf4bf0118dd785802861beb247433b5b7411d
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 14:28:37 2021 +0100

    Tidy up quantum.c now some of tmk_core has been merged (#14083)

commit 097e85e930ae7e7f8ffd67717ed944a38111de6c
Author: GG <[email protected]>
Date:   Tue Aug 24 12:50:56 2021 +0300

    [Keyboard] Add serneity65 (#13889)

commit c4a2dc9a2d1b0c053272aec7672ab8df92550e88
Author: Xelus22 <[email protected]>
Date:   Tue Aug 24 19:39:24 2021 +1000

    fix (#14142)

commit 3ef978cb132e89f3dc55edc47c2c0c0f330cbd0d
Author: Christian Sandven <[email protected]>
Date:   Tue Aug 24 10:54:17 2021 +0200

    [Keyboard] Fix keyprez qmk configurator (#14119)

commit a4aa6ccf7b98a203c16be51e8db4970a80f0abfd
Author: kb-elmo <[email protected]>
Date:   Tue Aug 24 10:49:50 2021 +0200

    [Keyboard] Add QEZ keyboard (#14131)

commit b8c74d6b5d2e31b59b4ec73c84b8b4212b4b0936
Author: Albert Y <[email protected]>
Date:   Tue Aug 24 16:49:13 2021 +0800

    [Keyboard] Update Technik staggered RGB matrix points (#14125)

    Co-authored-by: filterpaper <filterpaper@localhost>

commit eaad654798d3b14b11cc99cafdf3a7db1c602c9d
Author: stickandgum <[email protected]>
Date:   Tue Aug 24 04:48:35 2021 -0400

    [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)

    Co-authored-by: James Young <[email protected]>

commit e1c264f5793b246baa1dd70b39e964dd821c475f
Author: Rifaa Subekti <[email protected]>
Date:   Tue Aug 24 16:42:23 2021 +0800

    [Keyboard] Update info.json for ocean/gin_v2 (#14121)

    Co-authored-by: Ryan <[email protected]>

commit bc239cd52022ea7ca26310faa9ed98e3faa81cb6
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 24 01:37:14 2021 -0700

    [Keymap] Drashna keymap fixups (#14140)

commit 3455e2408dd8e3f11854fd6660e2b40027bcd92e
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 24 01:19:00 2021 -0700

    [Keyboard] Fix default keymap for quark squared keyboard (#14139)

commit 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0
Author: Xelus22 <[email protected]>
Date:   Tue Aug 24 16:28:26 2021 +1000

    [Core] Refactor OLED to allow easy addition of other types  (#13454)

    * add docs

    * core changes

    * update keyboards to new OLED

    * updated users to new OLED

    * update layouts to new OLED

    * fixup docs

    * drashna's suggestion

    * fix up docs

    * new keyboards with oled

    * core split changes

    * remaining keyboard files

    * Fix The Helix keyboards oled options

    * reflect develop

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: mtei <[email protected]>

commit 47a38c3f0ea0fe44c90040514889a69de9b53f2f
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 05:02:53 2021 +0100

    Remove more unused files (#14135)

commit 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb
Author: Drashna Jaelre <[email protected]>
Date:   Mon Aug 23 18:40:24 2021 -0700

    Fix Mouse Shared EP functionality (#14136)

    Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports).   This cause it to error out in compiling.  This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.

commit e3483b4126adca1730dbaf1d466a227e66c6df91
Author: lalalademaxiya1 <[email protected]>
Date:   Tue Aug 24 08:32:15 2021 +0800

    [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)

    * Add keyboard Q1

    * Update keyboards/keychron/q1/readme.md

    * Update keyboards/keychron/q1/rev_0100/rules.mk

    * Update keyboards/keychron/q1/readme.md

    * Change layer switch function to "default_layout_set"

    * Update keyboards/keychron/q1/rev_0100/info.json

    * Update keyboards/keychron/q1/q1.c

    * Mask out the DIP switch to fix sleeping issue when switch is ON

    * Added and changed readme.md

    Added keyboards\q1\rev_0100\readme.md
    Changed keyboards\q1\readme.md since different MCU may used in other version.

    * update

    * update keymap name

    * update keymap for keychron/q1/rev_0102

    * Update info.json

commit d57d9aec4f1e00601e6664ef6c4cb0e3e7826fe2
Author: Drashna Jaelre <[email protected]>
Date:   Mon Aug 23 15:46:06 2021 -0700

    Fix bootloadHID comments breaking :flash (#14133)

commit e756a21636149ad47c19c659d04be93cf3071dab
Author: Donald Kjer <[email protected]>
Date:   Mon Aug 23 15:15:34 2021 -0700

    eeprom_stm32: implement high density wear leveling (#12567)

    * eeprom_stm32: implement wear leveling
    Update EECONFIG_MAGIC_NUMBER
    eeprom_stm32: check emulated eeprom size is large enough
    * eeprom_stm32: Increasing simulated EEPROM density on stm32
    * Adding utility script to decode emulated eeprom
    * Adding unit tests
    * Applying qmk cformat changes
    * cleaned up flash mocking
    * Fix for stm32eeprom_parser.py checking via signature with wrong base
    * Fix for nk65 keyboard

    Co-authored-by: Ilya Zhuravlev <[email protected]>
    Co-authored-by: zvecr <[email protected]>

commit 2481e109a0f79b4cdcecab4a6bf6755fb5eda3fc
Merge: f314705921 9472c4b8cb
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 22:06:37 2021 +0000

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

commit 9472c4b8cb448f04e17810dd304e368c60fdd504
Author: Olli Helenius <[email protected]>
Date:   Tue Aug 24 01:06:04 2021 +0300

    Fix US_RDQU keycode (#13464)

    `US_RDQU` and `US_LDQU` were aliased to the same keycode. `US_RDQU`
    should use the right bracket.

commit f314705921c9c316e69cfb6767aba8f0570c7012
Author: Path Nirvana <[email protected]>
Date:   Tue Aug 24 05:05:10 2021 +0700

    adding uf2 flash support for blackpill 401 (#13968)

    * adding uf2 flash support for blackpill 401

    * forgot to add blackpill to keyboard header file

    * making changes requested by drashna

    * fixing tzarc s comments

    * removing the keyboard

    * undo the change to dactyl_manuform.h

commit 718f0a2482ab821df141a9985d1eb31a6fe6aed9
Merge: d8778eba92 a72b562141
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 14:26:24 2021 +0000

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

commit a72b5621418bebf253865ed19f92a860b5b9039a
Author: Rifaa Subekti <[email protected]>
Date:   Mon Aug 23 22:25:51 2021 +0800

    [Keyboard] update default and via keymap for ocean/wang_v2 (#14122)

commit d8778eba922f3415acb40dd178dd821b05bdb654
Author: Nick Brassel <[email protected]>
Date:   Mon Aug 23 19:37:16 2021 +1000

    Fixup line endings.

commit 71df135254709c183b980b89554216ec86d02eab
Author: stickandgum <[email protected]>
Date:   Sun Aug 22 22:19:11 2021 -0400

    [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)

    Co-authored-by: James Young <[email protected]>

commit 355872cc1d7c0eb5e5c66845188d53c7a434c8d2
Merge: 9af069ecf3 5cd7999bc4
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 02:10:58 2021 +0000

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

commit 5cd7999bc4b9e7c049bc80e0f812676528a07209
Author: Vino Rodrigues <[email protected]>
Date:   Mon Aug 23 12:10:23 2021 +1000

    [Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c (#14094)

    This patch corrects 2 issues with the LED matrix of the KDBFans KBD67 Lite (v3)
    * Incorrect mapping of the right-shift, down-arrow, and right-arrow.  (i.e. `NO_LED` positions of the `g_led_config` key matrix in the .c file do not match the `LAYOUT_65_ansi_blocker` matrix in the .h file.
    * Remapping of the *LED Index to Physical Position* using physical measurements from actual keyboard and accounting for the southpaw LED position to define the true centre of the keyboard (more relevant to circular animations).

commit 9af069ecf354b97b3456e856fbf8e22822efeb18
Author: Dasky <[email protected]>
Date:   Mon Aug 23 00:31:38 2021 +0100

    Fix typo (#14118)

commit f043b8be384cbfde6dcca0ffee2fc842a4fb4342
Merge: 4b87c1f40b aa28335651
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 21:43:07 2021 +0000

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

commit aa28335651a5a76d89054509186500c3af6147e7
Author: Bror Winther <[email protected]>
Date:   Sun Aug 22 23:42:34 2021 +0200

    Add fix for brew upgrade (#12921)

    Add a fix for `brew upgrade` so only formulae is upgraded and not casks

commit 4b87c1f40bd3c96132878c5cbb75ce2109e4b861
Merge: 7dfa93d9b6 5319727b70
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 16:29:18 2021 +0000

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

commit 5319727b7086f9e73e423054eed4886d8de2750b
Author: Ryan <[email protected]>
Date:   Mon Aug 23 02:28:48 2021 +1000

    Fix line endings for `quark_squared` info.json (#14113)

commit 7dfa93d9b6d01757f6583c77055f1ff59d04876e
Merge: 34d0376ab9 46fb874269
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 06:04:52 2021 +0000

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

commit 46fb8742692b546901555ffc544e954801ff5340
Author: npspears <[email protected]>
Date:   Sun Aug 22 01:04:20 2021 -0500

    [Keyboard] add support for Quark² (#14109)

    Quark² is a hotswap version of the Quark PCB

commit 34d0376ab9d73a77c50b78b01498710346ba6105
Merge: f709394442 9a51076859
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 05:12:24 2021 +0000

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

commit 9a51076859f00c28749bc8e1627e7f09263f3a88
Author: Christian Sandven <[email protected]>
Date:   Sun Aug 22 07:11:56 2021 +0200

    [Keyboard] Keyprez bison (#14100)

    Co-authored-by: Ryan <[email protected]>

commit f70939444262da043dfd4e092579528498d14db6
Merge: aedd8cca31 b1b6fe1c3d
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 05:11:44 2021 +0000

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

commit aedd8cca310ecb45221566edcca34a749117329e
Author: precondition <[email protected]>
Date:   Sun Aug 22 07:11:32 2021 +0200

    [Keyboard] Kyria default reformat (#14080)

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

commit b1b6fe1c3da1de17e56fc65499c61886cb0a298a
Author: Conor Burns <[email protected]>
Date:   Sun Aug 22 07:11:15 2021 +0200

    [Keymap] added bongocat keymap to 0xCB Static (#14093)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 78ccd9c201199444bc06161b05ee8d7ba9c31613
Author: peepeetee <[email protected]>
Date:   Sat Aug 21 22:53:49 2021 -0500

    Organize KPrepublic, K.T.E.C, xiudi boards into directories (#12159)

    * reset; redoing my steps; and recommit

    * include xd002/.noci

commit c70abc8d047319830e369ae4e14cd43bae3bd3b8
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 22 13:49:33 2021 +1000

    Warn when building a board that uses arm_atsam (#10904)

    * Add deprecation warning during build when building a board that uses arm_atsam.

    * Rewording.

    * Wording.

    * Fixup.

commit dcef03853d612feb23b02523f1dfaf6576d18ace
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 19:08:05 2021 -0700

    [Keyboard] Disable Console on Keebio Quefrency (#14108)

commit f4a2f2bb7e0d745c6f126db15b94955eebc64884
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 18:34:16 2021 -0700

    [Keyboard] Fix compile issues for Tractyl Manuform (#14105)

commit e08d6a33fc1c119e4632bdaa37e75aebbd895dbd
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 18:34:04 2021 -0700

    [Core] Fix copypasta issue with pmw3360 sensor config (#14106)

commit 0ae20e74578ae4420af3e684f7ad9fcbd7beee94
Author: Joakim Tufvegren <[email protected]>
Date:   Sun Aug 22 02:51:17 2021 +0200

    Make solo half of split keyboards (more) usable. (#13523)

    * Make solo half of split keyboards (more) usable.

    Using only one half of a split keyboard (that's using the split_common
    framework to communicate) is not a great experience, since several read
    timeouts per scan cycle cause an unusably slow scan rate.

    This change blocks all split communication attempts for 500 ms
    (configurable) after an error occurs, causing the scan rate to become at
    least _more_ usable, but might need some tweaking to work fully on most
    keyboards. One read timeout still needs to occur after the 500 ms has
    passed, and if that timeout isn't low enough, some scan cycles may still
    be too slow.

    * Fix lint complaint.

    * Require 25 consecutive comm errors to see comms as disconnected.

    The number of max errors can be overridden by defining
    `SPLIT_MAX_CONNECTION_ERRORS`.

    * Add comments to new defines, and ability to disable disconnection check.

    Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
    by most relevant numbers for the description.

    * Make lint happy ...again

    * Only update `connection_check_timer` when needed.

    * Add new defines to split keyboard documentation.

    * Move connection timeout logic to transport.c, add `is_transport_connected`.

    * Use split_common disconnection logic in matrix.c.

    Instead of doing more or less the same thing twice.

    * Move disconnection logic to `transport_master`.

    Is a cleaner implementation, and causes the scan rate while disconnected
    to increase instead of decrease.

    * Lint fixes.

    * Lower default `SERIAL_USART_TIMEOUT` to 20 ms.

    The read timeout must be low enough to not cause exessively long scan
    cycles when using a solo split half. 10 ms was determined from testing
    to work fine even with the slowest defined baudrate of 19200 (5 ms was
    too low for that case), so 20 ms should be fine for most cases.

    * Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h

    Was somewhat mistakenly included in an earlier PR.

    * Fix building with `USE_I2C`.

    * Reduce built firmware size.

    Not really sure why this works, the idea was taken from tzarc's work on
    split disconnection.

    * Tweak and improve opt-out for split disconnection logic.

    There are now two ways to opt out from this feature:
    * Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
      the connection status checks (also affects the slave matrix reset logic in
      matrix.c, though).
    * Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
      communication throttling while disconnected. Will make the firmware
      smaller.

    * Make split disconnection logic work with custom transports.

    Includes a fallback implementation for keyboards using a custom
    split_util.c but not a custom matrix.c (currently no such keyboard seems
    to be merged, though).

    * Remove unnecessary include of timer.h

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>

commit c5f41d42d8e4dc88b2aeb414aa0d26ad23ad34f1
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 16:46:35 2021 -0700

    Updated RGB Matrix suspend define part 3 (#13954)

    * Updated RGB Matrix suspend define part 3

    * Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)"

    This reverts commit 80015f7fb023f27ad5307815fd5433694a3bcb4a.

    * Add additional boards/keymaps

commit 58a5030661b57f1dd05693053df2eddadc285f64
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 13:34:44 2021 -0700

    [Keymap] Drashna's Improve OLEDs and custom Split code (#14063)

    * Fill the oleds with right mods

    * Enable double mods on x32 oleds

    * Disable forced NKRO

    * Make oleds fancy only on good MCUs

    * Overhaul oled display

    * Further enhance oled, with kitty!

    * Final oled form

    * Not working transport

    * Transport id of woring

    * Add acceleration

    * fix button placement for accel macro

    * Fix accelartion location and behavior

    * Remove OLED sync code

    * Fix alignment issue

    * Remove audio hack

    * Fix up zima keymap

    * Add matrix slave scan function and cleanup drashna.h

    * Clean up user space

    * Allow userspace sync to be disable-able

    * Fix weird issue with audio

    * Fix alignment issue with user split sync

    * Disable second rgb matrix task

    * Disable additional animations

    * Change dynamic keymap settings

    * Hacky fix for borked corne

    * Add Blackpill (F411) support to tractyl manuform

    * remove manual via eeprom reset

    * Remove all references to rgblight twinkle

    * Fix issues with config processing

commit da1c011afc67dab0049b30a4c021dc38a36cb9aa
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:14:23 2021 -0700

    Improve pmw3360 sensor and make it more hardware agnostic (#14097)

commit 3452c89c8b5e652ff957123151ca0bbdfcbf3927
Merge: a80d789147 c1cad5b751
Author: QMK Bot <[email protected]>
Date:   Sat Aug 21 04:13:34 2021 +0000

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

commit c1cad5b7516af745cc0a3ffde8c0cc9af63e5a1d
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:13:02 2021 -0700

    [Keyboard] Fix naiping/npminila layout macro (#14098)

commit a80d7891472335ec297082daecc6fbf90042c38c
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:02:53 2021 -0700

    Fix issues with VIA EEPROM init and bring in line with eeconfig functionality (#13243)

    Co-authored-by: Ryan <[email protected]>

commit afd3bcbf45a9b7de097d7666ced2c674192949e5
Author: Nick Brassel <[email protected]>
Date:   Sat Aug 21 13:38:38 2021 +1000

    Fix up compilation issues. (#14095)

commit ce379ef458fd9092543fb4022aab6e455865f514
Merge: a7d48b063e c71d67ba3f
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 22:32:01 2021 +0000

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

commit c71d67ba3f4bdedbd5ec1e931e6ea9568fcd0d98
Author: Spaceman <[email protected]>
Date:   Fri Aug 20 18:31:26 2021 -0400

    [Core] [Docs] Remove travis-ci references (#13916)

commit a7d48b063ec9d551396eadeb02a924d2ee3ea515
Author: Ryan <[email protected]>
Date:   Sat Aug 21 03:43:49 2021 +1000

    Fix LED Matrix suspend code (#14090)

commit e8943a8b0c9d7ff4f078fe1f76f2c62c269767c5
Merge: 1ec6ce8c37 30bb807c13
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 17:33:25 2021 +0000

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

commit 30bb807c13a5787164bd63fa17a97c0870a60198
Author: Weirdo <[email protected]>
Date:   Sat Aug 21 01:32:53 2021 +0800

    [Keyboard] Add Naiping series keyboard (#14040)

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

commit 1ec6ce8c370d53292979718cc406b66c4c5616a8
Merge: 92fa07336c c1add5d0e2
Author: Zach White <[email protected]>
Date:   Fri Aug 20 08:22:41 2021 -0700

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

    Resolved Conflicts:
    	lib/python/qmk/info.py

commit c1add5d0e278da55128964dc305b833fb0bbc063
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 16:16:59 2021 +0100

    Restore layout count validation (#14068)

commit 92fa07336cd7fcd578c31a8069cf955a4d601327
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 06:14:42 2021 -0700

    [Bug] Fix RGB/LED Matrix Suspend code (#14084)

commit da11a49905605871eea66f8f03b2c4b46d1de88a
Merge: 69c71d4843 90ff4fe749
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 13:14:35 2021 +0000

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

commit 90ff4fe749346c3b92aa8ca6461f5091fabfa99e
Author: tiltowait <[email protected]>
Date:   Fri Aug 20 06:13:59 2021 -0700

    [Keyboard] Add IBM Model M SSK configuration (#14050)

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

commit 69c71d4843586fad9c29c4dd945aa170f9990d8e
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 10:15:11 2021 +0100

    Align DIP_SWITCH_PINS_RIGHT implementation with encoders (#14079)

commit b229b0fba72d79f1c723f2415531e61537b56fc3
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 10:11:49 2021 +0100

    Fix issues with recent keymap.json changes (#14089)

    * Fix issues with recent keymap.json changes

    * Allow empty author string

commit 0741aae1d9e53206d5930fcb962948f13f48e661
Merge: 8dfd33e3d1 fd54992e1f
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:36:09 2021 +0000

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

commit fd54992e1f65713a93115a0a1737e97d3e2d8522
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:35:29 2021 -0700

    [Keyboard] Fix Feels65 Via keymap (#14086)

commit 8dfd33e3d1d62b410e4f94b3eb5a1caf5ef5dcf6
Merge: c6f24f66bd 37b5ead17d
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:27:09 2021 +0000

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

commit 37b5ead17d55d893d8639acd402cb4907ff4cc2c
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:26:37 2021 -0700

    [Keyboard] Fix space_space rev1 keyboard files (#14087)

commit c6f24f66bd60e67fb9eca689bb46aa23a10a0e5a
Merge: 0a1bf7f6aa cc0ae9cc4c
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:22:05 2021 +0000

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

commit cc0ae9cc4ceaf3bdd5d33e1d410b319db617c4eb
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:21:00 2021 -0700

    Revert "[Keyboard] Dumbpad VIA support added (#13512)"

commit 0a1bf7f6aa6e44557041e03f6e58df5a180c6d79
Author: Simon Arlott <[email protected]>
Date:   Fri Aug 20 00:31:23 2021 +0100

    Support using a timer for wait_us() on ChibiOS-based boards (#12211)

    * Support using a timer for wait_us() on ChibiOS-based boards (#12198)

    There are spare GPT timers that can be used to get a more accurate
    wait_ms() time. This is required for the matrix scan unselect delay (30µs)
    to be shorter than the system tick rate of 100µs.

    This is limited to the maximum GPT duration of 65535 so values above that
    will automatically use the previous implementation based on the system
    tick.

    Using a specific timer means it can't be shared by another thread at the
    same time so when wait_us() is called from anything other than the main
    thread it will use the system tick implementation too.

    * Update tmk_core/common/chibios/wait.c

    * Update tmk_core/common/chibios/wait.c

    Co-authored-by: Joel Challis <[email protected]>

commit 462e7f075a14175be08f32561d5ba783e725ab7c
Author: moyi4681 <[email protected]>
Date:   Fri Aug 20 03:02:07 2021 +0800

    move volcano660 to ilumkb folder (#13550)

    * move volcano660 to ilumkb folder

    * Update rules.mk

    * Fix up readme

    Co-authored-by: zvecr <[email protected]>

commit 34137666498f367c677b751abab97100f30d1d36
Merge: 7f1c90b7a8 b724a0dfd5
Author: QMK Bot <[email protected]>
Date:   Thu Aug 19 18:59:06 2021 +0000

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

commit b724a0dfd5782f81d52fa006466e607d7ba04c5e
Author: SneakboxKB <[email protected]>
Date:   Thu Aug 19 13:58:35 2021 -0500

    [Keyboard] Ava initial commit (#13845)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: SneakboxKB <[email protected]>

commit 7f1c90b7a8d66b806f87229fb96e5c69ee9fb1a4
Author: Dasky <[email protected]>
Date:   Thu Aug 19 19:58:17 2021 +0100

    [Core] Speed up pimoroni trackball driver (#13823)

commit e988f58374a138a1af79a141dc8eda54c8782907
Merge: 4279b14adf a12f3a3fb8
Author: QMK Bot <[email protected]>
Date:   Thu Aug 19 18:45:19 2021 +0000

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

commit a12f3a3fb87374d1c68417b2f58a22bad687f12c
Author: minibois <[email protected]>
Date:   Thu Aug 19 20:44:47 2021 +0200

    [Keyboard] Minor fixes for mini_elixivy/info.json (#14022)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 4279b14adffe081a3dfb17fa0f04ed21513e5eda
Merge: 9d1c98c891 f4f679779e
Author: James Young <[email protected]>
Date:   Thu Aug 19 11:32:23 2021 -0700

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

    Conflicts:
    	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
    	keyboards/space_space/rules.mk

commit f4f679779e1404d9dc34c64823b9eb993bfa7ab3
Author: GG <[email protected]>
Date:   Thu Aug 19 21:17…
sekigon-gonnoc added a commit to sekigon-gonnoc/qmk_firmware that referenced this pull request Sep 11, 2021
@sekigon-gonnoc
Merge with master/46f15cd1a533cce8c9f7a406b1e6ee6765e48a20
1b8c0b8 
commit 46f15cd1a533cce8c9f7a406b1e6ee6765e48a20
Author: yfuku <[email protected]>
Date:   Sat Sep 11 13:59:28 2021 +0900

    [Keyboard] owl8 bugfix (#14020)

commit d0b1d9f548aa39e1d267e8f62db4e0c65aae9206
Author: AKiwi92 <[email protected]>
Date:   Sat Sep 11 05:20:43 2021 +0100

    [Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: James Young <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Ash <[email protected]>

commit 6213989c3248405aed7710d68599c8e61ac5b910
Author: rarick <[email protected]>
Date:   Fri Sep 10 22:52:17 2021 -0500

    [Keymap] Add keymap for crkbd/rarick (#13240)

    * Added new keymap for crkbd/rarick

    * Delete flash.sh

    Deleted rarick crkbd flashing script, as it will not be used by most users.

    * Applied feedback, and fixed build error caused by builder updates

    * Update keyboards/crkbd/keymaps/rarick/config.h

    Removed USE_MATRIX_I2C, no longer used.

    Co-authored-by: Drashna Jaelre <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>

commit d7747a2d700eec08679011d79dc6192fe43ca402
Author: Zac Moulton <[email protected]>
Date:   Fri Sep 10 18:56:50 2021 -0700

    [Keymap] moults31 userspace and keymaps (#12025)

commit 759d1927f099ba319ad09c69a2cc71026d775713
Author: Xelus22 <[email protected]>
Date:   Sat Sep 11 05:14:39 2021 +1000

    [Keyboard] Add RS60 (#14073)

    * initial rs60

    * update

    * remove

    * Include rs60.h

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * List form readme.

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * change layout name

    Co-authored-by: Joel Challis <[email protected]>

    * add layout

    Co-authored-by: Joel Challis <[email protected]>

    * add license

    Co-authored-by: Joel Challis <[email protected]>

    * 2021 update

    Co-authored-by: Joel Challis <[email protected]>

    * add license

    Co-authored-by: Joel Challis <[email protected]>

    * sigprof suggested changes

    * Remove redundant define

    Co-authored-by: Ryan <[email protected]>

    * Fixup readme

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

    * Update keyboards/xelus/rs60/info.json

    Co-authored-by: Ryan <[email protected]>

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

commit 7277f1febe0e86e8a32beb779aa24e02bfdb6826
Author: Ryan <[email protected]>
Date:   Fri Sep 10 23:11:17 2021 +1000

    Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)

commit d5cb7de5e4ea60dce69764a627358d534af1f666
Author: Ryan <[email protected]>
Date:   Fri Sep 10 17:17:54 2021 +1000

    Change USBasp and bootloadHID bootloaders to lowercase (#14354)

commit 7eea780a7da2d9197b78b62b7294a6b2bc2fa572
Author: Ryan <[email protected]>
Date:   Fri Sep 10 13:35:46 2021 +1000

    Remove bootloader listings from rules.mk (#14330)

commit 2cb9219a3e655218f5380a41cf5bc5e3135caaa1
Author: Ryan <[email protected]>
Date:   Fri Sep 10 13:32:22 2021 +1000

    Remove commented out BLUETOOTH_ENABLE rules (#14361)

commit 7f80076d044d729407cc4aad35095ff4a8ff5653
Author: Joel Challis <[email protected]>
Date:   Fri Sep 10 03:57:36 2021 +0100

    Align rgb/led matrix docs with current behaviour (#14367)

commit 22499636871ae8f0b8f2da90f801f9290fb1d186
Author: Uy Bui <[email protected]>
Date:   Fri Sep 10 02:02:45 2021 +0900

    [Keyboard] Add custom pcb for Polaris (#14347)

    * [Keyboard] pcb for Polaris

    * [Keyboard] pcb for Polaris: update  layout

    * Update keyboards/wekey/polaris/info.json

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit d6dd2e0d516a67bdc9bde2b6d1680a00c48675e4
Author: Ryan <[email protected]>
Date:   Thu Sep 9 16:50:52 2021 +1000

    Fix CRLF in lyra/rev1 (#14360)

commit 4c88f76be8099d45444cea894bb2162870115832
Author: Malevolti <[email protected]>
Date:   Thu Sep 9 07:34:32 2021 +0100

    [Keyboard] add lyra (#13977)

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

commit 82ee9bd475be9723d53ea3e8e101a038bbfa1b25
Author: mechlovin <[email protected]>
Date:   Wed Sep 8 22:23:26 2021 -0700

    [Keyboard] Add Olly JF PCB (#14056)

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

commit 6d43a5daf4225cf677840d11b151d28f49e8f9e9
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 20:19:06 2021 -0700

    Backport F_CPU/F_USB hack from system76 (#14286)

    Co-authored-by: Ryan <[email protected]>

commit cb4006c0b47e9d99c2f60b74d414b19cf4b9e333
Author: Felix Jen <[email protected]>
Date:   Wed Sep 8 19:44:52 2021 -0700

    [Keymap] Fix Maker Keyboards Alexa Keymap (#14355)

commit 891ddd9a30628509b239a0d41fbdc65b4530f80a
Author: Ethan Yates <[email protected]>
Date:   Wed Sep 8 20:14:03 2021 -0600

    [Keyboard] Add 61Key (#14259)

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

commit f3bef84dace5d1d938f9d02be644bf421a4a3de1
Author: JayceFayne <[email protected]>
Date:   Thu Sep 9 03:34:49 2021 +0200

    `ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (#14315)

commit da81e5c7cd700cdb3ecd750ae8044f514fb65ca2
Author: JayceFayne <[email protected]>
Date:   Thu Sep 9 03:34:34 2021 +0200

    `OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (#14302)

commit 853e56d080d71ebf1be7299e3b78f6e5ec190aa5
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 18:10:43 2021 -0700

    [Keyboard] Minor tweaks to Work Board layout (#14351)

commit 9e77cdf4e66ff1cfdd7effaf77e129bf3ae9a1a5
Author: Ryan <[email protected]>
Date:   Thu Sep 9 10:27:58 2021 +1000

    Bugfix for Joystick and JSON schema (#14295)

commit 3f2a030de6a306ed72eafe7aa143a5b695f9469d
Author: rhmokey <[email protected]>
Date:   Thu Sep 9 07:57:43 2021 +0800

    [Keyboard] Add new Mokey keyboard (#14329)

    Co-authored-by: Ryan <[email protected]>

commit d510f6afa97801ea53078ac7fbdbd24824d77f4e
Author: Gastón Jorquera <[email protected]>
Date:   Wed Sep 8 16:55:12 2021 -0700

    [Keymap] Add Gaston's Lily58 custom keymap (#14334)

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Gaston Jorquera <[email protected]>

commit 4294aa0f1ee546c74a72bad3e556d7ee4e020a88
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 8 16:52:43 2021 -0700

    [Keyboard] Tractyl Manuform - configuration updates (#14314)

    * [Keyboard] Tractyl Manuform - configuration updates

    * Update readmes

    * Add more details

    * Fix issues with encoder pins

    * Additional fixes for pin config

    * Fix up some comments

commit 8f8411a98a60ffe9e8410e892bff946d9122d3a9
Author: Keenan Brock <[email protected]>
Date:   Wed Sep 8 19:02:50 2021 -0400

    [Keyboard] Add VIA keymap for the reviung39 (#14234)

commit 2e0659f7fddd4c872b230c4a7d2e2a5517042414
Author: Joel Challis <[email protected]>
Date:   Wed Sep 8 23:44:18 2021 +0100

    Fixes for recent i2c migrations (#14352)

commit 9c175f180138558748b0b240e76cb04fa11f9927
Author: jackytrabbit <[email protected]>
Date:   Wed Sep 8 15:34:36 2021 +0800

    [Keyboard] Update VIA support for lazydesigners/the40 (#14240)

    Co-authored-by: Joel Challis <[email protected]>

commit 541e1012912e320e0f65ac1e24f9f8659a5571a8
Author: Gabriel Bustamante <[email protected]>
Date:   Wed Sep 8 03:53:33 2021 -0300

    [Keymap] New keymap for bm40 (#14182)

commit 3ef01a3482b76a956ba2f9f399a14d9e2f86b362
Author: Rifaa Subekti <[email protected]>
Date:   Wed Sep 8 12:07:00 2021 +0800

    [Keyboard] add wang ergo (#14245)

    Co-authored-by: Ryan <[email protected]>

commit 1ebaec96e7a9695578813916ba2e1651101e385b
Author: James Young <[email protected]>
Date:   Wed Sep 8 03:23:45 2021 +0000

    Sneakbox Ava tidy-up (#14298)

commit 267ffb9914fd04026aa9841c6c15e51ee6841811
Author: IFo Hancroft <[email protected]>
Date:   Wed Sep 8 06:01:58 2021 +0300

    [Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342)

commit 0b8d6df39037e58b6b699332d2bbbc448889c6b2
Author: Drashna Jaelre <[email protected]>
Date:   Tue Sep 7 18:53:55 2021 -0700

    [Keyboard] Fix issues with 3w6 rev2 matrix (#14346)

commit 60c5bd7b5e0e75f48d9731118b92a3add3342efd
Author: Joel Challis <[email protected]>
Date:   Wed Sep 8 02:23:11 2021 +0100

    handwired/dactyl - Refactor use of legacy i2c implementation (#14344)

commit 04c0704b280c4847c43b164335e9741b19219131
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:35:13 2021 +0100

    3w6 - Refactor use of AVR only I2C functions (#14339)

    * Refactor use of legacy i2c functions

    * Align rev2

    * Review fixes

commit e7a5c006d9777a4009da934f408961aa2d2e6fb1
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:34:59 2021 +0100

    Refactor use of legacy i2c implementation (#14341)

commit 2d6635214ab05858271f312619c5447bf317cf51
Author: Joel Challis <[email protected]>
Date:   Tue Sep 7 16:33:29 2021 +0100

    ergodone - Refactor use of legacy i2c implementation (#14340)

    * Refactor use of legacy i2c implementation

    * copy-paste error

commit 1dbe4e7dd0e0b1516997d84d16228e1d1ce29462
Author: shiftux <[email protected]>
Date:   Mon Sep 6 21:44:39 2021 +0200

    [Keyboard] Redox media (#13084)

    * adding a new revision 'media' to the redox keyboard

    * readme update

    * encoder fix

    * video link

    * drashna change requests

    * removing SPLIT_USB_TIMEOUT

    * intermediate rename

    * lowercase

    * drashna comments

    * include if defined KEYBOARD_redox_media

    * lowercase readme, tmp step

    * lowercase readme

    * drashna changes

    * more drashna comments

    * readme update

    * readme update

    * fauxpark and drashna comments

    * fauxpark comments

    * Update keyboards/redox/media/readme.md

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 85a14ac25bca14e91a21f1820e06079b9c3a078e
Author: Monksoffunk <[email protected]>
Date:   Mon Sep 6 22:49:09 2021 +0900

    [Keyboard] Zinc: fix RGBLED_NUM bug (#13287)

commit 1a494da288509d162593aaa07f4f9ca36b6b3dbd
Author: Joel Challis <[email protected]>
Date:   Sun Sep 5 23:56:10 2021 +0100

    Fix eeprom for Durgod boards (#14324)

commit 1e1be4c229651703ef7c62784b704a859a3d13cf
Author: Drashna Jaelre <[email protected]>
Date:   Sun Sep 5 15:35:42 2021 -0700

    [Bug] Fix compile issues for boards with custom matrix (#14323)

commit 8d6d8cfadfd1522b3dd2cc8ac1ce7393b45bbe64
Author: Joel Challis <[email protected]>
Date:   Sun Sep 5 21:36:43 2021 +0100

    Tidy up defines within STM EEPROM emulation (#14275)

    * Tidy up defines within stm eeprom emulation

    * Fix tests

    * Resolve todo

    * Still use page notion in clear

    * Remove more f4 refs

commit fe6d6cf76dc827adb2f46d55217dc189eae21b02
Author: Ryan <[email protected]>
Date:   Mon Sep 6 06:36:31 2021 +1000

    Remove empty override functions (#14312)

    * Remove empty override functions, 0-9

    * Remove empty override functions, A-D

    * Remove empty override functions, E-H

    * Remove empty override functions, handwired

    * Remove empty override functions, I-L

    * Remove empty override functions, M-P

    * Remove empty override functions, Q-T

    * Remove empty override functions, U-Z

commit 8a8fdd9a728a4cdc0ddce54fab9bf3b4ff8bf942
Author: Niko Wenselowski <[email protected]>
Date:   Sun Sep 5 21:36:16 2021 +0200

    Highlight keycode (#14317)

    This should make it consistent with other docs and hopefully will make less people miss this detail.

commit 767f2c02844acd77c86ea84fb86a1a7f49f379b0
Author: JayceFayne <[email protected]>
Date:   Sun Sep 5 18:09:20 2021 +0200

    [Core] Add `is_oled_scrolling` (#14305)

commit 0471429c018b85ebbccfe8c823621235c99458b2
Author: kb-elmo <[email protected]>
Date:   Sun Sep 5 18:05:55 2021 +0200

    [Keyboard] Fix rotary encoder function for Voice65 (#14316)

    Co-authored-by: Ryan <[email protected]>

commit 014aa0661e2d9cf5b67334f82869d4a841cc703f
Author: JayceFayne <[email protected]>
Date:   Sat Sep 4 16:01:56 2021 +0200

    Fix Space Cadet md link (#14300)

commit c9262cf7f8ff42741189a765ca76b531ac20fbc5
Author: Albert Y <[email protected]>
Date:   Sat Sep 4 10:02:15 2021 +0800

    Enable extra keys for Technik ortho and stagger (#14282)

    * Extra keys for technik ortho

    * Extra keys for technik staggered

    Co-authored-by: filterpaper <filterpaper@localhost>

commit b15bd128a543453f4545898ca3ad1be1b23a0cf5
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:03:15 2021 +0000

    FJLabs Ready100 Configurator Fixes (#14291)

    * grid-align keycodes; use short-form keycodes

    No logic change.

    * info.json: correct layout macro reference

    * info.json: correct LAYOUT_64key data

    Removes an extra key from the layout data.

    * 64_ansi Community Layout support

    * rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility)
    * add LAYOUTS = 64_ansi to rules.mk

    * remove width and height keys from info.json

commit 06c89e8abf072c4fe63120305d22d66ad50894ce
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:01:50 2021 +0000

    Naiping NPhhkb: 60_tsangan_hhkb Community Layout support  (#14292)

    * 60_tsangan_hhkb Community Layout support

    * rename LAYOUT to LAYOUT_60_tsangan_hhkb
    * add LAYOUTS = 60_tsangan_hhkb to rules.mk

    * correct maintainer field in info.json

    * remove width and height keys from info.json

    * fix GitHub account link on readme

commit 90909fbaf7946808970c4c5e83d9dcfdcd08b496
Author: James Young <[email protected]>
Date:   Fri Sep 3 20:00:29 2021 +0000

    takashicompany/endzone34: correct QMK Configurator key sequence (#14290)

    * update info.json formatting

    * convert tabs to spaces
    * apply human-friendly formatting

    * correct Configurator key sequence

    * remove width and height keys from info.json

commit 5f6d9913f814edcaf4e882615b76c85ed5499805
Author: James Young <[email protected]>
Date:   Fri Sep 3 18:48:10 2021 +0000

    OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293)

    * 65_ansi_blocker Community Layout support

    * rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility)
    * add LAYOUTS = 65_ansi_blocker to rules.mk

    * remove width and height keys from info.json

commit 8574bf20d35b21c7b44ba8550fa11b4d100fdbbd
Author: Ryan <[email protected]>
Date:   Sat Sep 4 02:09:30 2021 +1000

    Remove more cruft in keyboard files (#14288)

commit a01057d19dfa208fcf5c7cd16689257cb41ac79b
Author: jhauh <[email protected]>
Date:   Thu Sep 2 18:50:17 2021 +0100

    [Keymap] Update iris fluffactually keymap (#14265)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 956cf8d7bfbca187ad9d1e0aabbe6c25348d5e07
Author: Drashna Jaelre <[email protected]>
Date:   Thu Sep 2 10:49:44 2021 -0700

    [Keyboard] Work Louder board fixup (#14247)

    * [Keyboard] Add some last minute tweaks to Work board

    * Additional fixes

    * Fix rgb pin

    * Fix ws2812 hackery

    * additional led tweaks

    * Add indicator LEDs

    * fix bootmagic settings

    * Fix up RGB stuff

    * Limit power draw for entire board

    * fixup lights and such

    * change LED order on loop

    * Fix indicators if via is not enabled

    * Enable Sleep for rgb matrix

    * Even more LED tweaks

    * Final tweaks?

    * Tweak keycodes

commit d36a7c512d14e3bc6534f311e8f1a8a69878acb3
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:17:35 2021 +0000

    PistachioPro: correct Configurator key sequence (#14277)

    * info.json: apply human-friendly formatting

    * correct LAYOUT key sequence

    Moves the Enter key object to the correct place in sequence.

commit ebfa7e14f34c274a80fffb6a4fb9a3194c045d44
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:09:38 2021 +0000

    Matrix Falcon info.json fixes (#14273)

    * apply human-friendly formatting to info.json

    * update key labels; correct maintainer field

    * add LAYOUT_all data to info.json

    * remove width and height keys from info.json (per fauxpark)

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 0290dd35471a6649c878c590fb9b4798940d05b2
Author: James Young <[email protected]>
Date:   Thu Sep 2 17:08:35 2021 +0000

    Yoichiro Lunakey Macro: correct Configurator key sequence (#14276)

    * apply human-friendly formatting to info.json

    * correct Configurator key sequence

commit 98a2e9dc0ef7b18826e21af75fd24861ac683173
Author: jonavin <[email protected]>
Date:   Thu Sep 2 00:12:57 2021 -0400

    [Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Jonavin <=>

commit e056ae58a045d59686572ec1349c5c9f285517e5
Author: peott-fr <[email protected]>
Date:   Wed Sep 1 21:12:15 2021 -0700

    [Keymap] Fine-tuning Nyquist keymap. (#14269)

commit 37aef4ebe17b04de07a17748e2452c2f1ebe77bd
Author: Drashna Jaelre <[email protected]>
Date:   Wed Sep 1 21:08:58 2021 -0700

    [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271)

commit c1e5c920a9929a0434edca537e6c58aed294668c
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:50:44 2021 +0000

    naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264)

commit b55154fb0ad40d895ccc11bb09498f026e0c0773
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:47:28 2021 +0000

    neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266)

commit c0eab2a50491e7b27cb6fe8df82480a05e625068
Author: James Young <[email protected]>
Date:   Thu Sep 2 03:46:53 2021 +0000

    wuque/serneity65: Layout Macro rework and Configurator fix (#14267)

commit cb53c4fd41885ba60192cbd0b5fd23d6a687ab17
Author: hvp <[email protected]>
Date:   Thu Sep 2 05:44:36 2021 +0200

    [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187)

commit 872414f454435321b073ba747205b5f16ce0c53a
Author: peott-fr <[email protected]>
Date:   Wed Sep 1 20:44:12 2021 -0700

    [Keymap] Add peott-fr H87 keymap (#14232)

commit b6ca21c65c0d32241ed697072292bd5118b64f9a
Author: jonavin <[email protected]>
Date:   Wed Sep 1 23:42:31 2021 -0400

    [Keymap] Jonavin keymap gmmk pro (#14220)

    add rgb nightmode and optional colemak layer

    Co-authored-by: Jonavin <=>

commit cded3b75821547cd69614ab8b4a71417b6fa4bcb
Author: Christian Eiden <[email protected]>
Date:   Thu Sep 2 05:41:17 2021 +0200

    [Keymap] own scylla keymap (#14224)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit bb356a1584aa30020744432b87304ba912079ee7
Author: qieq <[email protected]>
Date:   Thu Sep 2 06:40:12 2021 +0300

    [Docs] Update path to keycode.h (#14263)

commit 7575bc23a677c9d34f4416dcfd2db6eafc1fd623
Author: James Young <[email protected]>
Date:   Wed Sep 1 17:44:03 2021 +0000

    MatchstickWorks SouthPad: correct Configurator key sequence (#14255)

    * matchstickworks/southpad: correct Configurator key sequence

    * replace tabs with spaces; apply four-space indent

commit 583f07ac58dca26183e56b14acd997eff98388c3
Author: James Young <[email protected]>
Date:   Wed Sep 1 12:20:56 2021 +0000

    owl8: add info.json file (#14256)

    * owl8: add info.json file

    * remove width and height keys (per fauxpark)

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit c573926e05ccdf71fdafa433db7cc46712d96d11
Author: Jay Greco <[email protected]>
Date:   Wed Sep 1 02:48:14 2021 -0700

    Fix snailmap compilation error (#14250)

    * Fix snailmap compilation error

    * Update keymap.c with correct OLED_ENABLE defines

commit 8d97c54770ef5205455dc7d8b004fcaf3d148168
Author: James Young <[email protected]>
Date:   Wed Sep 1 02:50:32 2021 +0000

    mnk50: Configurator Fix and Layout Macro Additions (#14257)

    Co-authored-by: Ryan <[email protected]>

commit c5ec423438696881c25ce1fe2ee189091e0510d6
Author: Casey Webster <[email protected]>
Date:   Tue Aug 31 19:50:42 2021 -0500

    [Keymap] cwebster2 Keymap and userspace updates (#14258)

commit fac5ec46564320ebbbc3d1f5575566badca2d3d7
Author: Andre Brait <[email protected]>
Date:   Wed Sep 1 01:18:35 2021 +0200

    Move GMMK Pro layouts to the correct subdir (#14241)

    Also fix a compilation issue in the mike1808 keymap

commit b7693c971c171298ca2be5c2bb4a71ca15893762
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 31 15:25:46 2021 -0700

    [Keyboard] Disable console on Iris Rev5 (#14249)

commit 92106ee0388813399df01b07cf47a4f1e89ecf2d
Author: James Young <[email protected]>
Date:   Tue Aug 31 18:29:49 2021 +0000

    emi20: remove dead space from Configurator layout (#14254)

commit b6d7b13a7a0f7a03bd44355766d35ab3fcb76feb
Author: Felix Jen <[email protected]>
Date:   Tue Aug 31 11:24:41 2021 -0700

    [Keyboard] Add FJLabs KF87 PCB (#14179)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 6f5428687c37d45cf279d9d3f44de1098a767723
Author: Ibnu Daru Aji <[email protected]>
Date:   Wed Sep 1 01:23:02 2021 +0700

    [Keymap] reflects current rick's keymap (#14169)

commit bdd0a6c09789e3e4380f4351f1f83004542d309f
Author: Salicylic-acid3 <[email protected]>
Date:   Tue Aug 31 14:19:21 2021 +0900

    [Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225)

    Co-authored-by: Joel Challis <[email protected]>

commit f2c9e82e5b3887ed28c3a5c68d27c4efaca54201
Author: Joel Challis <[email protected]>
Date:   Tue Aug 31 00:25:41 2021 +0100

    cherry pick tidy up (#14244)

commit 1e7117317fd8a51f9ca6e926777694b930c9502b
Author: coliss86 <[email protected]>
Date:   Tue Aug 31 01:13:19 2021 +0200

    Documentation: Fix links in key overrides (#14228)

    Co-authored-by: Joel Challis <[email protected]>

commit 5ed8edae498178c8a3c958d36b5e19150ef2caf2
Author: JX <[email protected]>
Date:   Tue Aug 31 03:34:19 2021 +0800

    Update ws2812_spi.c (#14237)

commit 2dc07391bd61e266ac2410ba7c0413c19eea5db5
Author: Danny <[email protected]>
Date:   Mon Aug 30 14:49:46 2021 -0400

    [Keyboard] Add Iris Rev. 5 (#13934)

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

commit 27aebba1b1eadedf2ce25efc081aef3bdbbaab7a
Author: dogspace <[email protected]>
Date:   Mon Aug 30 14:42:04 2021 -0400

    [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)

    Co-authored-by: Ryan <[email protected]>

commit c9283f4c1f073da0072638e78b3d5bf5619a89f4
Author: kb-elmo <[email protected]>
Date:   Mon Aug 30 20:29:15 2021 +0200

    [Keyboard] Add OwLab Jelly Epoch (#14190)

    Co-authored-by: Ryan <[email protected]>

commit b63114ea2963b2c6391176329e8ef6381b16aea2
Author: Rifaa Subekti <[email protected]>
Date:   Tue Aug 31 02:28:54 2021 +0800

    [Keyboard] add slamz keyboard (#14188)

    Co-authored-by: Ryan <[email protected]>

commit 9583f9f589ec4ecaafd3c8f9c709ce981dc684af
Author: Purdea Andrei <[email protected]>
Date:   Mon Aug 30 21:22:53 2021 +0300

    [Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178)

    Without this build would fail, if a keyboard had haptic feedback enabled,
    TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was
    defined in config.h.

commit 949cfd4632066eb6f5574bc360b35a73afbc616f
Author: Felix Jen <[email protected]>
Date:   Mon Aug 30 11:05:13 2021 -0700

    [Keyboard] add maker keyboards alexa (#14165)

commit 557fce7a8e7606355f4b058ff597d70d1a3e32c7
Author: peott-fr <[email protected]>
Date:   Mon Aug 30 11:04:42 2021 -0700

    [Keymap] Add peott-fr keymap for Kbd6x (#14164)

commit 9d32cb68c31c752964ea9fceee8492e4a5e7bd56
Author: Vincent Vorholter <[email protected]>
Date:   Mon Aug 30 20:03:53 2021 +0200

    [Keyboard] Changed ProductID on basketweav keyboards (#14162)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Vince Vorholter <[email protected]>

commit baa423004a870b5cb86f4d1197dcda5f8b390f49
Author: Zach White <[email protected]>
Date:   Sun Aug 29 16:46:36 2021 -0700

    ensure that the directory for sys.executable is in the user's path (#14229)

commit b705020dafd0aa7531d03cd8fa64260684a3fb79
Author: Zach White <[email protected]>
Date:   Sun Aug 29 16:41:56 2021 -0700

    move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)

commit 13a2da973f182f238d1e27bd9da6f98173dad026
Author: peott-fr <[email protected]>
Date:   Sun Aug 29 14:52:49 2021 -0700

    Nyquist (#14202)

    * adding my Nyquist keymap

    * Updating Nyquist keymap with licensing.

    * Cleaning-up and improving Nyquist keymap.

    * Cleaning-up and improving Nyquist keymap.

commit a1866a962c21a6e15f40cbde2bd09c0ff42f1454
Author: Sergey Vlasov <[email protected]>
Date:   Mon Aug 30 00:24:43 2021 +0300

    Update the nix-shell environment (#13316)

    * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`

    The `$PATH` modifications performed by the Nix wrapper for the `qmk`
    executable prevent `bin/qmk` from working properly (the changed `$PATH`
    contains a wrong `python3` executable which does not have the needed
    Python modules in its module path).  As a workaround, disable the
    generation of that wrapper for the `qmk` Python package (there is yet
    another wrapper generated while building the Python environment, which
    would still set the Python module path properly when running `qmk`).

    Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
    some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
    these invocations working is useful.

    * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`

    Update the Python dependency information used by Poetry to match the
    current state of the qmk_firmware code.

    * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps

    Update Python dependencies for nix-shell to the most recent releases:

     - dotty-dict: 1.3.0 -> no longer used
     - milc: 1.4.2 -> 1.6.2
     - pep8-naming: 0.11.1 -> 0.12.1
     - pygments: 2.9.0 -> 2.10.0
     - pyrsistent: 0.17.3 -> 0.18.0
     - pyusb: 1.1.1 -> 1.2.1
     - setuptools-scm: 6.0.1 -> no longer used
     - qmk: 0.1.0 -> 1.0.0
     - qmk-dotty-dict: not used -> 1.3.0.post1
     - yapf: 0.30.0 -> 0.31.0

    Note to self: The command to update Python dependencies changed to:

        ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )

commit ef7fdee6c803bf92bd6d892326c05ee1f473ad07
Author: J.Flanagan <[email protected]>
Date:   Sun Aug 29 14:18:56 2021 -0500

    [Keyboard] Add Viktus SP Mini (#14069)

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

commit f87cd8e8a02bf89d05737a19fd54e8ec6f63f90f
Author: Trent Hoh <[email protected]>
Date:   Sun Aug 29 19:09:43 2021 +0800

    [Keyboard] Corrected layout for np24 by YMDK (#14096)

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

commit 94d7635a4a8e335c743b4e77f8dd340665d43437
Author: peott-fr <[email protected]>
Date:   Sun Aug 29 04:08:23 2021 -0700

    [Keymap] My Prime E keymap (#14117)

commit 5d5668c3f8d77bebd841b838256f131de6ced497
Author: Weirdo <[email protected]>
Date:   Sun Aug 29 19:07:54 2021 +0800

    [Keyboard] Add kelownaRGB64 (#14141)

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

commit 9afc64cd61da5e3e1d2fd72a83602709a6e4e4b8
Author: Takeshi ISHII <[email protected]>
Date:   Sun Aug 29 15:06:00 2021 +0900

    [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)

commit dd8922d48269a0664e840d6b6a537b8b91c1826b
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 10:51:53 2021 +1000

    Fixup upstream paths for submodules. (#14205)

commit 6caebb7b619d85efc6932111f58b4a5e6d8e18eb
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 09:47:48 2021 +1000

    Bootmagic lite docs clarity. (#14204)

commit f061ca497464fe85284906fb163a33eaee7a91ef
Merge: ff65185dec 4bad375d7c
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 08:20:25 2021 +1000

    Breaking changes develop merge to master, 2021Q3 edition. (#14196)

commit 4bad375d7c09d949a9dcdd4feba147c9c7a67ec6
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 29 08:18:18 2021 +1000

    2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)

    * Initial changelog.

    * Data driven.

    * Submodule update.

    * Updated breaking changes docs.

    * Aliases.

    * Aliases.

commit 29ec2d8f4283212cf45c926c288f652a6727acb7
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 26 13:41:33 2021 -0700

    [Docs] Add examples to RGB Matrix Indicators docs (#12797)

commit 7e1634e2a6abac5fbdf7778ea7734a10b84ca49a
Merge: a13b0d8a6c ff65185dec
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 17:50:09 2021 +0000

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

commit ff65185dec6f97be1eb49f17cea526a0d0bbf3d6
Author: jackytrabbit <[email protected]>
Date:   Fri Aug 27 01:49:36 2021 +0800

    Add support for lazydesigners/cassette8 (#14145)

    * Add support for lazydesigners/cassette8

    Add support for lazydesigners/cassette8

    * Update keyboards/lazydesigners/cassette8/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/lazydesigners/cassette8/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/lazydesigners/cassette8/info.json

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Joel Challis <[email protected]>

commit a13b0d8a6cdfbb0c7873144e464c4ae13fa30854
Merge: 87cdb1cf9a 3fce5e6912
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 17:47:28 2021 +0000

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

commit 3fce5e6912d78ec9fff4124b6952e3b8a0d4d3ae
Author: jpuerto96 <[email protected]>
Date:   Thu Aug 26 13:45:48 2021 -0400

    New Keyboard - V4n4g0rth0n (#14152)

    * General: Initial commit for v4n4g0rth0n

    * Remove unecessary things|

    * General: Fix info.json

    * Finalize changes

    * Update keyboards/v4n4g0rth0n/config.h

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/v4n4g0rth0n/v1/rules.mk

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 87cdb1cf9a89a702f0c4286d4260fc84b18ae042
Author: Joel Challis <[email protected]>
Date:   Thu Aug 26 16:53:24 2021 +0100

    Update readme files (#14172)

commit 48d0ad28e789abae0413002f9dbda38f1a82924a
Author: Joel Challis <[email protected]>
Date:   Thu Aug 26 14:14:48 2021 +0100

    Move to correct location (#14171)

commit 6d646880a4d170409d784dab8be79ff3571d62ae
Merge: 2bc978437e edf35615cf
Author: QMK Bot <[email protected]>
Date:   Thu Aug 26 11:38:28 2021 +0000

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

commit edf35615cf4052e94024101e1f4ccb3ed838ce47
Author: kb-elmo <[email protected]>
Date:   Thu Aug 26 13:37:55 2021 +0200

    Skeletn87 - Fix RGB pin (#14170)

    * add Skeletn87

    * update skeletn87 files

    * update skeletn87 soldered

    * update readme image

    * update readme (again)

    * fix skeletn87 indicator LEDs

    * fix led pin for production PCB

commit 2bc978437e98ca24dd6186a2d637272738cd54de
Merge: 0c97bc5179 ee3a1133f1
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 23:56:39 2021 +0000

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

commit ee3a1133f1283fab132f4d601e19a61da2041631
Author: Charles <[email protected]>
Date:   Thu Aug 26 01:56:09 2021 +0200

    [keyboard] Add 0x3E (#14088)

    * Add 0x3E - default config

    * Apply suggestions from code review

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Apply suggestions from code review 2

    Firmware size optimization

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Rename files as per project guidelines + remove empty

    * Update link in readme.md

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 0c97bc5179ede0911067ecb0d96745d29710df07
Merge: 329c130202 4c5334cb9e
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 23:40:04 2021 +0000

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

commit 4c5334cb9e0fef692ed3bd7a3e02579271f0f338
Author: 8bits4ever <[email protected]>
Date:   Thu Aug 26 01:39:34 2021 +0200

    [converter/a1200] Changing layout macro reference info.json (#14143)

    * Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h

    * Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk

    * Create dummy

    * Add files via upload

    * Delete dummy

    * Update readme.md

    * Update info.json

commit 329c130202229c50f83af4272eb8dc1c0beb30ed
Merge: 527b1e52aa 89f2b9486f
Author: QMK Bot <[email protected]>
Date:   Wed Aug 25 19:04:06 2021 +0000

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

commit 89f2b9486fe28685a5e53f6ef20d140ccba4aab7
Author: MechMaster48 <[email protected]>
Date:   Wed Aug 25 12:03:27 2021 -0700

    [Keymap] mechmaster48 keymap  for OLKB Preonic rev3 (#14137)

commit 527b1e52aa0c87d49b90ea18d7d3ca9728aaa9c2
Author: Joel Challis <[email protected]>
Date:   Wed Aug 25 15:27:48 2021 +0100

    Move nix folder alongside vagrant (#14132)

commit a84de5e22be25e2059dfee732f5cca3ec0953a35
Author: Joel Challis <[email protected]>
Date:   Wed Aug 25 01:16:59 2021 +0100

    Revert 14083 && 14144 (#14150)

    * Revert "Short term bodge for firmware size bloat (#14144)"

    This reverts commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0.

    * Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)"

    This reverts commit c4dbf4bf0118dd785802861beb247433b5b7411d.

commit 3855713ca0a9513c51fe70e61032d7ea89fa7e87
Merge: 622c3cac3a bb1b822247
Author: QMK Bot <[email protected]>
Date:   Tue Aug 24 22:10:04 2021 +0000

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

commit bb1b82224772fcff8518b301f12c46fd132b04fd
Author: Albert Y <[email protected]>
Date:   Wed Aug 25 06:09:26 2021 +0800

    [Keyboard] Update Technik ortholinear RGB matrix points (#14124)

    Co-authored-by: filterpaper <filterpaper@localhost>

commit 622c3cac3ab8bc25d3cfec63702e295e0b16a49a
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 17:18:25 2021 +0100

    Fix merge artifacts (#14146)

commit 2cade3a48300e0709f8aec68602faf90947b6738
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 17:07:11 2021 +0100

    Align some quantum sub-directories (#14134)

    * Misc folder tidy

    * Review comments

    * Remove redundant entry

commit 2827a3cf754c2eaca37a0d44a5901741f1855414
Merge: a8d6547346 b4867e1600
Author: QMK Bot <[email protected]>
Date:   Tue Aug 24 15:44:36 2021 +0000

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

commit b4867e1600baa615ec9b28421fc23d4b85bad8ec
Author: Yoichiro Tanaka <[email protected]>
Date:   Wed Aug 25 00:44:00 2021 +0900

    [Keyboard] Add yoichiro/lunakey_macro (#13849)

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

commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 16:09:23 2021 +0100

    Short term bodge for firmware size bloat (#14144)

commit e3b68ddfe890868ac732f28ddcc1f111c69a0bfb
Merge: c9c60d227e 097e85e930
Author: Drashna Jael're <[email protected]>
Date:   Tue Aug 24 07:32:31 2021 -0700

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

commit c9c60d227e38abdf08ca86bcdad3a0cac2579e3f
Author: Takeshi ISHII <[email protected]>
Date:   Tue Aug 24 22:34:24 2021 +0900

    add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)

commit c4dbf4bf0118dd785802861beb247433b5b7411d
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 14:28:37 2021 +0100

    Tidy up quantum.c now some of tmk_core has been merged (#14083)

commit 097e85e930ae7e7f8ffd67717ed944a38111de6c
Author: GG <[email protected]>
Date:   Tue Aug 24 12:50:56 2021 +0300

    [Keyboard] Add serneity65 (#13889)

commit c4a2dc9a2d1b0c053272aec7672ab8df92550e88
Author: Xelus22 <[email protected]>
Date:   Tue Aug 24 19:39:24 2021 +1000

    fix (#14142)

commit 3ef978cb132e89f3dc55edc47c2c0c0f330cbd0d
Author: Christian Sandven <[email protected]>
Date:   Tue Aug 24 10:54:17 2021 +0200

    [Keyboard] Fix keyprez qmk configurator (#14119)

commit a4aa6ccf7b98a203c16be51e8db4970a80f0abfd
Author: kb-elmo <[email protected]>
Date:   Tue Aug 24 10:49:50 2021 +0200

    [Keyboard] Add QEZ keyboard (#14131)

commit b8c74d6b5d2e31b59b4ec73c84b8b4212b4b0936
Author: Albert Y <[email protected]>
Date:   Tue Aug 24 16:49:13 2021 +0800

    [Keyboard] Update Technik staggered RGB matrix points (#14125)

    Co-authored-by: filterpaper <filterpaper@localhost>

commit eaad654798d3b14b11cc99cafdf3a7db1c602c9d
Author: stickandgum <[email protected]>
Date:   Tue Aug 24 04:48:35 2021 -0400

    [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)

    Co-authored-by: James Young <[email protected]>

commit e1c264f5793b246baa1dd70b39e964dd821c475f
Author: Rifaa Subekti <[email protected]>
Date:   Tue Aug 24 16:42:23 2021 +0800

    [Keyboard] Update info.json for ocean/gin_v2 (#14121)

    Co-authored-by: Ryan <[email protected]>

commit bc239cd52022ea7ca26310faa9ed98e3faa81cb6
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 24 01:37:14 2021 -0700

    [Keymap] Drashna keymap fixups (#14140)

commit 3455e2408dd8e3f11854fd6660e2b40027bcd92e
Author: Drashna Jaelre <[email protected]>
Date:   Tue Aug 24 01:19:00 2021 -0700

    [Keyboard] Fix default keymap for quark squared keyboard (#14139)

commit 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0
Author: Xelus22 <[email protected]>
Date:   Tue Aug 24 16:28:26 2021 +1000

    [Core] Refactor OLED to allow easy addition of other types  (#13454)

    * add docs

    * core changes

    * update keyboards to new OLED

    * updated users to new OLED

    * update layouts to new OLED

    * fixup docs

    * drashna's suggestion

    * fix up docs

    * new keyboards with oled

    * core split changes

    * remaining keyboard files

    * Fix The Helix keyboards oled options

    * reflect develop

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: mtei <[email protected]>

commit 47a38c3f0ea0fe44c90040514889a69de9b53f2f
Author: Joel Challis <[email protected]>
Date:   Tue Aug 24 05:02:53 2021 +0100

    Remove more unused files (#14135)

commit 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb
Author: Drashna Jaelre <[email protected]>
Date:   Mon Aug 23 18:40:24 2021 -0700

    Fix Mouse Shared EP functionality (#14136)

    Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports).   This cause it to error out in compiling.  This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.

commit e3483b4126adca1730dbaf1d466a227e66c6df91
Author: lalalademaxiya1 <[email protected]>
Date:   Tue Aug 24 08:32:15 2021 +0800

    [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)

    * Add keyboard Q1

    * Update keyboards/keychron/q1/readme.md

    * Update keyboards/keychron/q1/rev_0100/rules.mk

    * Update keyboards/keychron/q1/readme.md

    * Change layer switch function to "default_layout_set"

    * Update keyboards/keychron/q1/rev_0100/info.json

    * Update keyboards/keychron/q1/q1.c

    * Mask out the DIP switch to fix sleeping issue when switch is ON

    * Added and changed readme.md

    Added keyboards\q1\rev_0100\readme.md
    Changed keyboards\q1\readme.md since different MCU may used in other version.

    * update

    * update keymap name

    * update keymap for keychron/q1/rev_0102

    * Update info.json

commit d57d9aec4f1e00601e6664ef6c4cb0e3e7826fe2
Author: Drashna Jaelre <[email protected]>
Date:   Mon Aug 23 15:46:06 2021 -0700

    Fix bootloadHID comments breaking :flash (#14133)

commit e756a21636149ad47c19c659d04be93cf3071dab
Author: Donald Kjer <[email protected]>
Date:   Mon Aug 23 15:15:34 2021 -0700

    eeprom_stm32: implement high density wear leveling (#12567)

    * eeprom_stm32: implement wear leveling
    Update EECONFIG_MAGIC_NUMBER
    eeprom_stm32: check emulated eeprom size is large enough
    * eeprom_stm32: Increasing simulated EEPROM density on stm32
    * Adding utility script to decode emulated eeprom
    * Adding unit tests
    * Applying qmk cformat changes
    * cleaned up flash mocking
    * Fix for stm32eeprom_parser.py checking via signature with wrong base
    * Fix for nk65 keyboard

    Co-authored-by: Ilya Zhuravlev <[email protected]>
    Co-authored-by: zvecr <[email protected]>

commit 2481e109a0f79b4cdcecab4a6bf6755fb5eda3fc
Merge: f314705921 9472c4b8cb
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 22:06:37 2021 +0000

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

commit 9472c4b8cb448f04e17810dd304e368c60fdd504
Author: Olli Helenius <[email protected]>
Date:   Tue Aug 24 01:06:04 2021 +0300

    Fix US_RDQU keycode (#13464)

    `US_RDQU` and `US_LDQU` were aliased to the same keycode. `US_RDQU`
    should use the right bracket.

commit f314705921c9c316e69cfb6767aba8f0570c7012
Author: Path Nirvana <[email protected]>
Date:   Tue Aug 24 05:05:10 2021 +0700

    adding uf2 flash support for blackpill 401 (#13968)

    * adding uf2 flash support for blackpill 401

    * forgot to add blackpill to keyboard header file

    * making changes requested by drashna

    * fixing tzarc s comments

    * removing the keyboard

    * undo the change to dactyl_manuform.h

commit 718f0a2482ab821df141a9985d1eb31a6fe6aed9
Merge: d8778eba92 a72b562141
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 14:26:24 2021 +0000

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

commit a72b5621418bebf253865ed19f92a860b5b9039a
Author: Rifaa Subekti <[email protected]>
Date:   Mon Aug 23 22:25:51 2021 +0800

    [Keyboard] update default and via keymap for ocean/wang_v2 (#14122)

commit d8778eba922f3415acb40dd178dd821b05bdb654
Author: Nick Brassel <[email protected]>
Date:   Mon Aug 23 19:37:16 2021 +1000

    Fixup line endings.

commit 71df135254709c183b980b89554216ec86d02eab
Author: stickandgum <[email protected]>
Date:   Sun Aug 22 22:19:11 2021 -0400

    [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)

    Co-authored-by: James Young <[email protected]>

commit 355872cc1d7c0eb5e5c66845188d53c7a434c8d2
Merge: 9af069ecf3 5cd7999bc4
Author: QMK Bot <[email protected]>
Date:   Mon Aug 23 02:10:58 2021 +0000

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

commit 5cd7999bc4b9e7c049bc80e0f812676528a07209
Author: Vino Rodrigues <[email protected]>
Date:   Mon Aug 23 12:10:23 2021 +1000

    [Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c (#14094)

    This patch corrects 2 issues with the LED matrix of the KDBFans KBD67 Lite (v3)
    * Incorrect mapping of the right-shift, down-arrow, and right-arrow.  (i.e. `NO_LED` positions of the `g_led_config` key matrix in the .c file do not match the `LAYOUT_65_ansi_blocker` matrix in the .h file.
    * Remapping of the *LED Index to Physical Position* using physical measurements from actual keyboard and accounting for the southpaw LED position to define the true centre of the keyboard (more relevant to circular animations).

commit 9af069ecf354b97b3456e856fbf8e22822efeb18
Author: Dasky <[email protected]>
Date:   Mon Aug 23 00:31:38 2021 +0100

    Fix typo (#14118)

commit f043b8be384cbfde6dcca0ffee2fc842a4fb4342
Merge: 4b87c1f40b aa28335651
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 21:43:07 2021 +0000

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

commit aa28335651a5a76d89054509186500c3af6147e7
Author: Bror Winther <[email protected]>
Date:   Sun Aug 22 23:42:34 2021 +0200

    Add fix for brew upgrade (#12921)

    Add a fix for `brew upgrade` so only formulae is upgraded and not casks

commit 4b87c1f40bd3c96132878c5cbb75ce2109e4b861
Merge: 7dfa93d9b6 5319727b70
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 16:29:18 2021 +0000

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

commit 5319727b7086f9e73e423054eed4886d8de2750b
Author: Ryan <[email protected]>
Date:   Mon Aug 23 02:28:48 2021 +1000

    Fix line endings for `quark_squared` info.json (#14113)

commit 7dfa93d9b6d01757f6583c77055f1ff59d04876e
Merge: 34d0376ab9 46fb874269
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 06:04:52 2021 +0000

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

commit 46fb8742692b546901555ffc544e954801ff5340
Author: npspears <[email protected]>
Date:   Sun Aug 22 01:04:20 2021 -0500

    [Keyboard] add support for Quark² (#14109)

    Quark² is a hotswap version of the Quark PCB

commit 34d0376ab9d73a77c50b78b01498710346ba6105
Merge: f709394442 9a51076859
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 05:12:24 2021 +0000

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

commit 9a51076859f00c28749bc8e1627e7f09263f3a88
Author: Christian Sandven <[email protected]>
Date:   Sun Aug 22 07:11:56 2021 +0200

    [Keyboard] Keyprez bison (#14100)

    Co-authored-by: Ryan <[email protected]>

commit f70939444262da043dfd4e092579528498d14db6
Merge: aedd8cca31 b1b6fe1c3d
Author: QMK Bot <[email protected]>
Date:   Sun Aug 22 05:11:44 2021 +0000

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

commit aedd8cca310ecb45221566edcca34a749117329e
Author: precondition <[email protected]>
Date:   Sun Aug 22 07:11:32 2021 +0200

    [Keyboard] Kyria default reformat (#14080)

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

commit b1b6fe1c3da1de17e56fc65499c61886cb0a298a
Author: Conor Burns <[email protected]>
Date:   Sun Aug 22 07:11:15 2021 +0200

    [Keymap] added bongocat keymap to 0xCB Static (#14093)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 78ccd9c201199444bc06161b05ee8d7ba9c31613
Author: peepeetee <[email protected]>
Date:   Sat Aug 21 22:53:49 2021 -0500

    Organize KPrepublic, K.T.E.C, xiudi boards into directories (#12159)

    * reset; redoing my steps; and recommit

    * include xd002/.noci

commit c70abc8d047319830e369ae4e14cd43bae3bd3b8
Author: Nick Brassel <[email protected]>
Date:   Sun Aug 22 13:49:33 2021 +1000

    Warn when building a board that uses arm_atsam (#10904)

    * Add deprecation warning during build when building a board that uses arm_atsam.

    * Rewording.

    * Wording.

    * Fixup.

commit dcef03853d612feb23b02523f1dfaf6576d18ace
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 19:08:05 2021 -0700

    [Keyboard] Disable Console on Keebio Quefrency (#14108)

commit f4a2f2bb7e0d745c6f126db15b94955eebc64884
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 18:34:16 2021 -0700

    [Keyboard] Fix compile issues for Tractyl Manuform (#14105)

commit e08d6a33fc1c119e4632bdaa37e75aebbd895dbd
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 18:34:04 2021 -0700

    [Core] Fix copypasta issue with pmw3360 sensor config (#14106)

commit 0ae20e74578ae4420af3e684f7ad9fcbd7beee94
Author: Joakim Tufvegren <[email protected]>
Date:   Sun Aug 22 02:51:17 2021 +0200

    Make solo half of split keyboards (more) usable. (#13523)

    * Make solo half of split keyboards (more) usable.

    Using only one half of a split keyboard (that's using the split_common
    framework to communicate) is not a great experience, since several read
    timeouts per scan cycle cause an unusably slow scan rate.

    This change blocks all split communication attempts for 500 ms
    (configurable) after an error occurs, causing the scan rate to become at
    least _more_ usable, but might need some tweaking to work fully on most
    keyboards. One read timeout still needs to occur after the 500 ms has
    passed, and if that timeout isn't low enough, some scan cycles may still
    be too slow.

    * Fix lint complaint.

    * Require 25 consecutive comm errors to see comms as disconnected.

    The number of max errors can be overridden by defining
    `SPLIT_MAX_CONNECTION_ERRORS`.

    * Add comments to new defines, and ability to disable disconnection check.

    Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
    by most relevant numbers for the description.

    * Make lint happy ...again

    * Only update `connection_check_timer` when needed.

    * Add new defines to split keyboard documentation.

    * Move connection timeout logic to transport.c, add `is_transport_connected`.

    * Use split_common disconnection logic in matrix.c.

    Instead of doing more or less the same thing twice.

    * Move disconnection logic to `transport_master`.

    Is a cleaner implementation, and causes the scan rate while disconnected
    to increase instead of decrease.

    * Lint fixes.

    * Lower default `SERIAL_USART_TIMEOUT` to 20 ms.

    The read timeout must be low enough to not cause exessively long scan
    cycles when using a solo split half. 10 ms was determined from testing
    to work fine even with the slowest defined baudrate of 19200 (5 ms was
    too low for that case), so 20 ms should be fine for most cases.

    * Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h

    Was somewhat mistakenly included in an earlier PR.

    * Fix building with `USE_I2C`.

    * Reduce built firmware size.

    Not really sure why this works, the idea was taken from tzarc's work on
    split disconnection.

    * Tweak and improve opt-out for split disconnection logic.

    There are now two ways to opt out from this feature:
    * Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
      the connection status checks (also affects the slave matrix reset logic in
      matrix.c, though).
    * Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
      communication throttling while disconnected. Will make the firmware
      smaller.

    * Make split disconnection logic work with custom transports.

    Includes a fallback implementation for keyboards using a custom
    split_util.c but not a custom matrix.c (currently no such keyboard seems
    to be merged, though).

    * Remove unnecessary include of timer.h

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>

commit c5f41d42d8e4dc88b2aeb414aa0d26ad23ad34f1
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 16:46:35 2021 -0700

    Updated RGB Matrix suspend define part 3 (#13954)

    * Updated RGB Matrix suspend define part 3

    * Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)"

    This reverts commit 80015f7fb023f27ad5307815fd5433694a3bcb4a.

    * Add additional boards/keymaps

commit 58a5030661b57f1dd05693053df2eddadc285f64
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 21 13:34:44 2021 -0700

    [Keymap] Drashna's Improve OLEDs and custom Split code (#14063)

    * Fill the oleds with right mods

    * Enable double mods on x32 oleds

    * Disable forced NKRO

    * Make oleds fancy only on good MCUs

    * Overhaul oled display

    * Further enhance oled, with kitty!

    * Final oled form

    * Not working transport

    * Transport id of woring

    * Add acceleration

    * fix button placement for accel macro

    * Fix accelartion location and behavior

    * Remove OLED sync code

    * Fix alignment issue

    * Remove audio hack

    * Fix up zima keymap

    * Add matrix slave scan function and cleanup drashna.h

    * Clean up user space

    * Allow userspace sync to be disable-able

    * Fix weird issue with audio

    * Fix alignment issue with user split sync

    * Disable second rgb matrix task

    * Disable additional animations

    * Change dynamic keymap settings

    * Hacky fix for borked corne

    * Add Blackpill (F411) support to tractyl manuform

    * remove manual via eeprom reset

    * Remove all references to rgblight twinkle

    * Fix issues with config processing

commit da1c011afc67dab0049b30a4c021dc38a36cb9aa
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:14:23 2021 -0700

    Improve pmw3360 sensor and make it more hardware agnostic (#14097)

commit 3452c89c8b5e652ff957123151ca0bbdfcbf3927
Merge: a80d789147 c1cad5b751
Author: QMK Bot <[email protected]>
Date:   Sat Aug 21 04:13:34 2021 +0000

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

commit c1cad5b7516af745cc0a3ffde8c0cc9af63e5a1d
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:13:02 2021 -0700

    [Keyboard] Fix naiping/npminila layout macro (#14098)

commit a80d7891472335ec297082daecc6fbf90042c38c
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 21:02:53 2021 -0700

    Fix issues with VIA EEPROM init and bring in line with eeconfig functionality (#13243)

    Co-authored-by: Ryan <[email protected]>

commit afd3bcbf45a9b7de097d7666ced2c674192949e5
Author: Nick Brassel <[email protected]>
Date:   Sat Aug 21 13:38:38 2021 +1000

    Fix up compilation issues. (#14095)

commit ce379ef458fd9092543fb4022aab6e455865f514
Merge: a7d48b063e c71d67ba3f
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 22:32:01 2021 +0000

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

commit c71d67ba3f4bdedbd5ec1e931e6ea9568fcd0d98
Author: Spaceman <[email protected]>
Date:   Fri Aug 20 18:31:26 2021 -0400

    [Core] [Docs] Remove travis-ci references (#13916)

commit a7d48b063ec9d551396eadeb02a924d2ee3ea515
Author: Ryan <[email protected]>
Date:   Sat Aug 21 03:43:49 2021 +1000

    Fix LED Matrix suspend code (#14090)

commit e8943a8b0c9d7ff4f078fe1f76f2c62c269767c5
Merge: 1ec6ce8c37 30bb807c13
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 17:33:25 2021 +0000

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

commit 30bb807c13a5787164bd63fa17a97c0870a60198
Author: Weirdo <[email protected]>
Date:   Sat Aug 21 01:32:53 2021 +0800

    [Keyboard] Add Naiping series keyboard (#14040)

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

commit 1ec6ce8c370d53292979718cc406b66c4c5616a8
Merge: 92fa07336c c1add5d0e2
Author: Zach White <[email protected]>
Date:   Fri Aug 20 08:22:41 2021 -0700

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

    Resolved Conflicts:
    	lib/python/qmk/info.py

commit c1add5d0e278da55128964dc305b833fb0bbc063
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 16:16:59 2021 +0100

    Restore layout count validation (#14068)

commit 92fa07336cd7fcd578c31a8069cf955a4d601327
Author: Drashna Jaelre <[email protected]>
Date:   Fri Aug 20 06:14:42 2021 -0700

    [Bug] Fix RGB/LED Matrix Suspend code (#14084)

commit da11a49905605871eea66f8f03b2c4b46d1de88a
Merge: 69c71d4843 90ff4fe749
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 13:14:35 2021 +0000

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

commit 90ff4fe749346c3b92aa8ca6461f5091fabfa99e
Author: tiltowait <[email protected]>
Date:   Fri Aug 20 06:13:59 2021 -0700

    [Keyboard] Add IBM Model M SSK configuration (#14050)

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

commit 69c71d4843586fad9c29c4dd945aa170f9990d8e
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 10:15:11 2021 +0100

    Align DIP_SWITCH_PINS_RIGHT implementation with encoders (#14079)

commit b229b0fba72d79f1c723f2415531e61537b56fc3
Author: Joel Challis <[email protected]>
Date:   Fri Aug 20 10:11:49 2021 +0100

    Fix issues with recent keymap.json changes (#14089)

    * Fix issues with recent keymap.json changes

    * Allow empty author string

commit 0741aae1d9e53206d5930fcb962948f13f48e661
Merge: 8dfd33e3d1 fd54992e1f
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:36:09 2021 +0000

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

commit fd54992e1f65713a93115a0a1737e97d3e2d8522
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:35:29 2021 -0700

    [Keyboard] Fix Feels65 Via keymap (#14086)

commit 8dfd33e3d1d62b410e4f94b3eb5a1caf5ef5dcf6
Merge: c6f24f66bd 37b5ead17d
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:27:09 2021 +0000

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

commit 37b5ead17d55d893d8639acd402cb4907ff4cc2c
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:26:37 2021 -0700

    [Keyboard] Fix space_space rev1 keyboard files (#14087)

commit c6f24f66bd60e67fb9eca689bb46aa23a10a0e5a
Merge: 0a1bf7f6aa cc0ae9cc4c
Author: QMK Bot <[email protected]>
Date:   Fri Aug 20 04:22:05 2021 +0000

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

commit cc0ae9cc4ceaf3bdd5d33e1d410b319db617c4eb
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 19 21:21:00 2021 -0700

    Revert "[Keyboard] Dumbpad VIA support added (#13512)"

commit 0a1bf7f6aa6e44557041e03f6e58df5a180c6d79
Author: Simon Arlott <[email protected]>
Date:   Fri Aug 20 00:31:23 2021 +0100

    Support using a timer for wait_us() on ChibiOS-based boards (#12211)

    * Support using a timer for wait_us() on ChibiOS-based boards (#12198)

    There are spare GPT timers that can be used to get a more accurate
    wait_ms() time. This is required for the matrix scan unselect delay (30µs)
    to be shorter than the system tick rate of 100µs.

    This is limited to the maximum GPT duration of 65535 so values above that
    will automatically use the previous implementation based on the system
    tick.

    Using a specific timer means it can't be shared by another thread at the
    same time so when wait_us() is called from anything other than the main
    thread it will use the system tick implementation too.

    * Update tmk_core/common/chibios/wait.c

    * Update tmk_core/common/chibios/wait.c

    Co-authored-by: Joel Challis <[email protected]>

commit 462e7f075a14175be08f32561d5ba783e725ab7c
Author: moyi4681 <[email protected]>
Date:   Fri Aug 20 03:02:07 2021 +0800

    move volcano660 to ilumkb folder (#13550)

    * move volcano660 to ilumkb folder

    * Update rules.mk

    * Fix up readme

    Co-authored-by: zvecr <[email protected]>

commit 34137666498f367c677b751abab97100f30d1d36
Merge: 7f1c90b7a8 b724a0dfd5
Author: QMK Bot <[email protected]>
Date:   Thu Aug 19 18:59:06 2021 +0000

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

commit b724a0dfd5782f81d52fa006466e607d7ba04c5e
Author: SneakboxKB <[email protected]>
Date:   Thu Aug 19 13:58:35 2021 -0500

    [Keyboard] Ava initial commit (#13845)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: SneakboxKB <[email protected]>

commit 7f1c90b7a8d66b806f87229fb96e5c69ee9fb1a4
Author: Dasky <[email protected]>
Date:   Thu Aug 19 19:58:17 2021 +0100

    [Core] Speed up pimoroni trackball driver (#13823)

commit e988f58374a138a1af79a141dc8eda54c8782907
Merge: 4279b14adf a12f3a3fb8
Author: QMK Bot <[email protected]>
Date:   Thu Aug 19 18:45:19 2021 +0000

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

commit a12f3a3fb87374d1c68417b2f58a22bad687f12c
Author: minibois <[email protected]>
Date:   Thu Aug 19 20:44:47 2021 +0200

    [Keyboard] Minor fixes for mini_elixivy/info.json (#14022)

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 4279b14adffe081a3dfb17fa0f04ed21513e5eda
Merge: 9d1c98c891 f4f679779e
Author: James Young <[email protected]>
Date:   Thu Aug 19 11:32:23 2021 -0700

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

    Conflicts:
    	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
    	keyboards/space_space/rules.mk

commit f4f679779e1404d9dc34c64823b9eb993bfa7ab3
Author: GG <[email protected]>
Date:   Thu Aug 19 21:17:54 2021 +0300

    [Keyboard] Add Mammoth20x (#14014)

commit c59212821918736504074da24f33108551e8bdde
Author: Yaroslav Smirnov <[email protected]>
Date:   Thu Aug 19 21:15:30 2021 +0300

    [Keyboard] Add Elrgo S to keyboards/handwired (#13893)

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

commit 1bfbaae533fd4716407a5f381df1a3b317963a92
Author: weteor <[email protected]>
Date:   Thu Aug 19 20:13:00 2021 +0200

    [Keyboard] add 3w6 (#13746)

commit 8200804e96d1914ebad1948b52d6e1cec2e3ffcc
Author: kb-elmo <[email protected]>
Date:   Thu Aug 19 20:12:34 2021 +0200

    [Keyboard] Add Voice65 (#13744)

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

commit c039796d9d6d341f16600b7032df056c0959df06
Author: James Young <[email protected]>
Date:   Thu Aug 19 17:47:10 2021 +0000

    keebzdotnet F-Me Configurator fixes and codebase touch-up (#14077)

    * rename LAYOUT to LAYOUT_all

    * add info.json

    * override DYNAMIC_KEYMAP_LAYER_COUNT for via keymap

    The via keymap only initialized two layers without overriding the default value of DYNAMIC_KEYMAP_LAYER_COUNT (4).

    This commit sets DYNAMIC_KEYMAP_LAYER_COUNT for the via keymap to 2.

commit 9aedf515c094b0c2d77417d…
@jrfhoutx jrfhoutx mentioned this pull request Nov 29, 2021
Merged
14 tasks
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@jrfhoutx @fauxpark
@drashna @nhongooi
[Keyboard] Add Viktus SP Mini (qmk#14069)
3213d6f 
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jrfhoutx @drashna @fauxpark