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

Juno #7652

Merged
merged 10 commits into from Jan 7, 2020
Merged

Juno #7652

merged 10 commits into from Jan 7, 2020

Conversation

JunoNgx
Copy link
Contributor

@JunoNgx JunoNgx commented Dec 16, 2019 •
edited by drashna

Description

Keymap changes:

  • Added community ortholinear 4x12 layout keymap junonum.
  • Added Atom47's keymap junonum-a47.
  • Moved juno from Planck and Vitamins Included to community ortholinear 4x12.
  • Removed Preonic's juno due to poor maintenance.

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.
  • 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.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna drashna requested a review from a team December 16, 2019 07:21
@drashna drashna added the keymap label Dec 16, 2019
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 16, 2019 •
edited

@drashna Is there any action I should take regarding the failed check? I attempted to build this on a local clone (vitamins_included is coincidentally something I do own) and it succeeded.

zvecr
zvecr requested changes Dec 16, 2019
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

For the community layout, the right macro needs to be used, generally "LAYOUT_" + folder name. In this case the use of LAYOUT_planck_grid within your keymap should be changed to LAYOUT_ortho_4x12.

@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 16, 2019

Understood with thanks. Layout type updated accordingly.

@JunoNgx JunoNgx requested a review from zvecr December 16, 2019 17:39
fauxpark
fauxpark requested changes Dec 16, 2019
View reviewed changes
keyboards/maartenwut/atom47/keymaps/junonum-a47/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/config.h Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 17, 2019

@fauxpark Changes performed as requested.

fauxpark
fauxpark requested changes Dec 17, 2019
View reviewed changes
keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c Outdated Show resolved Hide resolved
keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c Outdated Show resolved Hide resolved
keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/junonum/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
layouts/community/ortho_4x12/juno/keymap.c Outdated Show resolved Hide resolved
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 18, 2019

Sorry, did these changes last night but forgot to commit them.

fauxpark
fauxpark requested changes Dec 18, 2019
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

Just a couple more things still, otherwise looks good.

@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 18, 2019

Sorry for missing out.

@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 23, 2019

@fauxpark Let me know if there's anything else I missed.

fauxpark
fauxpark requested changes Dec 24, 2019
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

Still a couple outstanding suggestions, but otherwise looks good.

JunoNgx and others added 2 commits December 26, 2019 13:51
@JunoNgx @fauxpark
Update layouts/community/ortho_4x12/juno/keymap.c
64ade01 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@JunoNgx @fauxpark
Update layouts/community/ortho_4x12/juno/keymap.c
5cd44f0 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Dec 26, 2019

@fauxpark Sorry, github was way more difficult to navigate than expected. Let me know if I missed anything else.

Also, tagging @zvecr for review.

JunoNgx and others added 2 commits January 6, 2020 01:34
@JunoNgx @fauxpark
Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c
6f5ae50 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@JunoNgx @fauxpark
Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c
d7cce03 
Co-Authored-By: fauxpark <fauxpark@gmail.com>
@JunoNgx JunoNgx requested a review from fauxpark January 5, 2020 17:35
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Jan 5, 2020

@fauxpark Review requested.

fauxpark
fauxpark approved these changes Jan 5, 2020
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

👍

@JunoNgx
Copy link
Contributor Author

JunoNgx commented Jan 6, 2020

@fauxpark May I know what else I need for this to be merged to the main branch? Approval from @zvecr?

@fauxpark
Copy link
Member

fauxpark commented Jan 7, 2020

Not in particular, it's generally at least two collaborators.
Thanks!

@fauxpark fauxpark merged commit 37d7fd1 into qmk:master Jan 7, 2020
@JunoNgx
Copy link
Contributor Author

JunoNgx commented Jan 8, 2020

Thanks a bunch for the meticulousness and perseverance through the whole month. I did learn a lot.

@JunoNgx JunoNgx deleted the juno branch January 8, 2020 09:54
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@JunoNgx @fauxpark @HokieGeek
Juno (qmk#7652)
9869f07 
* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* updated layout type for juno

* Performing requested changes; renaming a47; fine-tuning of codes in community layout keymaps.

* Fine tuning to requested changes.

* Further tuning to suggestion.

* Update layouts/community/ortho_4x12/juno/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update layouts/community/ortho_4x12/juno/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

Co-authored-by: fauxpark <fauxpark@gmail.com>
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@JunoNgx @fauxpark @kujawakk
Juno (qmk#7652)
372e286 
* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* updated layout type for juno

* Performing requested changes; renaming a47; fine-tuning of codes in community layout keymaps.

* Fine tuning to requested changes.

* Further tuning to suggestion.

* Update layouts/community/ortho_4x12/juno/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update layouts/community/ortho_4x12/juno/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

Co-authored-by: fauxpark <fauxpark@gmail.com>
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

@zvecr zvecr Awaiting requested review from zvecr

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@JunoNgx @fauxpark @drashna @zvecr