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

Fix midi after recent refactoring #19723

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Fix midi after recent refactoring #19723

merged 1 commit into from
Jan 31, 2023

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Jan 30, 2023 •
edited
Loading

Description

Seems to compile now, no idea if its the "best" fix.

Used to live in:

qmk_firmware/tmk_core/protocol/midi.mk

Line 9 in e296d67

$(LUFA_SRC_USBCLASS)

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

@zvecr zvecr requested review from fauxpark and a team January 30, 2023 19:58
@github-actions github-actions bot removed the core label Jan 30, 2023
@fauxpark
Copy link
Member

I tested this before and it seemed to compile fine without it, on both AVR and ChibiOS?

@zvecr
Copy link
Member Author

zvecr commented Jan 31, 2023 •
edited
Loading

You might want to recheck AVR, as its currently failing and why this PR exists.

$ make clean bandominedoni:default
QMK Firmware 0.19.11
Deleting .build/ ... done.
Making bandominedoni with keymap default
...
Linking: .build/bandominedoni_default.elf                                                           [ERRORS]
 | 
 | /usr/bin/avr-ld: /tmp/ccRJP1QQ.ltrans0.ltrans.o: in function `.Loc.3848':
 | /home/zvecr/qmk_firmware/tmk_core/protocol/lufa/lufa.c:714: undefined reference to `MIDI_Device_SendEventPacket'
 | /usr/bin/avr-ld: /tmp/ccRJP1QQ.ltrans0.ltrans.o: in function `.Loc.3861':
 | /home/zvecr/qmk_firmware/tmk_core/protocol/lufa/lufa.c:718: undefined reference to `MIDI_Device_ReceiveEventPacket'
 | /usr/bin/avr-ld: /tmp/ccRJP1QQ.ltrans0.ltrans.o: in function `.Loc.4558':
 | /home/zvecr/qmk_firmware/tmk_core/protocol/lufa/lufa.c:886: undefined reference to `MIDI_Device_USBTask'
 | collect2: error: ld returned 1 exit status

@fauxpark
Copy link
Member

I don't get it, CI didn't complain: https://github.com/qmk/qmk_firmware/runs/10947261782

@zvecr
Copy link
Member Author

zvecr commented Jan 31, 2023

Except it is failing, and is holding up verification of other scenarios. We can work out how it slipped through at a later date.

@fauxpark
Copy link
Member

fauxpark commented Jan 31, 2023 •
edited
Loading

Better solution, add this to lufa.mk next to the virtser one:

ifeq ($(strip $(MIDI_ENABLE)), yes)
	LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c
endif

@github-actions github-actions bot added the core label Jan 31, 2023
@zvecr
Copy link
Member Author

zvecr commented Jan 31, 2023

Cheers!

@zvecr zvecr merged commit 944b610 into qmk:develop Jan 31, 2023
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

@fauxpark fauxpark fauxpark approved these changes

@tzarc tzarc tzarc approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@zvecr @fauxpark @tzarc