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

Dactyl manuform 5x6 2 5 keymap #11353

Merged
merged 5 commits into from
Apr 14, 2021

Conversation

jceb
Copy link
Contributor

@jceb jceb commented Dec 30, 2020

Description

Keymap for a DactylManuform with 5x6 layout, two additional keys (ctrl + alt) and five thumb keys.

Types of Changes

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

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

@github-actions github-actions bot added core documentation keyboard keymap translation via Adds via keymap and/or updates keyboard for via support labels Dec 30, 2020
@jceb jceb changed the base branch from master to develop December 30, 2020 09:05
@github-actions github-actions bot removed core via Adds via keymap and/or updates keyboard for via support translation documentation labels Dec 30, 2020
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.

LGTM.

Also, any reason this is targeting develop, rather than master?

@jceb
Copy link
Contributor Author

jceb commented Jan 23, 2021

Nope, nothing in particular. Shall I switch the PR to master?

@drashna drashna requested a review from a team January 30, 2021 02:57
@drashna
Copy link
Member

drashna commented Jan 30, 2021

Nope, nothing in particular. Shall I switch the PR to master?

Ideally, yeah. It's mostly only core PRs that need to target develop. Unless there is something that is only in develop, you should target master.

@jceb jceb force-pushed the dactyl_manuform_5x6_2_5_keymap branch from 528e79f to e6d0b11 Compare February 1, 2021 18:28
@jceb
Copy link
Contributor Author

jceb commented Feb 1, 2021

Okay, I rebased the commits on master.

@tzarc tzarc closed this Feb 27, 2021
@tzarc tzarc deleted the branch qmk:master February 27, 2021 20:28
@tzarc
Copy link
Member

tzarc commented Feb 27, 2021

Sorry about that, GitHub decided to delete the develop branch from upstream when we merged it, despite being told otherwise. Reopened.

@tzarc tzarc reopened this Feb 27, 2021
@drashna drashna changed the base branch from develop to master March 14, 2021 20:16
@jceb
Copy link
Contributor Author

jceb commented Mar 23, 2021

Could this be merged?

@fauxpark fauxpark requested a review from a team March 25, 2021 07:13
Copy link
Contributor

@ridingqwerty ridingqwerty left a comment

Choose a reason for hiding this comment

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

This looks good to me, and fauxpark's request looks like it was addressed.

@ridingqwerty ridingqwerty merged commit b33e679 into qmk:master Apr 14, 2021
makenova pushed a commit to makenova/qmk_firmware that referenced this pull request Apr 26, 2021
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
rizo pushed a commit to rizo/qmk_firmware that referenced this pull request May 10, 2021
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
toddyamakawa pushed a commit to toddyamakawa/qmk_firmware that referenced this pull request May 19, 2021
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants