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

Added Iris Rev6a layout and Milk 2% layout #17600

Merged
merged 16 commits into from
Aug 31, 2022
Merged

Conversation

JellyTitan
Copy link
Contributor

Description

Added an Iris6a layout with advanced programming examples. Specifically, examples for rotary encoders and per-key RGB.

Added fancy copy/paste layout for milk 2%

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

@github-actions github-actions bot added the keymap label Jul 8, 2022
keyboards/keebio/iris/keymaps/two_knob/config.h Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/two_knob/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/two_knob/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/two_knob/keymap.c Outdated Show resolved Hide resolved
@JellyTitan JellyTitan requested a review from drashna July 19, 2022 18:22
@JellyTitan JellyTitan requested a review from drashna July 31, 2022 23:31
@drashna drashna requested a review from a team August 21, 2022 19:16
@keyboard-magpie keyboard-magpie merged commit d4c935d into qmk:master Aug 31, 2022
@keyboard-magpie
Copy link
Contributor

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

Fixing Your Branch will walk you through fixing up your master branch moving forward. If you need any help with this just ask.

Thanks for contributing!

nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants