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 layout for my Keyboardio Atreus #10726

Merged
merged 18 commits into from
Nov 1, 2020
Merged

Conversation

Xyverz
Copy link
Contributor

@Xyverz Xyverz commented Oct 22, 2020

Initial addition of my Keyboardio Atreus keyboard layout.

Description

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

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.

Looks good, except for the changes to the vusb submodule.

@fauxpark fauxpark requested a review from a team October 23, 2020 01:25
@Xyverz
Copy link
Contributor Author

Xyverz commented Oct 23, 2020

How do I remove that from the commit?

@dbast
Copy link
Contributor

dbast commented Oct 25, 2020

It comes via the second commit which merges the master branch.

One solution would be to rebase against master, e.g. git rebase -i origin/master ... or git rebase -i upstream/master ... depending on how you locally named the remote to the upstream repo (not your fork of it).

@Xyverz
Copy link
Contributor Author

Xyverz commented Oct 25, 2020

Removed the vusb submodule from the commits by rebasing as @dbast suggested. Thank you very much for that.

@dbast
Copy link
Contributor

dbast commented Oct 27, 2020

@fauxpark Can you have a look again? Tested locally and looks ready to merge :)

@fauxpark fauxpark requested a review from a team October 27, 2020 08:28
@Xyverz Xyverz closed this Oct 28, 2020
@Xyverz Xyverz deleted the keyboardio_atreus branch October 28, 2020 18:36
@Xyverz Xyverz restored the keyboardio_atreus branch October 28, 2020 18:38
@Xyverz Xyverz reopened this Oct 28, 2020
@Xyverz
Copy link
Contributor Author

Xyverz commented Oct 28, 2020

Whoops, I thought my PR had already been merged. Restored branch.

@drashna drashna requested a review from a team October 29, 2020 08:14
@dbast
Copy link
Contributor

dbast commented Oct 30, 2020

@drashna Can you have a look again? Thanks

@drashna
Copy link
Member

drashna commented Nov 1, 2020

Thanks

@drashna drashna merged commit fed9c97 into qmk:master Nov 1, 2020
@Xyverz Xyverz deleted the keyboardio_atreus branch November 2, 2020 08:18
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
* Adding Evan Travers' Keyboardio Atreus branch.

Initial commit of my KeyboardIO Atreus layout.
This is a direct copy of my default Atreus layout, with blank spaces
for the two additional keys.

* Added MACLOCK macro to keymap.c

* Updates to Keyboardio Atreus keymap and readme.

* Adding arrows to bottom row of RAISE and LOWER layers

* bringing the rest of the master branch to my working branch.

* Changes to my KeyboardIO Atreus keymap & readme

* Changes to keymap.

* Adding Evan Travers' Keyboardio Atreus branch.

Initial commit of my KeyboardIO Atreus layout.
This is a direct copy of my default Atreus layout, with blank spaces
for the two additional keys.

* Added MACLOCK macro to keymap.c

* Updates to Keyboardio Atreus keymap and readme.

* Adding arrows to bottom row of RAISE and LOWER layers

* bringing the rest of the master branch to my working branch.

* Changes to my KeyboardIO Atreus keymap & readme

* Changes to keymap.

* Added GPL2+ compatible license header.

Co-authored-by: Ian Sterling <[email protected]>
ringmaster pushed a commit to ringmaster/qmk_firmware that referenced this pull request Nov 5, 2020
* Adding Evan Travers' Keyboardio Atreus branch.

Initial commit of my KeyboardIO Atreus layout.
This is a direct copy of my default Atreus layout, with blank spaces
for the two additional keys.

* Added MACLOCK macro to keymap.c

* Updates to Keyboardio Atreus keymap and readme.

* Adding arrows to bottom row of RAISE and LOWER layers

* bringing the rest of the master branch to my working branch.

* Changes to my KeyboardIO Atreus keymap & readme

* Changes to keymap.

* Adding Evan Travers' Keyboardio Atreus branch.

Initial commit of my KeyboardIO Atreus layout.
This is a direct copy of my default Atreus layout, with blank spaces
for the two additional keys.

* Added MACLOCK macro to keymap.c

* Updates to Keyboardio Atreus keymap and readme.

* Adding arrows to bottom row of RAISE and LOWER layers

* bringing the rest of the master branch to my working branch.

* Changes to my KeyboardIO Atreus keymap & readme

* Changes to keymap.

* Added GPL2+ compatible license header.

Co-authored-by: Ian Sterling <[email protected]>
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.

4 participants