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

Added replacement pcb for the matrix cain keyboard #10436

Merged
merged 8 commits into from
Oct 1, 2020
Merged

Conversation

yulei
Copy link
Contributor

@yulei yulei commented Sep 25, 2020

added replacement pcb for the matrix cain keyboard

Description

Types of Changes

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

Issues Fixed or Closed by This PR

Checklist

  • [ x] My code follows the code style of this project: C, Python
  • [x ] 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.
  • [x ] I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • [x ] I have tested the changes and verified that they work and don't break anything (as well as I can manage).

keyboards/matrix/cain/cain.c Outdated Show resolved Hide resolved
@zvecr zvecr added the keyboard label Sep 26, 2020
@zvecr zvecr requested a review from a team September 26, 2020 23:27
yulei and others added 2 commits September 27, 2020 09:38
Co-authored-by: Joel Challis <git@zvecr.com>
keyboards/matrix/cain/rules.mk Outdated Show resolved Hide resolved
Co-authored-by: Ryan <fauxpark@gmail.com>
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

Also, as this code doesn't support the original Matrix Cain PCB, I'd much prefer if the directory name was something other than cain – something like cain_redux, maybe, though I'm open to suggestions here.

keyboards/matrix/cain/cain.h Outdated Show resolved Hide resolved
keyboards/matrix/cain/cain.h Outdated Show resolved Hide resolved
keyboards/matrix/cain/cain.h Outdated Show resolved Hide resolved
keyboards/matrix/cain/info.json Outdated Show resolved Hide resolved
keyboards/matrix/cain/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/matrix/cain/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/matrix/cain/read.md Outdated Show resolved Hide resolved
keyboards/matrix/cain/read.md Outdated Show resolved Hide resolved
keyboards/matrix/cain/read.md Outdated Show resolved Hide resolved
yulei and others added 2 commits September 29, 2020 11:53
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@yulei
Copy link
Contributor Author

yulei commented Sep 29, 2020

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

Also, as this code doesn't support the original Matrix Cain PCB, I'd much prefer if the directory name was something other than cain – something like cain_redux, maybe, though I'm open to suggestions here.

selected new name as cain_re.

Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Tiny change here. Everything else looks good to me.

keyboards/matrix/cain_re/readme.md Outdated Show resolved Hide resolved
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@zvecr zvecr merged commit 8070b1b into qmk:master Oct 1, 2020
@zvecr
Copy link
Member

zvecr commented Oct 1, 2020

Thanks!

rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
* added replacement pcb for the matrix cain keyboard

* update usb descriptor

* fixed led polarity

* Update keyboards/matrix/cain/cain.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/matrix/cain/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* rename from cain to cain_re

* Update keyboards/matrix/cain_re/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
* added replacement pcb for the matrix cain keyboard

* update usb descriptor

* fixed led polarity

* Update keyboards/matrix/cain/cain.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/matrix/cain/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* rename from cain to cain_re

* Update keyboards/matrix/cain_re/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
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.

4 participants