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

New keyboard: Neito + my DZ60 keymap tweaks #11773

Merged
merged 32 commits into from
Jul 16, 2021
Merged

New keyboard: Neito + my DZ60 keymap tweaks #11773

merged 32 commits into from
Jul 16, 2021

Conversation

OlliGranlund
Copy link
Contributor

  • Added a new upcoming keyboard, Neito
  • Adjusted my previous DZ60-keymaps

Description

DZ60

I've fiddled around with my previous DZ60 keymaps and amde some adjustements to them. My 2 boards differ slightly and hence I've updated both to be similar to each other.

Neito

Neito is a new Alice-like keyboard but with a ISO-enter. There has been one similar one before called "Majbritt" but this one has a slightly different layout, support for encoder and really soon a GB so you can actually get your hands on it!

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

OlliGranlund and others added 18 commits October 26, 2020 21:22
@OlliGranlund
manually fixing submodules issue
8b10f7f
@OlliGranlund
adding GPL text
50f9add
@OlliGranlund
Added more GPL text, made requested edits to keymaps
4b7523f
@OlliGranlund
Neito qmk init, still bug with compile but almost ready
df4046d
@OlliGranlund
Merge branch 'master' into dev
1a048f9
@OlliGranlund
minor adjustements to neito
febee1c
@OlliGranlund
moving neito-keyboard related files to right location as it's not a h…
c375e92 
…andwired keyboard
@OlliGranlund
fixing readme for neito keyboard
31a1cca
@OlliGranlund
Adjusting neito keyboard properties and adding VIA support
d830400
@OlliGranlund
Adjusting product ID for neito keyboard
49b5e70
@OlliGranlund
Adding comment for neito-keyboard vendor ID
24868af
@OlliGranlund
removed unused keymap from neito keyboard
5537429
@OlliGranlund
Adding back via-keymap with via-support in rules.mk
161fe27
@OlliGranlund
4 layers for neito keyboard, layouts need still work
f89abd8
@OlliGranlund
Neito keymaps and conf
772f941
@OlliGranlund
rgb brightness limit
f9e2c18
@OlliGranlund
updated readme for Neito
58d1e95
@OlliGranlund
Merge branch 'master' into dev
d810be5
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 2, 2021
drashna
drashna requested changes Feb 5, 2021
View reviewed changes
keyboards/neito/config.h Outdated Show resolved Hide resolved
keyboards/neito/neito.c Outdated Show resolved Hide resolved
keyboards/neito/rules.mk Outdated Show resolved Hide resolved
drashna
drashna approved these changes Feb 7, 2021
View reviewed changes
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.

In general, we prefer/recommend/require that PRs be separated out, when they're different scopes (eg, keyboard vs keymap).

I think that this should be fine here, but in the future...

@OlliGranlund
Copy link
Contributor Author

Will keep that in mind for next time! My thought process was that it would take less effort to have the minor additional change added in this PR as it's relevant and would be easier to approve/deny. Will do those in the future in a new PR :)

@drashna
Copy link
Member

drashna commented Feb 12, 2021

Can definitely understand that. But it makes it easier to review when there are fewer files. And if something needs to be reverted...

@drashna drashna requested a review from a team February 12, 2021 01:05
fauxpark
fauxpark requested changes Feb 14, 2021
View reviewed changes
keyboards/neito/rules.mk Outdated Show resolved Hide resolved
keyboards/neito/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/neito/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/neito/info.json Outdated Show resolved Hide resolved
keyboards/neito/info.json Outdated Show resolved Hide resolved
keyboards/neito/readme.md Outdated Show resolved Hide resolved
keyboards/neito/readme.md Outdated Show resolved Hide resolved
keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/config.h Outdated Show resolved Hide resolved
keyboards/dz60/keymaps/olligranlund_iso_v2/readme.md Outdated Show resolved Hide resolved
keyboards/dz60/keymaps/olligranlund_iso/readme.md Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team April 20, 2021 17:52
noroadsleft
noroadsleft requested changes May 13, 2021
View reviewed changes
keyboards/keebio/iris/keymaps/olligranlund_nordic_v2/keymap.c Outdated Show resolved Hide resolved
keyboards/neito/readme.md Outdated Show resolved Hide resolved
keyboards/neito/readme.md Show resolved Hide resolved
@OlliGranlund OlliGranlund requested a review from noroadsleft May 15, 2021 13:19
@OlliGranlund
Fixing Neito matrix, fixing all keymaps to work with clearer matrix, …
af2c509 
…making default keymaps simpler and splitting specific keymap to own folder, adjusting RGB array, adding libs for better debug/via use
@OlliGranlund
ESC to GESC, fixing copyright texts
8225e11
@OlliGranlund
Copy link
Contributor Author

The implementation of Neito-keyboard in this PR works fine, but I've cleaned this up and made its matrix more clear. If I were to push the change here, it wouldn't be fair to you so I guess I'm waiting for this to be merged so that I can make another PR for the improvements.

https://github.com/OlliGranlund/qmk_firmware/tree/neito-fixed

I also thought about making an own PR for neito-fixed but I fear that it'll just be double work for you and has a risk of messing things up. I guess it's best to wait that this is merged?

@drashna
Copy link
Member

drashna commented May 22, 2021

Honestly, I'd prefer the changes be added here. From the looks of it, it's not too much, so should be fine.

@OlliGranlund
Copy link
Contributor Author

I've merge my branch into this PR. The Neito default and via keymaps are really baseline and I separate my own "optimized" layout to it's own keymap folder.

fauxpark
fauxpark requested changes May 22, 2021
View reviewed changes
keyboards/neito/rules.mk Outdated Show resolved Hide resolved
@OlliGranlund OlliGranlund requested a review from fauxpark May 22, 2021 13:57
@OlliGranlund
Copy link
Contributor Author

I think git has become confused as the proposed changes have been made but it still says there are some requested things left to handle.

@OlliGranlund
Copy link
Contributor Author

This PR has been up for nearly 4 months. I wonder what else there is to be done to get it merged? The requested changes by Github seems bugged as I've done the changes already.

@OlliGranlund
Copy link
Contributor Author

Updated the Neito encoders to support the latest version of QMK, hopefully this will help with approving this PR :)

@drashna
Copy link
Member

drashna commented Jul 16, 2021

Thanks!

@drashna drashna merged commit 455a988 into qmk:master Jul 16, 2021
@OlliGranlund OlliGranlund mentioned this pull request Jul 16, 2021
Merged
6 tasks
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@OlliGranlund @nhongooi
[Keyboard] Neito + my DZ60 keymap tweaks (qmk#11773)
31720f5
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

@drashna drashna drashna approved these changes

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

Assignees
No one assigned
Labels
awaiting review keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@OlliGranlund @drashna @fauxpark @noroadsleft