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 MJ65 which is a 65% RGB Hotswap keyboard #11764

Merged
merged 69 commits into from
Feb 12, 2021
Merged

[Keyboard] Support MJ65 which is a 65% RGB Hotswap keyboard #11764

merged 69 commits into from
Feb 12, 2021

Conversation

melgeek001365
Copy link
Contributor

@melgeek001365 melgeek001365 commented Feb 1, 2021 •
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).

melgeek001365 and others added 30 commits May 26, 2020 15:06
@melgeek001365
Add Z70Ultra which is a Hotsawp RGB 65% keyboard
2bc1339
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.h
e1ebe5c 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
2a0d6f3 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
c863aac 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
0f37c4c 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/readme.md
ba0ce31 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/rev1/rules.mk
2eb8b44 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
d9685b4 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
2379495 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
8e40e5b 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.h
e2a6a98 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365
Update readme.md
7657823
@melgeek001365
Update info.json
f9856b7 
update the name of layout to consistent the keyboard.
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
d61bc09 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
61d5629 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/info.json
ef20f24 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
89be492 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
aaeb334 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware into mel…
39cdf6a 
…geek-z70ultra
@melgeek001365
Add Z70Ultra
38fa2da
@melgeek001365
Support Z70Ultra
1a6bb39 
  [Modified] info.json to support two different layouts
  [Add]      rules.mk to support default folder
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/rev1/rules.mk
bdea10b 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/config.h
b4f53e5 
Co-authored-by: Ryan <fauxpark@gmail.com>
@melgeek001365
remove excessive arguments from LAYOUT_split_space
7f19b28
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/info.json
fc83655 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/info.json
8dbb4dd 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
e36b9ed 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/z70ultra.h
5a72749 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/z70ultra.h
fb4c6f3 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
68f46d3 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
melgeek001365 and others added 10 commits October 13, 2020 13:14
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 1, 2021
@melgeek001365
Copy link
Contributor Author

@fauxpark @noroadsleft @zvecr please kindly help review, Thank you very much.

@melgeek001365
[Keyboard] Update for MJ65(qmk#11764)
4ab2c6d 
	* update rgb matrix index for LEDs
	* update readme mistake
	* add empty layers for VIA
	* fixed RGB_MATRIX_ENABLE
@fauxpark fauxpark requested a review from a team February 3, 2021 07:20
drashna
drashna requested changes Feb 5, 2021
View reviewed changes
keyboards/melgeek/mj65/rev3/rev3.c Outdated Show resolved Hide resolved
keyboards/melgeek/mj65/rev3/rules.mk Show resolved Hide resolved
melgeek001365 and others added 2 commits February 8, 2021 13:44
@melgeek001365 @drashna
Update keyboards/melgeek/mj65/rev3/rev3.c
6c4259a 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@melgeek001365 @drashna
Update keyboards/melgeek/mj65/rev3/rules.mk
688faca 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@melgeek001365 melgeek001365 requested a review from drashna February 8, 2021 05:45
@drashna drashna merged commit 068e11f into qmk:master Feb 12, 2021
@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 approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

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