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

New Planck 2x2U keymap #5519

Merged
merged 43 commits into from
Jun 29, 2019
Merged

New Planck 2x2U keymap #5519

merged 43 commits into from
Jun 29, 2019

Conversation

IsaacElenbaas
Copy link
Contributor

@IsaacElenbaas IsaacElenbaas commented Mar 31, 2019

Description

My first keymap, a dvorak 2x2u planck. I hadn't planned on merging, but I haven't seen any 2x2Us in the keymaps so why not. I have quite a few layers and shortcuts, most of which are briefly outlined in the readme. Also a matrix fix.

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

Matrix change on the 2x2U layout for Planck. I could not compile, and the change to keyboards/planck/planck.h's 2x2U layout fixed it. It also makes all pins under the spacebar trigger the same key, which I imagine is preferred unless someone tries to do two switches one key. Changed at Drashna's request. Centered and innermost slots under where a 2u key would go trigger space, outermost doesn't.

EDIT: Near identical changes were made in #4402 which was just merged. Removed here.

Checklist

  • My code follows the code style of this project.
  • 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).

IsaacElenbaas and others added 28 commits February 12, 2019 16:15
I realized with me excluding this it wouldn't compile - so adding a blank one.
@IsaacElenbaas
Copy link
Contributor Author

IsaacElenbaas commented Mar 31, 2019

2x2U doesn't compile for earlier revisions, as they don't support the layout, but aside from that error it passes now. As said in OP, I only submitted because there were no 2x2U keymaps, but that brings up the issue of how to organize them as storing along with those compatible with everything isn't ideal.

Edit: Just saw on committing to master. Noted.

keyboards/planck/planck.h Outdated Show resolved Hide resolved
@IsaacElenbaas IsaacElenbaas changed the title New Planck 2x2U keymap, fixed 2x2U matrix? New Planck 2x2U keymap, fixed 2x2U matrix Apr 13, 2019
Copy link
Contributor Author

@IsaacElenbaas IsaacElenbaas left a comment

Choose a reason for hiding this comment

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

May end up being temporary redundant, as I'm going to make another pull to change KC_NO itself (it's not working atm anyway), but depending on how people feel the key should behave it may not even happen.

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.
@IsaacElenbaas
Copy link
Contributor Author

Thought I might as well add these as this isn't merged yet. Also, not sure if I should have blocked those out as I did or doubled up keys like in LAYOUT_planck_mit because I don't know how that center slot behaves.

@IsaacElenbaas IsaacElenbaas changed the title New Planck 2x2U keymap, fixed 2x2U matrix New Planck 2x2U keymap, fixed Nx2U matrices May 18, 2019
@IsaacElenbaas
Copy link
Contributor Author

I've removed all changes to the Nx2U matrices. They were fixed in #4402 as well, which was just merged.

@IsaacElenbaas IsaacElenbaas changed the title New Planck 2x2U keymap, fixed Nx2U matrices New Planck 2x2U keymap Jun 13, 2019
…use it won't leave my modified no matter what I do.
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.

Thanks!

@drashna drashna merged commit 86e0420 into qmk:master Jun 29, 2019
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
* Initial keymapping

* Removed unneccessary config files

* Update readme.md

* Updated symbol locations, tap dance on parentheses for brackets.

* Update readme.md

* Fixed layout image inconsistencies

* More quality shift key layer control, swapped enter + shift enter

* Keyap tweaks and config cleanup

* Almost compiling, still has layout reference issues.

* Finally compiling. 2x2u layout (default, not mine) had nonexistent keys on it

* Super minor changes

* Ctrl+Bksp after first tap

* Changed bind so un/lock is explicit to work with remote un/locking

* Added keyboard passwords please don't hate me

* Changed backspace functionality and added em dash

* Changed to send_string because it's preferred for macros

* Minor fixes

* Removed global redefinition and fixed possible issue between 6KRO and NKRO

* Cleanup

* Layer names, password layer is OSL over toggle

* Hopefully now in QMK preferred format.

* Blank passwords.c

I realized with me excluding this it wouldn't compile - so adding a blank one.

* Fixed OSLs not cancelling after tapping term

* Matrix change.

KC_NO instead of repeating.

* Unneeded line.

Co-Authored-By: IsaacElenbaas <[email protected]>

* Fixed return statements to work with after-press functions

* External image host

* Removed image from github

* Removed unneccessary rules.mk lines and fixed tabbing

* Typos

* Fixes upon part arrival.

* Final changes and bug fixes

* Preventing KC_NO from waking monitors.

* Fix to rest of matrices

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.

* Workaround for qmk#6214, minor changes, CRLF change in passwords because it won't leave my modified no matter what I do.
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* Initial keymapping

* Removed unneccessary config files

* Update readme.md

* Updated symbol locations, tap dance on parentheses for brackets.

* Update readme.md

* Fixed layout image inconsistencies

* More quality shift key layer control, swapped enter + shift enter

* Keyap tweaks and config cleanup

* Almost compiling, still has layout reference issues.

* Finally compiling. 2x2u layout (default, not mine) had nonexistent keys on it

* Super minor changes

* Ctrl+Bksp after first tap

* Changed bind so un/lock is explicit to work with remote un/locking

* Added keyboard passwords please don't hate me

* Changed backspace functionality and added em dash

* Changed to send_string because it's preferred for macros

* Minor fixes

* Removed global redefinition and fixed possible issue between 6KRO and NKRO

* Cleanup

* Layer names, password layer is OSL over toggle

* Hopefully now in QMK preferred format.

* Blank passwords.c

