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

Add Matrix 8XV1.2 OG rev1 PCB #11614

Merged
merged 20 commits into from
Jun 11, 2021
Merged

Add Matrix 8XV1.2 OG rev1 PCB #11614

merged 20 commits into from
Jun 11, 2021

Conversation

kb-elmo
Copy link
Contributor

@kb-elmo kb-elmo commented Jan 19, 2021

Description

Added support for the STM32 based Matrix 8XV1.2 OG rev1 (ANSI only) PCB

With lots of help from @xyzz <3

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

@kb-elmo kb-elmo changed the title Add matrix 12og green Add Matrix 8XV1.2 OG rev1 PCB Jan 19, 2021
keyboards/matrix/m12og/rev1/rev1.c Outdated Show resolved Hide resolved
keyboards/matrix/m12og/rev1/rev1.c Outdated Show resolved Hide resolved
kb-elmo and others added 2 commits January 20, 2021 10:47
Co-authored-by: Drashna Jaelre <drashna@live.com>
@stale
Copy link

stale bot commented Mar 16, 2021

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@drashna
Copy link
Member

drashna commented Mar 17, 2021

There is a merge conflict here.

Also, if you could run qmk chibios-confmigrate and update the chibiOS config files to the newer format?

@stale stale bot removed the awaiting changes label Mar 17, 2021
@kb-elmo kb-elmo requested a review from drashna March 17, 2021 09:14
@kb-elmo
Copy link
Contributor Author

kb-elmo commented Apr 9, 2021

any news here?

@fauxpark fauxpark requested a review from tzarc April 9, 2021 13:30
@drashna drashna requested a review from a team April 19, 2021 03:38
@github-actions github-actions bot added the via Adds via keymap and/or updates keyboard for via support label Apr 20, 2021
@kb-elmo
Copy link
Contributor Author

kb-elmo commented May 19, 2021

any updates on this? 😄

@drashna
Copy link
Member

drashna commented May 22, 2021

any updates on this? 😄

Sorry about that. (ignore)

@tzarc tzarc merged commit 0ef145d into qmk:master Jun 11, 2021
struckmb pushed a commit to struckmb/qmk_firmware that referenced this pull request Jun 14, 2021
* add v1 12og pcb

* update

* matrix changes for testing

* Update matrix.c

* finalized files

* rename board versions

* update readmes

* typo in readme

* fix board filenames

* Update keyboards/matrix/m12og/rev1/rev1.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* change function

* update halconf and chconf

* merge master

* Update readme.md

* Update readme.md

* Update readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
* add v1 12og pcb

* update

* matrix changes for testing

* Update matrix.c

* finalized files

* rename board versions

* update readmes

* typo in readme

* fix board filenames

* Update keyboards/matrix/m12og/rev1/rev1.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* change function

* update halconf and chconf

* merge master

* Update readme.md

* Update readme.md

* Update readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
* add v1 12og pcb

* update

* matrix changes for testing

* Update matrix.c

* finalized files

* rename board versions

* update readmes

* typo in readme

* fix board filenames

* Update keyboards/matrix/m12og/rev1/rev1.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* change function

* update halconf and chconf

* merge master

* Update readme.md

* Update readme.md

* Update readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
* add v1 12og pcb

* update

* matrix changes for testing

* Update matrix.c

* finalized files

* rename board versions

* update readmes

* typo in readme

* fix board filenames

* Update keyboards/matrix/m12og/rev1/rev1.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* change function

* update halconf and chconf

* merge master

* Update readme.md

* Update readme.md

* Update readme.md

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
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants