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

[Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard #10341

Merged
merged 12 commits into from
Sep 24, 2020
Merged

[Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard #10341

merged 12 commits into from
Sep 24, 2020

Conversation

melgeek001365
Copy link
Contributor

@melgeek001365 melgeek001365 commented Sep 17, 2020 •
edited
Loading

Description

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

drashna
drashna requested changes Sep 20, 2020
View reviewed changes
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

Could you add a license header to all of the c and h files in this PR?

keyboards/melgeek/mj61/mj61.c Outdated Show resolved Hide resolved
keyboards/melgeek/mj61/mj61.c Outdated Show resolved Hide resolved
keyboards/melgeek/mj61/readme.md Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team September 20, 2020 23:30
fauxpark
fauxpark requested changes Sep 21, 2020
View reviewed changes
keyboards/melgeek/mj61/rev1/rules.mk Outdated Show resolved Hide resolved
keyboards/melgeek/mj61/rev1/config.h Outdated Show resolved Hide resolved
keyboards/melgeek/mj61/readme.md Show resolved Hide resolved
@drashna drashna requested a review from a team September 22, 2020 05:33
fauxpark
fauxpark requested changes Sep 22, 2020
View reviewed changes
keyboards/melgeek/mj61/mj61.c Show resolved Hide resolved
keyboards/melgeek/mj61/mj61.c Show resolved Hide resolved
melgeek001365 and others added 3 commits September 23, 2020 09:19
@melgeek001365 @fauxpark
Update keyboards/melgeek/mj61/mj61.c
ebfc304 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/mj61/mj61.c
86a586f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
7b5f1bd 
merges from orginal qmk
noroadsleft
noroadsleft approved these changes Sep 24, 2020
View reviewed changes
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.

Looks good.

@noroadsleft noroadsleft merged commit f2dec4d into qmk:master Sep 24, 2020
@noroadsleft
Copy link
Member

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

Fixing Your Branch will walk you through fixing up your master branch moving forward. If you need any help with this just ask.

Thanks for contributing!

@melgeek001365
Copy link
Contributor Author

Best Practices: Your Fork's Master: Update Often, Commit Never

Thank you for your advice!

rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
@melgeek001365 @rgoulter
[Keyboard] add MelGeek MJ61 (qmk#10341)
b26d64d 
* [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c

* [Keyboard] MJ61 Add license header for files and the link for readme

* Update keyboards/melgeek/mj61/readme.md

* Update keyboards/melgeek/mj61/rev1/config.h

* Update keyboards/melgeek/mj61/rev1/rules.mk

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
@melgeek001365
[Keyboard] add MelGeek MJ61 (qmk#10341)
a637e7f 
* [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c

* [Keyboard] MJ61 Add license header for files and the link for readme

* Update keyboards/melgeek/mj61/readme.md

* Update keyboards/melgeek/mj61/rev1/config.h

* Update keyboards/melgeek/mj61/rev1/rules.mk

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c
@gempir gempir mentioned this pull request Mar 19, 2021
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@noroadsleft noroadsleft noroadsleft approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@melgeek001365 @noroadsleft @drashna @fauxpark