I realized with me excluding this it wouldn't compile - so adding a blank one.

* Fixed OSLs not cancelling after tapping term

* Matrix change.

KC_NO instead of repeating.

* Unneeded line.

Co-Authored-By: IsaacElenbaas <[email protected]>

* Fixed return statements to work with after-press functions

* External image host

* Removed image from github

* Removed unneccessary rules.mk lines and fixed tabbing

* Typos

* Fixes upon part arrival.

* Final changes and bug fixes

* Preventing KC_NO from waking monitors.

* Fix to rest of matrices

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.

* Workaround for qmk#6214, minor changes, CRLF change in passwords because it won't leave my modified no matter what I do.
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* Initial keymapping

* Removed unneccessary config files

* Update readme.md

* Updated symbol locations, tap dance on parentheses for brackets.

* Update readme.md

* Fixed layout image inconsistencies

* More quality shift key layer control, swapped enter + shift enter

* Keyap tweaks and config cleanup

* Almost compiling, still has layout reference issues.

* Finally compiling. 2x2u layout (default, not mine) had nonexistent keys on it

* Super minor changes

* Ctrl+Bksp after first tap

* Changed bind so un/lock is explicit to work with remote un/locking

* Added keyboard passwords please don't hate me

* Changed backspace functionality and added em dash

* Changed to send_string because it's preferred for macros

* Minor fixes

* Removed global redefinition and fixed possible issue between 6KRO and NKRO

* Cleanup

* Layer names, password layer is OSL over toggle

* Hopefully now in QMK preferred format.

* Blank passwords.c

I realized with me excluding this it wouldn't compile - so adding a blank one.

* Fixed OSLs not cancelling after tapping term

* Matrix change.

KC_NO instead of repeating.

* Unneeded line.

Co-Authored-By: IsaacElenbaas <[email protected]>

* Fixed return statements to work with after-press functions

* External image host

* Removed image from github

* Removed unneccessary rules.mk lines and fixed tabbing

* Typos

* Fixes upon part arrival.

* Final changes and bug fixes

* Preventing KC_NO from waking monitors.

* Fix to rest of matrices

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.

* Workaround for qmk#6214, minor changes, CRLF change in passwords because it won't leave my modified no matter what I do.
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
* Initial keymapping

* Removed unneccessary config files

* Update readme.md

* Updated symbol locations, tap dance on parentheses for brackets.

* Update readme.md

* Fixed layout image inconsistencies

* More quality shift key layer control, swapped enter + shift enter

* Keyap tweaks and config cleanup

* Almost compiling, still has layout reference issues.

* Finally compiling. 2x2u layout (default, not mine) had nonexistent keys on it

* Super minor changes

* Ctrl+Bksp after first tap

* Changed bind so un/lock is explicit to work with remote un/locking

* Added keyboard passwords please don't hate me

* Changed backspace functionality and added em dash

* Changed to send_string because it's preferred for macros

* Minor fixes

* Removed global redefinition and fixed possible issue between 6KRO and NKRO

* Cleanup

* Layer names, password layer is OSL over toggle

* Hopefully now in QMK preferred format.

* Blank passwords.c

I realized with me excluding this it wouldn't compile - so adding a blank one.

* Fixed OSLs not cancelling after tapping term

* Matrix change.

KC_NO instead of repeating.

* Unneeded line.

Co-Authored-By: IsaacElenbaas <[email protected]>

* Fixed return statements to work with after-press functions

* External image host

* Removed image from github

* Removed unneccessary rules.mk lines and fixed tabbing

* Typos

* Fixes upon part arrival.

* Final changes and bug fixes

* Preventing KC_NO from waking monitors.

* Fix to rest of matrices

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.

* Workaround for qmk#6214, minor changes, CRLF change in passwords because it won't leave my modified no matter what I do.
swamp09 pushed a commit to swamp09/qmk_firmware that referenced this pull request Mar 11, 2020
* Initial keymapping

* Removed unneccessary config files

* Update readme.md

* Updated symbol locations, tap dance on parentheses for brackets.

* Update readme.md

* Fixed layout image inconsistencies

* More quality shift key layer control, swapped enter + shift enter

* Keyap tweaks and config cleanup

* Almost compiling, still has layout reference issues.

* Finally compiling. 2x2u layout (default, not mine) had nonexistent keys on it

* Super minor changes

* Ctrl+Bksp after first tap

* Changed bind so un/lock is explicit to work with remote un/locking

* Added keyboard passwords please don't hate me

* Changed backspace functionality and added em dash

* Changed to send_string because it's preferred for macros

* Minor fixes

* Removed global redefinition and fixed possible issue between 6KRO and NKRO

* Cleanup

* Layer names, password layer is OSL over toggle

* Hopefully now in QMK preferred format.

* Blank passwords.c

I realized with me excluding this it wouldn't compile - so adding a blank one.

* Fixed OSLs not cancelling after tapping term

* Matrix change.

KC_NO instead of repeating.

* Unneeded line.

Co-Authored-By: IsaacElenbaas <[email protected]>

* Fixed return statements to work with after-press functions

* External image host

* Removed image from github

* Removed unneccessary rules.mk lines and fixed tabbing

* Typos

* Fixes upon part arrival.

* Final changes and bug fixes

* Preventing KC_NO from waking monitors.

* Fix to rest of matrices

In response to https://github.com/evillemez/qmk_firmware/issues/1—the rest have the same problem.
The switch of k37 for k36 is just for consistency between that and the 2x2u.

* Workaround for qmk#6214, minor changes, CRLF change in passwords because it won't leave my modified no matter what I do.
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.

3 participants