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] Update MJ63 architecture to support multi version #11788

Merged
merged 68 commits into from
Feb 21, 2021
Merged

[Keyboard] Update MJ63 architecture to support multi version #11788

merged 68 commits into from
Feb 21, 2021

Conversation

melgeek001365
Copy link
Contributor

@melgeek001365 melgeek001365 commented Feb 4, 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 <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
2a0d6f3 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
c863aac 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
0f37c4c 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/readme.md
ba0ce31 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/rev1/rules.mk
2eb8b44 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
d9685b4 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
2379495 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
8e40e5b 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.h
e2a6a98 
Co-authored-by: Ryan <[email protected]>
@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 <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/z70ultra.c
61d5629 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/info.json
ef20f24 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
89be492 
Co-authored-by: Ryan <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
aaeb334 
Co-authored-by: Ryan <[email protected]>
@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 <[email protected]>
@melgeek001365 @fauxpark
Update keyboards/melgeek/z70ultra/config.h
b4f53e5 
Co-authored-by: Ryan <[email protected]>
@melgeek001365
remove excessive arguments from LAYOUT_split_space
7f19b28
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/info.json
fc83655 
Co-authored-by: James Young <[email protected]>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/info.json
8dbb4dd 
Co-authored-by: James Young <[email protected]>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
e36b9ed 
Co-authored-by: James Young <[email protected]>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/z70ultra.h
5a72749 
Co-authored-by: James Young <[email protected]>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/z70ultra.h
fb4c6f3 
Co-authored-by: James Young <[email protected]>
@melgeek001365 @noroadsleft
Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
68f46d3 
Co-authored-by: James Young <[email protected]>
melgeek001365 and others added 19 commits September 23, 2020 09:19
@melgeek001365 @fauxpark
Update keyboards/melgeek/mj61/mj61.c
86a586f 
Co-authored-by: Ryan <[email protected]>
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
7b5f1bd 
merges from orginal qmk
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
115f0b6
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
8421f8c
@melgeek001365
Merge branch 'temp' into melgeek-z70ultra
0bb27f3
@melgeek001365
Merge branch 'melgeek-z70ultra' of https://github.com/melgeek001365/q…
8aa690d 
…mk_firmware into melgeek-z70ultra
@melgeek001365
Add GPL for files
9fc40cd
@melgeek001365
Update keymaps/default/keymap.c
73a091f
@melgeek001365
Update keymaps/via/keymap.c
8bf45e9
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
111d8c3
@melgeek001365 @drashna
Update keyboards/melgeek/z70ultra/z70ultra.c
ddb6308 
Co-authored-by: Drashna Jaelre <[email protected]>
@melgeek001365 @drashna
Update keyboards/melgeek/z70ultra/z70ultra.c
a970617 
Co-authored-by: Drashna Jaelre <[email protected]>
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
8f00ded
@melgeek001365
Merge branch 'melgeek-z70ultra' of https://github.com/melgeek001365/q…
c8850a7 
…mk_firmware
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
1990c3b
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
0096d54
@melgeek001365
Merge branch 'master' of https://github.com/qmk/qmk_firmware
4bb9ded
@melgeek001365
[Keyboard] Update MJ63 architecture to support multi version
f9e9889
@melgeek001365
[Keyboard] Support MJ63 Rev2 which is a RGB Hotswap keyboard
11997e3
drashna
drashna requested changes Feb 5, 2021
View reviewed changes
keyboards/melgeek/mj63/rev2/rev2.c Outdated Show resolved Hide resolved
@melgeek001365
Copy link
Contributor Author

@fauxpark Would you mind to review this pr ? :)

@drashna drashna requested a review from a team February 19, 2021 03:33
@drashna
Copy link
Member

drashna commented Feb 21, 2021

Thanks!

@drashna drashna merged commit 6e59fe0 into qmk:master Feb 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@fauxpark fauxpark fauxpark 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.
3 participants
@melgeek001365 @drashna @fauxpark