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

[Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver #19652

Merged
merged 2 commits into from
Jan 23, 2023
Merged

[Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver #19652

merged 2 commits into from
Jan 23, 2023

Conversation

KarlK90
Copy link
Member

@KarlK90 KarlK90 commented Jan 21, 2023 •
edited
Loading

Description

The current implementation could be deadlocked if the last update was more then ~35min ago. This is due to the time resolution for the RP2040 on ChibiOS being 32bit and the counter running at 1MHz and timer_expired32() only handling timer intervals up to (UINT32_MAX / 2). This can easily happen if the keyboard is put to sleep or the RGB being disabled for this time.

The solution is to use the full 64bit time resolution of the RP2040 which wraps after ~584942 years - let me know if you happen to witness this. Unfortunately we have fallback to the pico-sdk implementation as there is no 64bit timer resolution support in the ChibiOS implementation of the RP2040.

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).

@KarlK90
rp2040: fix timer wrap deadlock in ws2812 vendor driver
4b89850 
The current implementation could be deadlocked if the last update was
more then ~35min ago. This is due to the time resolution for the RP2040
on ChibiOS being 32bit and the counter running at 1MHz and
timer_expired32() only handling timer intervals up to (UINT32_MAX / 2).
This can easily happen if the keyboard is put to sleep or the RGB being
disabled for this time.

The solution is to use the full 64bit time resolution of the RP2040
which wraps after ~584942 years - let me know if you happen to witness
this. Unfortunately we have fallback to the pico-sdk implementation as
there is no 64bit timer resolution support in the ChibiOS implementation
of the RP2040.
@github-actions github-actions bot added the core label Jan 21, 2023
@KarlK90 KarlK90 added bug and removed core labels Jan 21, 2023
@KarlK90 KarlK90 changed the title rp2040: fix timer wrap deadlock in ws2812 vendor driver [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver Jan 21, 2023
This was referenced Jan 21, 2023
Closed
Open
sigprof
sigprof requested changes Jan 21, 2023
View reviewed changes
Copy link
Contributor

@sigprof sigprof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One option here is using the pico_sdk API properly:

platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c Outdated Show resolved Hide resolved
platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c Outdated Show resolved Hide resolved
@sigprof
Copy link
Contributor

sigprof commented Jan 21, 2023

Another possible option is rewriting the code to use a ChibiOS virtual timer (which can be started from the DMA callback, then the semaphore signaling could be done from the timer callback). This does not require using more pico-sdk APIs, but the amount of changes would be more substantial.

@freznel10
Copy link

freznel10 commented Jan 21, 2023 •
edited
Loading

Tested this PR and this resolved my freezing problem

@github-actions github-actions bot added the core label Jan 22, 2023
@KarlK90 KarlK90 marked this pull request as ready for review January 22, 2023 10:50
@KarlK90
Copy link
Member Author

KarlK90 commented Jan 22, 2023

Another possible option is rewriting the code to use a ChibiOS virtual timer (which can be started from the DMA callback, then the semaphore signaling could be done from the timer callback).

That is certainly possible but I'm in favor of keeping the "simple" busy timeout at this point and enabling/contributing 64bit time resolution in ChibiOS for the rp2040 to get rid of the pico-sdk dependency.

@KarlK90 KarlK90 requested review from sigprof and a team January 22, 2023 10:58
@MatteoDM
Copy link

MatteoDM commented Jan 22, 2023 •
edited
Loading

I also tested it , and this solve my issue with the freeze with rgblight or matrix enabled in builds with rp2040
(reported the issue several times as neodimio91 in qmk discord)

@drashna drashna requested a review from a team January 23, 2023 08:59
@KarlK90 KarlK90 merged commit 8ca3f0f into qmk:develop Jan 23, 2023
@KarlK90 KarlK90 deleted the fix/rp2040-ws2812-pio-timer-wrap-deadlock branch January 23, 2023 21:24
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 24, 2023
@freznel10
Squashed commit of the following:
6bdcb5c 
commit e7b6e11
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:04:54 2023 -0700

    doc cleanup

commit 1624f4c
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:01:57 2023 -0700

    doc cleanup

commit 9ac04e9
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:45:11 2023 -0700

    linting

commit ade01f0
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:25:50 2023 -0700

    fix issues

commit 3dcf006
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 16:39:58 2023 -0700

    add FASTCALC option and streamline a few things

commit 88c62ae
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:58:39 2022 -0700

    doc update

commit 7735757
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:51:37 2022 -0700

    linting

commit b4d6446
Author: Alabastard-64 <[email protected]>
Date:   Thu Dec 22 19:13:24 2022 -0700

    fixes and doc improvements

commit 0243dce
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 23:07:52 2022 -0700

    fix previous changes to precision mode now working as intended additional mode fixes

commit 02e35b8
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 20:29:11 2022 -0700

    doc update and precision changes

commit b6bd521
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:53:47 2022 -0700

    more doc updates/code cleanup

commit 47337bd
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:20:15 2022 -0700

    code and doc fixup

commit 2633968
Author: Alabastard-64 <[email protected]>
Date:   Mon Dec 12 23:10:19 2022 -0700

    update and linting

commit b028e01
Author: Alabastard-64 <[email protected]>
Date:   Sun Dec 11 21:08:08 2022 -0700

    post rebase/squash cleanup

commit 612ff48
Author: Alabastard-64 <[email protected]>
Date:   Tue Aug 30 01:23:41 2022 -0600

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670816485 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670813789 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670812067 -0700

    Squashed all previous Commits

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 24, 2023
@freznel10
Squashed commit of the following:
d448e9a 
commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 25, 2023
@freznel10
Squashed commit of the following:
d8e0254 
commit 81ca832
Author: Sergey Vlasov <[email protected]>
Date:   Wed Jan 25 04:47:55 2023 +0300

    analog.c: Fix `pinToMux()` for STM32F0xx (qmk#19658)

    The `adc_read()` code for STM32F0xx expects to get the 0-based channel
    number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
    attempting to pass the CHSELR bit mask in that field, which resulted in
    selecting a wrong channel, therefore `analogReadPin()` did not work
    properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
    number in that field (this matches the behavior for other supported
    chips and also allows selection of channels 16...18, which can be used
    to access the builtin temperature, reference voltage and VBAT sensors).

commit 0edf478
Merge: 019c321 fa132ba
Author: QMK Bot <[email protected]>
Date:   Wed Jan 25 00:20:11 2023 +0000

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

commit fa132ba
Author: Darkhan <[email protected]>
Date:   Wed Jan 25 00:19:32 2023 +0000

    Decrease LED animation frequency to improve performance (qmk#19677)

commit 019c321
Merge: 7ff55e6 8af8720
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 20:03:41 2023 +0000

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

commit 8af8720
Author: Christian Brauner <[email protected]>
Date:   Tue Jan 24 21:03:05 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19665)

commit 7ff55e6
Merge: d14863c 419a794
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 15:18:09 2023 +0000

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

commit 419a794
Author: arrowj <[email protected]>
Date:   Tue Jan 24 09:17:24 2023 -0600

    Update understanding_qmk.md (qmk#19664)

    Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.

commit d14863c
Merge: 8767e74 b24fa2f
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 14:20:10 2023 +0000

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

commit b24fa2f
Author: Natan-P <[email protected]>
Date:   Tue Jan 24 15:19:34 2023 +0100

    escaped stray backslash in bux.py (qmk#19667)

commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 25, 2023
@freznel10
Squashed commit of the following:
16ddced 
commit 5a2991b
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:16:17 2023 -0700

    linting

commit 4c686b6
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:13:49 2023 -0700

    fixup documentation

commit abf5a2b
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 07:42:33 2023 -0700

    fix bug with fastcalc and update doc

commit e7b6e11
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:04:54 2023 -0700

    doc cleanup

commit 1624f4c
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:01:57 2023 -0700

    doc cleanup

commit 9ac04e9
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:45:11 2023 -0700

    linting

commit ade01f0
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:25:50 2023 -0700

    fix issues

commit 3dcf006
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 16:39:58 2023 -0700

    add FASTCALC option and streamline a few things

commit 88c62ae
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:58:39 2022 -0700

    doc update

commit 7735757
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:51:37 2022 -0700

    linting

commit b4d6446
Author: Alabastard-64 <[email protected]>
Date:   Thu Dec 22 19:13:24 2022 -0700

    fixes and doc improvements

commit 0243dce
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 23:07:52 2022 -0700

    fix previous changes to precision mode now working as intended additional mode fixes

commit 02e35b8
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 20:29:11 2022 -0700

    doc update and precision changes

commit b6bd521
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:53:47 2022 -0700

    more doc updates/code cleanup

commit 47337bd
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:20:15 2022 -0700

    code and doc fixup

commit 2633968
Author: Alabastard-64 <[email protected]>
Date:   Mon Dec 12 23:10:19 2022 -0700

    update and linting

commit b028e01
Author: Alabastard-64 <[email protected]>
Date:   Sun Dec 11 21:08:08 2022 -0700

    post rebase/squash cleanup

commit 612ff48
Author: Alabastard-64 <[email protected]>
Date:   Tue Aug 30 01:23:41 2022 -0600

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670816485 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670813789 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670812067 -0700

    Squashed all previous Commits

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 30, 2023
@freznel10
Squashed commit of the following:
d6d31ec 
commit 81ca832
Author: Sergey Vlasov <[email protected]>
Date:   Wed Jan 25 04:47:55 2023 +0300

    analog.c: Fix `pinToMux()` for STM32F0xx (qmk#19658)

    The `adc_read()` code for STM32F0xx expects to get the 0-based channel
    number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
    attempting to pass the CHSELR bit mask in that field, which resulted in
    selecting a wrong channel, therefore `analogReadPin()` did not work
    properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
    number in that field (this matches the behavior for other supported
    chips and also allows selection of channels 16...18, which can be used
    to access the builtin temperature, reference voltage and VBAT sensors).

commit 0edf478
Merge: 019c321 fa132ba
Author: QMK Bot <[email protected]>
Date:   Wed Jan 25 00:20:11 2023 +0000

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

commit fa132ba
Author: Darkhan <[email protected]>
Date:   Wed Jan 25 00:19:32 2023 +0000

    Decrease LED animation frequency to improve performance (qmk#19677)

commit 019c321
Merge: 7ff55e6 8af8720
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 20:03:41 2023 +0000

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

commit 8af8720
Author: Christian Brauner <[email protected]>
Date:   Tue Jan 24 21:03:05 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19665)

commit 7ff55e6
Merge: d14863c 419a794
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 15:18:09 2023 +0000

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

commit 419a794
Author: arrowj <[email protected]>
Date:   Tue Jan 24 09:17:24 2023 -0600

    Update understanding_qmk.md (qmk#19664)

    Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.

commit d14863c
Merge: 8767e74 b24fa2f
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 14:20:10 2023 +0000

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

commit b24fa2f
Author: Natan-P <[email protected]>
Date:   Tue Jan 24 15:19:34 2023 +0100

    escaped stray backslash in bux.py (qmk#19667)

commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 30, 2023
@freznel10
Squashed commit of the following:
0966e0d 
commit 0804a5c00d6f8d4b8131ad020c64c17e41c2633d
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 14:56:37 2023 -0700

    optimizations and cleanup some function argument changes

commit 42bbfa78b9fa08ef3307b9b48a31719170ada3d7
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 11:45:04 2023 -0700

    update keycodes.h

commit 136928de249a8829d2b5b5e01d4b4473e0be661a
Author: Alabastard-64 <[email protected]>
Date:   Sun Jan 29 11:34:09 2023 -0700

    update keycodes hjson version

commit 1cf695e7344afe3907fded4ba375aec0b2d3110e
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:16:17 2023 -0700

    linting

commit fa1430468982acd943b4bd75bffff8859f242421
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 08:13:49 2023 -0700

    fixup documentation

commit 2b1d787cc8b4d4c3793545816703827d6bc99cc0
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 24 07:42:33 2023 -0700

    fix bug with fastcalc and update doc

commit 941df07ba3035ae808b243754c9534f5d81e19f3
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:04:54 2023 -0700

    doc cleanup

commit 77889c64a8b23d36ac4809ae945ac9273640884d
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 23:01:57 2023 -0700

    doc cleanup

commit 531706ad04e49e701d7e2ba289430943bc43a7eb
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:45:11 2023 -0700

    linting

commit 7eda19b499c1ffe75d9316d592390e55465fb3e8
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 22:25:50 2023 -0700

    fix issues

commit f7bb9f1ef91510e92420c025b66dacd7eb0b38ae
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 23 16:39:58 2023 -0700

    add FASTCALC option and streamline a few things

commit f4f6f1455d5ce51060299280f786d4744e420b9d
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:58:39 2022 -0700

    doc update

commit dd5917ae16dd66774fcd03b67cb87fb61743276d
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:51:37 2022 -0700

    linting

commit f2099df8287bc714ee48e8fb71b169e3e03e8a9e
Author: Alabastard-64 <[email protected]>
Date:   Thu Dec 22 19:13:24 2022 -0700

    fixes and doc improvements

commit e0a3b4cc18d8873246d6e95ad442a85c320205e9
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 23:07:52 2022 -0700

    fix previous changes to precision mode now working as intended additional mode fixes

commit b929e9f083d48fb4c43574ab8d601b3a782b5196
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 20:29:11 2022 -0700

    doc update and precision changes

commit 9b28bfa5f5d57768376c12e0548d15c4f027f5c1
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:53:47 2022 -0700

    more doc updates/code cleanup

commit 99fd1eab922a2b3e17c4240f516fe5a15e9f298f
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:20:15 2022 -0700

    code and doc fixup

commit dbe83eae871f23a9cdfef57d3f3cd3044dd14a80
Author: Alabastard-64 <[email protected]>
Date:   Mon Dec 12 23:10:19 2022 -0700

    update and linting

commit d9df7c6dddd6ec5d622cd64ae6102216c4fbfe98
Author: Alabastard-64 <[email protected]>
Date:   Sun Dec 11 21:08:08 2022 -0700

    post rebase/squash cleanup

commit 1e0206067899205fb03a28a4cb90a63cc17b6831
Author: Alabastard-64 <[email protected]>
Date:   Tue Aug 30 01:23:41 2022 -0600

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670816485 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670813789 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670812067 -0700

    Squashed all previous Commits

commit 043d8e1
Author: Ryan <[email protected]>
Date:   Mon Jan 30 03:44:16 2023 +1100

    Remove deprecated Quantum keycodes (qmk#19712)

commit 80cc6ad
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:16:59 2023 +0000

    Fix 19701 merge

commit 8cc2e0e
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:07:51 2023 +0000

    Fix quantum ring_buffer for ChibiOS (qmk#19683)

commit 832479c
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 20:40:47 2023 +0000

    Split out mcu_selection to platform (qmk#19701)

commit b727434
Author: Ryan <[email protected]>
Date:   Sun Jan 29 02:42:44 2023 +1100

    Remove commented out backlight config & stray "backlight levels" (qmk#19703)

commit f1b5659
Author: wangfuco <[email protected]>
Date:   Thu Jan 26 22:11:29 2023 -0800

    fix pegasushoof caps light, add via keymap (qmk#19649)

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

commit ad817a7
Merge: 81ca832 3823046
Author: QMK Bot <[email protected]>
Date:   Thu Jan 26 16:35:07 2023 +0000

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

commit 3823046
Author: schwarzer-geiger <[email protected]>
Date:   Thu Jan 26 11:34:27 2023 -0500

    new keyboard: edinburgh41 (qmk#19569)

    * added edinburgh41

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

commit 81ca832
Author: Sergey Vlasov <[email protected]>
Date:   Wed Jan 25 04:47:55 2023 +0300

    analog.c: Fix `pinToMux()` for STM32F0xx (qmk#19658)

    The `adc_read()` code for STM32F0xx expects to get the 0-based channel
    number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
    attempting to pass the CHSELR bit mask in that field, which resulted in
    selecting a wrong channel, therefore `analogReadPin()` did not work
    properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
    number in that field (this matches the behavior for other supported
    chips and also allows selection of channels 16...18, which can be used
    to access the builtin temperature, reference voltage and VBAT sensors).

commit 0edf478
Merge: 019c321 fa132ba
Author: QMK Bot <[email protected]>
Date:   Wed Jan 25 00:20:11 2023 +0000

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

commit fa132ba
Author: Darkhan <[email protected]>
Date:   Wed Jan 25 00:19:32 2023 +0000

    Decrease LED animation frequency to improve performance (qmk#19677)

commit 019c321
Merge: 7ff55e6 8af8720
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 20:03:41 2023 +0000

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

commit 8af8720
Author: Christian Brauner <[email protected]>
Date:   Tue Jan 24 21:03:05 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19665)

commit 7ff55e6
Merge: d14863c 419a794
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 15:18:09 2023 +0000

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

commit 419a794
Author: arrowj <[email protected]>
Date:   Tue Jan 24 09:17:24 2023 -0600

    Update understanding_qmk.md (qmk#19664)

    Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.

commit d14863c
Merge: 8767e74 b24fa2f
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 14:20:10 2023 +0000

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

commit b24fa2f
Author: Natan-P <[email protected]>
Date:   Tue Jan 24 15:19:34 2023 +0100

    escaped stray backslash in bux.py (qmk#19667)

commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 31, 2023
@freznel10
Squashed commit of the following:
71ae0cb 
commit 944b610
Author: Joel Challis <[email protected]>
Date:   Tue Jan 31 01:02:17 2023 +0000

    Fix midi after recent refactoring (qmk#19723)

commit b867522
Author: Ryan <[email protected]>
Date:   Tue Jan 31 07:45:41 2023 +1100

    Clean up Force NKRO in config.h (qmk#19718)

commit d84a735
Author: Joel Challis <[email protected]>
Date:   Mon Jan 30 20:40:12 2023 +0000

    Strip out more of config_common (qmk#19722)

commit f6dd8de
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 31 06:03:30 2023 +1100

    Remove usages of config_common.h from config.h files. (qmk#19714)

commit 2d84308
Author: Ryan <[email protected]>
Date:   Tue Jan 31 05:37:19 2023 +1100

    Normalise Swap Hands keycodes (qmk#19720)

commit cc9520b
Merge: ef6505a e296d67
Author: QMK Bot <[email protected]>
Date:   Mon Jan 30 08:48:34 2023 +0000

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

commit e296d67
Author: Nick Brassel <[email protected]>
Date:   Mon Jan 30 19:47:46 2023 +1100

    Accumulate version.h generator flags. (qmk#19716)

commit ef6505a
Merge: 242b80c 2c878b1
Author: fauxpark <[email protected]>
Date:   Mon Jan 30 18:55:36 2023 +1100

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

commit 242b80c
Author: Ryan <[email protected]>
Date:   Mon Jan 30 18:47:50 2023 +1100

    Move MIDI code out of tmk_core (qmk#19704)

commit 968cc1f
Author: Joel Challis <[email protected]>
Date:   Mon Jan 30 04:10:40 2023 +0000

    Relocate diode direction definitions (qmk#19715)

commit 2c878b1
Author: Ryan <[email protected]>
Date:   Mon Jan 30 14:37:02 2023 +1100

    Clean up `qmk generate-autocorrect-data` (qmk#19710)

commit 328279a
Author: Wolf Van Herreweghe <[email protected]>
Date:   Sun Jan 29 23:58:07 2023 +0100

    Add base firmware for the Frog Numpad (qmk#19698)

    Co-authored-by: Wolf Van Herreweghe <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: jack <[email protected]>

commit d322b4c
Author: yiancar <[email protected]>
Date:   Sun Jan 29 16:59:13 2023 +0000

    [Keyboard] Baion 808 (qmk#19690)

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

commit 043d8e1
Author: Ryan <[email protected]>
Date:   Mon Jan 30 03:44:16 2023 +1100

    Remove deprecated Quantum keycodes (qmk#19712)

commit 80cc6ad
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:16:59 2023 +0000

    Fix 19701 merge

commit 8cc2e0e
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:07:51 2023 +0000

    Fix quantum ring_buffer for ChibiOS (qmk#19683)

commit 832479c
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 20:40:47 2023 +0000

    Split out mcu_selection to platform (qmk#19701)

commit 981f3c3
Author: Albert Y <[email protected]>
Date:   Sun Jan 29 00:41:50 2023 +0800

    Additional handedness by EEPROM examples (qmk#19686)

    Co-authored-by: jack <[email protected]>
    Co-authored-by: Dasky <[email protected]>

commit b727434
Author: Ryan <[email protected]>
Date:   Sun Jan 29 02:42:44 2023 +1100

    Remove commented out backlight config & stray "backlight levels" (qmk#19703)

commit ce7bb63
Author: azhizhinov <[email protected]>
Date:   Sat Jan 28 01:52:05 2023 +0300

    VIA keymap for Reviung 34. (qmk#19694)

    VIA keymap for Reviung 34.

commit acea06b
Author: adophoxia <[email protected]>
Date:   Fri Jan 27 13:39:38 2023 -0800

    [Keyboard] Update effects for Keychron Q2 (qmk#19685)

commit 9aaf1c2
Author: Patrick Muldoon <[email protected]>
Date:   Fri Jan 27 08:35:26 2023 -0800

    Swap LED_PIN_ON_STATE to 0. (qmk#19692)

    User reported that CAPS lock Led state was inverted after soldering a LED to their board.

    LED_PIN_ON_STATE defaults to 1, so just swap to low.

    Flashed board and now CAPS LED reflects the actual state

commit b3dca4b
Author: Jay Greco <[email protected]>
Date:   Fri Jan 27 00:03:57 2023 -0800

    Add RP2040 SCRAMBLE v2 (qmk#19489)

commit f1b5659
Author: wangfuco <[email protected]>
Date:   Thu Jan 26 22:11:29 2023 -0800

    fix pegasushoof caps light, add via keymap (qmk#19649)

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

commit 6e42b58
Author: AnotherStranger <[email protected]>
Date:   Thu Jan 26 22:14:34 2023 +0100

    VIA keymap for the dactyl manuform 4x6 (qmk#19668)

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

commit 19ecd69
Author: Charly Delay <[email protected]>
Date:   Fri Jan 27 03:43:08 2023 +0900

    Rename `LAYOUT` macros identifier that contained the keyboard name (qmk#19657)

commit ad817a7
Merge: 81ca832 3823046
Author: QMK Bot <[email protected]>
Date:   Thu Jan 26 16:35:07 2023 +0000

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

commit 3823046
Author: schwarzer-geiger <[email protected]>
Date:   Thu Jan 26 11:34:27 2023 -0500

    new keyboard: edinburgh41 (qmk#19569)

    * added edinburgh41

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

commit 81ca832
Author: Sergey Vlasov <[email protected]>
Date:   Wed Jan 25 04:47:55 2023 +0300

    analog.c: Fix `pinToMux()` for STM32F0xx (qmk#19658)

    The `adc_read()` code for STM32F0xx expects to get the 0-based channel
    number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
    attempting to pass the CHSELR bit mask in that field, which resulted in
    selecting a wrong channel, therefore `analogReadPin()` did not work
    properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
    number in that field (this matches the behavior for other supported
    chips and also allows selection of channels 16...18, which can be used
    to access the builtin temperature, reference voltage and VBAT sensors).

commit 0edf478
Merge: 019c321 fa132ba
Author: QMK Bot <[email protected]>
Date:   Wed Jan 25 00:20:11 2023 +0000

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

commit fa132ba
Author: Darkhan <[email protected]>
Date:   Wed Jan 25 00:19:32 2023 +0000

    Decrease LED animation frequency to improve performance (qmk#19677)

commit 019c321
Merge: 7ff55e6 8af8720
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 20:03:41 2023 +0000

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

commit 8af8720
Author: Christian Brauner <[email protected]>
Date:   Tue Jan 24 21:03:05 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19665)

commit 7ff55e6
Merge: d14863c 419a794
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 15:18:09 2023 +0000

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

commit 419a794
Author: arrowj <[email protected]>
Date:   Tue Jan 24 09:17:24 2023 -0600

    Update understanding_qmk.md (qmk#19664)

    Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.

commit d14863c
Merge: 8767e74 b24fa2f
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 14:20:10 2023 +0000

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

commit b24fa2f
Author: Natan-P <[email protected]>
Date:   Tue Jan 24 15:19:34 2023 +0100

    escaped stray backslash in bux.py (qmk#19667)

commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Feb 3, 2023
@freznel10
Squashed commit of the following:
f2b29ca 
commit 49c912f
Author: jpe230 <[email protected]>
Date:   Wed Feb 1 21:31:54 2023 -0600

    QP: Correct rotation and offset when using LVGL (qmk#19713)

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

commit 7717630
Merge: 1c772eb 8dc6686
Author: QMK Bot <[email protected]>
Date:   Wed Feb 1 18:55:53 2023 +0000

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

commit 8dc6686
Author: adiabatic <[email protected]>
Date:   Wed Feb 1 10:55:12 2023 -0800

    zweihander-macos: Update keys, add capslock (qmk#19730)

    * Update to current Scroll Lock/Power names

    * Replace `'` with `⇪`

commit 1c772eb
Merge: 0ee48d2 ca8b4b8
Author: QMK Bot <[email protected]>
Date:   Wed Feb 1 17:27:17 2023 +0000

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

commit ca8b4b8
Author: a_marmot <[email protected]>
Date:   Wed Feb 1 09:26:37 2023 -0800

    [Keyboard] Add modded Razer Orbweaver with RP2040 (qmk#19711)

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

commit 0ee48d2
Merge: 944b610 252b041
Author: QMK Bot <[email protected]>
Date:   Wed Feb 1 14:14:10 2023 +0000

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

commit 252b041
Author: Patryk <[email protected]>
Date:   Wed Feb 1 14:13:18 2023 +0000

    add Mecx Labs mp1 macropad (qmk#19064)

    * add mecxlabs mp1 macropad
    Co-authored-by: Joel Challis <[email protected]>

commit 944b610
Author: Joel Challis <[email protected]>
Date:   Tue Jan 31 01:02:17 2023 +0000

    Fix midi after recent refactoring (qmk#19723)

commit b867522
Author: Ryan <[email protected]>
Date:   Tue Jan 31 07:45:41 2023 +1100

    Clean up Force NKRO in config.h (qmk#19718)

commit d84a735
Author: Joel Challis <[email protected]>
Date:   Mon Jan 30 20:40:12 2023 +0000

    Strip out more of config_common (qmk#19722)

commit f6dd8de
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 31 06:03:30 2023 +1100

    Remove usages of config_common.h from config.h files. (qmk#19714)

commit 2d84308
Author: Ryan <[email protected]>
Date:   Tue Jan 31 05:37:19 2023 +1100

    Normalise Swap Hands keycodes (qmk#19720)

commit cc9520b
Merge: ef6505a e296d67
Author: QMK Bot <[email protected]>
Date:   Mon Jan 30 08:48:34 2023 +0000

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

commit e296d67
Author: Nick Brassel <[email protected]>
Date:   Mon Jan 30 19:47:46 2023 +1100

    Accumulate version.h generator flags. (qmk#19716)

commit ef6505a
Merge: 242b80c 2c878b1
Author: fauxpark <[email protected]>
Date:   Mon Jan 30 18:55:36 2023 +1100

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

commit 242b80c
Author: Ryan <[email protected]>
Date:   Mon Jan 30 18:47:50 2023 +1100

    Move MIDI code out of tmk_core (qmk#19704)

commit 968cc1f
Author: Joel Challis <[email protected]>
Date:   Mon Jan 30 04:10:40 2023 +0000

    Relocate diode direction definitions (qmk#19715)

commit 2c878b1
Author: Ryan <[email protected]>
Date:   Mon Jan 30 14:37:02 2023 +1100

    Clean up `qmk generate-autocorrect-data` (qmk#19710)

commit 328279a
Author: Wolf Van Herreweghe <[email protected]>
Date:   Sun Jan 29 23:58:07 2023 +0100

    Add base firmware for the Frog Numpad (qmk#19698)

    Co-authored-by: Wolf Van Herreweghe <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: jack <[email protected]>

commit d322b4c
Author: yiancar <[email protected]>
Date:   Sun Jan 29 16:59:13 2023 +0000

    [Keyboard] Baion 808 (qmk#19690)

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

commit 043d8e1
Author: Ryan <[email protected]>
Date:   Mon Jan 30 03:44:16 2023 +1100

    Remove deprecated Quantum keycodes (qmk#19712)

commit 80cc6ad
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:16:59 2023 +0000

    Fix 19701 merge

commit 8cc2e0e
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 21:07:51 2023 +0000

    Fix quantum ring_buffer for ChibiOS (qmk#19683)

commit 832479c
Author: Joel Challis <[email protected]>
Date:   Sat Jan 28 20:40:47 2023 +0000

    Split out mcu_selection to platform (qmk#19701)

commit 981f3c3
Author: Albert Y <[email protected]>
Date:   Sun Jan 29 00:41:50 2023 +0800

    Additional handedness by EEPROM examples (qmk#19686)

    Co-authored-by: jack <[email protected]>
    Co-authored-by: Dasky <[email protected]>

commit b727434
Author: Ryan <[email protected]>
Date:   Sun Jan 29 02:42:44 2023 +1100

    Remove commented out backlight config & stray "backlight levels" (qmk#19703)

commit ce7bb63
Author: azhizhinov <[email protected]>
Date:   Sat Jan 28 01:52:05 2023 +0300

    VIA keymap for Reviung 34. (qmk#19694)

    VIA keymap for Reviung 34.

commit acea06b
Author: adophoxia <[email protected]>
Date:   Fri Jan 27 13:39:38 2023 -0800

    [Keyboard] Update effects for Keychron Q2 (qmk#19685)

commit 9aaf1c2
Author: Patrick Muldoon <[email protected]>
Date:   Fri Jan 27 08:35:26 2023 -0800

    Swap LED_PIN_ON_STATE to 0. (qmk#19692)

    User reported that CAPS lock Led state was inverted after soldering a LED to their board.

    LED_PIN_ON_STATE defaults to 1, so just swap to low.

    Flashed board and now CAPS LED reflects the actual state

commit b3dca4b
Author: Jay Greco <[email protected]>
Date:   Fri Jan 27 00:03:57 2023 -0800

    Add RP2040 SCRAMBLE v2 (qmk#19489)

commit f1b5659
Author: wangfuco <[email protected]>
Date:   Thu Jan 26 22:11:29 2023 -0800

    fix pegasushoof caps light, add via keymap (qmk#19649)

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

commit 6e42b58
Author: AnotherStranger <[email protected]>
Date:   Thu Jan 26 22:14:34 2023 +0100

    VIA keymap for the dactyl manuform 4x6 (qmk#19668)

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

commit 19ecd69
Author: Charly Delay <[email protected]>
Date:   Fri Jan 27 03:43:08 2023 +0900

    Rename `LAYOUT` macros identifier that contained the keyboard name (qmk#19657)

commit ad817a7
Merge: 81ca832 3823046
Author: QMK Bot <[email protected]>
Date:   Thu Jan 26 16:35:07 2023 +0000

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

commit 3823046
Author: schwarzer-geiger <[email protected]>
Date:   Thu Jan 26 11:34:27 2023 -0500

    new keyboard: edinburgh41 (qmk#19569)

    * added edinburgh41

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

commit 81ca832
Author: Sergey Vlasov <[email protected]>
Date:   Wed Jan 25 04:47:55 2023 +0300

    analog.c: Fix `pinToMux()` for STM32F0xx (qmk#19658)

    The `adc_read()` code for STM32F0xx expects to get the 0-based channel
    number in `mux.input`, but the `pinToMux()` code for STM32F0xx was
    attempting to pass the CHSELR bit mask in that field, which resulted in
    selecting a wrong channel, therefore `analogReadPin()` did not work
    properly for the STM32F0xx chips.  Fix `pinToMux()` to put the channel
    number in that field (this matches the behavior for other supported
    chips and also allows selection of channels 16...18, which can be used
    to access the builtin temperature, reference voltage and VBAT sensors).

commit 0edf478
Merge: 019c321 fa132ba
Author: QMK Bot <[email protected]>
Date:   Wed Jan 25 00:20:11 2023 +0000

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

commit fa132ba
Author: Darkhan <[email protected]>
Date:   Wed Jan 25 00:19:32 2023 +0000

    Decrease LED animation frequency to improve performance (qmk#19677)

commit 019c321
Merge: 7ff55e6 8af8720
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 20:03:41 2023 +0000

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

commit 8af8720
Author: Christian Brauner <[email protected]>
Date:   Tue Jan 24 21:03:05 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19665)

commit 7ff55e6
Merge: d14863c 419a794
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 15:18:09 2023 +0000

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

commit 419a794
Author: arrowj <[email protected]>
Date:   Tue Jan 24 09:17:24 2023 -0600

    Update understanding_qmk.md (qmk#19664)

    Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46.

commit d14863c
Merge: 8767e74 b24fa2f
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 14:20:10 2023 +0000

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

commit b24fa2f
Author: Natan-P <[email protected]>
Date:   Tue Jan 24 15:19:34 2023 +0100

    escaped stray backslash in bux.py (qmk#19667)

commit 8767e74
Merge: fca6d16 1c69682
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 09:20:21 2023 +0000

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

commit 1c69682
Author: MJM <[email protected]>
Date:   Tue Jan 24 04:19:42 2023 -0500

    [Keyboard] Add the Black Hellebore (qmk#19655)

commit fca6d16
Merge: 025e530 695c4c6
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:52:36 2023 +0000

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

commit 695c4c6
Author: adophoxia <[email protected]>
Date:   Tue Jan 24 00:51:45 2023 -0800

    [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (qmk#19674)

commit 025e530
Merge: dd7b244 4d180c9
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 08:05:37 2023 +0000

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

commit 4d180c9
Author: jack <[email protected]>
Date:   Tue Jan 24 01:04:56 2023 -0700

    fixup splitkb/kyria VIA keymap (qmk#19676)

commit dd7b244
Author: jack <[email protected]>
Date:   Mon Jan 23 23:24:56 2023 -0700

    Fixup handwired/jscotto/scotto40 (qmk#19675)

commit 79d5f2f
Merge: 8ca3f0f 4c6415d
Author: QMK Bot <[email protected]>
Date:   Tue Jan 24 05:43:18 2023 +0000

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

commit 4c6415d
Author: cole smith <[email protected]>
Date:   Mon Jan 23 21:42:38 2023 -0800

    [Keyboard] Fix boardsource/lulu/avr encoder pins (qmk#19672)

commit 8ca3f0f
Author: Stefan Kerkmann <[email protected]>
Date:   Mon Jan 23 22:24:21 2023 +0100

    [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (qmk#19652)

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

commit ea05045
Author: Nick Brassel <[email protected]>
Date:   Tue Jan 24 07:10:03 2023 +1100

    Allow overriding of keymap/encodermap layer count. (qmk#19325)

commit aea1194
Author: David Hoelscher <[email protected]>
Date:   Mon Jan 23 14:05:47 2023 -0600

    Corrections to uart driver for Chibios platform (qmk#19075)

commit dfb2833
Merge: 0a51ea2 4e658d4
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 10:23:39 2023 +0000

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

commit 4e658d4
Author: youturn45 <[email protected]>
Date:   Mon Jan 23 05:23:00 2023 -0500

    [Keymap] Add youturn/yt keymap for think65 (qmk#19300)

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

commit 0a51ea2
Merge: 603c86b 9c7490d
Author: QMK Bot <[email protected]>
Date:   Mon Jan 23 09:39:16 2023 +0000

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

commit 9c7490d
Author: Joe Scotto <[email protected]>
Date:   Mon Jan 23 04:38:22 2023 -0500

    [Keyboard] Add Scotto40 Keyboard (qmk#18453)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: James Young <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@sigprof sigprof Awaiting requested review from sigprof

Assignees
No one assigned
Labels
bug core
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@KarlK90 @sigprof @freznel10 @MatteoDM @drashna