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

Add more community layout support to Discipline #8540

Merged
merged 3 commits into from
Jun 23, 2020
Merged

Add more community layout support to Discipline #8540

merged 3 commits into from
Jun 23, 2020

Conversation

brandonschlack
Copy link
Contributor

Adds support for 65_ansi_blocker community layouts to Discipline maintained by @coseyfannitutti. LAYOUT_65_ansi_blocker is aliased as the already implemented LAYOUT_65_ansi_2_right_mods. Although there is no physical blocker, it is the same layout with the same number of arguments, but with the 2 right mods being 1.5u keys and not 1.25u. Tested with layouts/default and layouts/community keymaps.

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

  • N/A

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

@zvecr zvecr added the keyboard label Mar 23, 2020
@zvecr zvecr requested review from noroadsleft and a team March 23, 2020 18:31
@drashna drashna self-requested a review March 24, 2020 19:56
@stale
Copy link

stale bot commented May 8, 2020

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@drashna drashna requested a review from a team May 9, 2020 06:56
@stale stale bot removed the awaiting changes label May 9, 2020
@Erovia
Copy link
Member

Erovia commented Jun 21, 2020

If you could rebase on the master branch, resolve the conflicts and apply fauxpark's suggestions, we could get this merged.

@brandonschlack
Add more community layout support to Discipline
45ead42 
- Add 65_ansi_blocker support to Dsicipline as an alias to LAYOUT_65_ansi_2_right_mods
@brandonschlack brandonschlack force-pushed the discipline_community_layouts branch from 321be66 to 45ead42 Compare June 22, 2020 17:05
Erovia
Erovia approved these changes Jun 22, 2020
View reviewed changes
Copy link
Member

@Erovia Erovia left a comment

Choose a reason for hiding this comment

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

LGTM

@Erovia Erovia requested review from fauxpark and a team June 22, 2020 20:02
@Erovia Erovia merged commit 146873f into qmk:master Jun 23, 2020
@brandonschlack brandonschlack deleted the discipline_community_layouts branch June 23, 2020 17:49
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@brandonschlack @jakobaa
Add more community layout support to Discipline (qmk#8540)
e9b2c73
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

@Erovia Erovia Erovia approved these changes

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

@drashna drashna Awaiting requested review from drashna

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

Successfully merging this pull request may close these issues.
5 participants
@brandonschlack @Erovia @drashna @fauxpark @zvecr