Fix symmetric70_proto build break on develop branch #13667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Make the changes made to `quantum/matrix.c` in # 13045 to `symmetric70_proto/matrix_debug/matrix.c` as well.
fauxpark
approved these changes
Jul 23, 2021
|
Merge conflict. |
|
Ah, it's already been fixed by #13645 |
|
Yeah, but this is a more proper fix. |
drashna
approved these changes
Jul 23, 2021
|
Thanks for quick merge! |
cadusk
pushed a commit
to cadusk/qmk_firmware
that referenced
this pull request
Jul 24, 2021
* qmk/develop: (33 commits) [Keyboard] Add Keychron Q1 (qmk#13397) [Keymap] add kinesis/keymaps/jwon (qmk#13618) [Keyboard] Dharma (qmk#13663) feature: Add swap hands support for sofle keyboard. (qmk#13654) Fix up xd002 rgb keymaps (qmk#13685) Avoid LTO conficts on arm_atsam (qmk#13676) [Keyboard] Reduce compile size for dz60rgb v2.1 (qmk#13680) [Keyboard] Fix type on pandora via keymap (qmk#13681) Remove deprecated callbacks for encoders and dip switches (qmk#13404) [Keyboard] Quick hack to fix Astro65 board (qmk#13665) [Keyboard] Added Compound keyboard support (qmk#12942) Disables rgblight twinkle by default. (qmk#13677) [Keyboard] Fix split matrix for sekigon grs 70ec (qmk#13672) [Keyboard] Fix matrix delay on Drop boards (qmk#13671) [Keyboard] Disable console by default on all Keebio boards (qmk#13649) CLI/Docs: Fix the format commands' name (qmk#13668) [Keyboard] Enable LTO by default on BastardKB Scylla (qmk#13664) [Keyboard] Fix symmetric70_proto build break on develop branch (qmk#13667) [Keyboard] Remove broken, unmaintained converter/ibm_5291 (qmk#13658) [Keyboard] Add model-v keyboard (qmk#13643) ...
nhongooi
pushed a commit
to nhongooi/qmk_firmware
that referenced
this pull request
Dec 5, 2021
…3667) Co-authored-by: Drashna Jaelre <drashna@live.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Make the changes made to
quantum/matrix.cin #13045 to symmetric70_proto/matrix_debug/matrix.c` as well.Types of Changes
Checklist