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.

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

Fix symmetric70_proto build break on develop branch #13667

Merged
merged 2 commits into from
Jul 23, 2021

Conversation

mtei
Copy link
Contributor

@mtei mtei commented Jul 23, 2021

Description

Make the changes made to quantum/matrix.c in #13045 to symmetric70_proto/matrix_debug/matrix.c` as well.

Types of Changes

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

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

Make the changes made to `quantum/matrix.c` in # 13045 to `symmetric70_proto/matrix_debug/matrix.c` as well.
@mtei mtei requested a review from a team July 23, 2021 15:59
@fauxpark
Copy link
Member

Merge conflict.

@fauxpark
Copy link
Member

Ah, it's already been fixed by #13645

@drashna
Copy link
Member

drashna commented Jul 23, 2021

Yeah, but this is a more proper fix.

@drashna drashna merged commit 5b904a9 into qmk:develop Jul 23, 2021
@mtei
Copy link
Contributor Author

mtei commented Jul 23, 2021

Thanks for quick merge!

@mtei mtei deleted the fix_symmetric70_proto_on_develop branch July 23, 2021 16:26
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants