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 keymaps #10328

Merged
merged 25 commits into from
Oct 4, 2020
Merged

Add keymaps #10328

merged 25 commits into from
Oct 4, 2020

Conversation

winterNebs
Copy link
Contributor

@winterNebs winterNebs commented Sep 16, 2020 •
edited
Loading

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

@winterNebs winterNebs changed the title merge Add keymaps Sep 16, 2020
drashna
drashna requested changes Sep 20, 2020
View reviewed changes
keyboards/keebio/nyquist/keymaps/winterNebs/config.h Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/rules.mk Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team September 20, 2020 23:05
@drashna drashna added the keymap label Sep 20, 2020
@winterNebs
Copy link
Contributor Author

Thank you for taking the time to make these suggestions!

A lot of these, I guess, were artifacts from the default keymaps of various boards, and I sort of just had the "if it ain't broke don't fix it" mentality.

noroadsleft
noroadsleft requested changes Sep 21, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

keyboards/planck/keymaps/winterNebs/readme.md Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/rules.mk Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/rules.mk Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
winterNebs
winterNebs commented Sep 21, 2020
View reviewed changes
Copy link
Contributor Author

@winterNebs winterNebs left a comment

Choose a reason for hiding this comment

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

Ok looks good

drashna
drashna requested changes Sep 22, 2020
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.

Also, could you make sure that the keymap folder names are all lowercase?

keyboards/kyria/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
keyboards/planck/keymaps/winterNebs/keymap.c Outdated Show resolved Hide resolved
@winterNebs winterNebs mentioned this pull request Sep 22, 2020
Merged
14 tasks
winterNebs and others added 20 commits September 23, 2020 00:52
@winterNebs
Add kyria keymap
cff9a13
@winterNebs
Add planck keymap
544e321
@winterNebs
Add nyquist keymap
a3b17a6
@winterNebs
Add vim movement instead of regular movement layer
09e4e5c
@winterNebs
Use partial home row mods :)
0872882
@winterNebs @drashna
Update keyboards/keebio/nyquist/keymaps/winterNebs/config.h
3b94b72 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c
c9865d4 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c
db2c94c 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c
b869414 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c
5264917 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/kyria/keymaps/winterNebs/keymap.c
927d97a 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/kyria/keymaps/winterNebs/rules.mk
9f7af1f 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/planck/keymaps/winterNebs/keymap.c
20ce34d 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/planck/keymaps/winterNebs/keymap.c
07890e4 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @drashna
Update keyboards/planck/keymaps/winterNebs/keymap.c
eb135a3 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs
Fix outdated function call
34fe1cd
@winterNebs @noroadsleft @drashna
Apply suggestions from code review
fc7637d 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@winterNebs @noroadsleft
Update keyboards/kyria/keymaps/winterNebs/keymap.c
a8f0b35 
somehow this wasn't added to the batch?

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@winterNebs
remove deprecated function
e6ae801
@winterNebs
Rename to lowercase
0b7375e
noroadsleft
noroadsleft approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft 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 to me.

@noroadsleft noroadsleft requested a review from a team September 24, 2020 02:35
drashna
drashna approved these changes Oct 4, 2020
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.

LGTM, thanks!

@drashna drashna merged commit 1afb394 into qmk:master Oct 4, 2020
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Oct 7, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
15be960 
* 'master' of https://github.com/qmk/qmk_firmware: (178 commits)
  Docs: fix udev rules
  [CLI] Add c2json (qmk#8817)
  Improve LAYOUT macro searching (qmk#9530)
  CLI: update subcommands to use return instead of exit() (qmk#10323)
  Fixes small typo in docs (qmk#10515)
  Update personal keymap for Let's Split keyboard. (qmk#10536)
  [Keymap] Move my custom functions and keymaps to userspace (qmk#10502)
  [Keyboard] add support for ymd75 rev3 (qmk#10483)
  [Keyboard] Add soy20 PCB (qmk#10440)
  Fix for MIDI sustain effect issue (qmk#10361)
  format code according to conventions [skip ci]
  [Keyboard] Add Yugo-M Controller (qmk#10389)
  [Keymap] Add onekey keymap for OLED testing (qmk#10380)
  [Keymap] Add winterNebs keymaps  (qmk#10328)
  [Keymap] Added 333fred 5x6_5 keymap (qmk#10272)
  [Keyboard] Add hannah60rgb rev.2 PCB (qmk#10287)
  Adding VIA support to katana60 rev2 (qmk#10442)
  OLED driver fixes (qmk#10377)
  IS31FL3741 driver fixup (qmk#10519)
  add info.json for XD75 keyboard (qmk#10523)
  ...
barrettclark pushed a commit to barrettclark/qmk_firmware that referenced this pull request Oct 8, 2020
Merge remote-tracking branch 'upstream/master' into master
5a529c4 
* upstream/master: (81 commits)
  [Keyboard] New keyboard - eiri (qmk#10529)
  [Keymap] Add niu mini dye sub keymap (qmk#10525)
  Clean ChibiOS platform files (qmk#10505)
  [Keyboard] LeftyNumpad Keyboard (qmk#10500)
  [Keyboard] add maja capslock indicator (qmk#10151)
  Fix issue introduced by PR#10404 (qmk#10559)
  Docs: fix udev rules
  [CLI] Add c2json (qmk#8817)
  Improve LAYOUT macro searching (qmk#9530)
  CLI: update subcommands to use return instead of exit() (qmk#10323)
  Fixes small typo in docs (qmk#10515)
  Update personal keymap for Let's Split keyboard. (qmk#10536)
  [Keymap] Move my custom functions and keymaps to userspace (qmk#10502)
  [Keyboard] add support for ymd75 rev3 (qmk#10483)
  [Keyboard] Add soy20 PCB (qmk#10440)
  Fix for MIDI sustain effect issue (qmk#10361)
  format code according to conventions [skip ci]
  [Keyboard] Add Yugo-M Controller (qmk#10389)
  [Keymap] Add onekey keymap for OLED testing (qmk#10380)
  [Keymap] Add winterNebs keymaps  (qmk#10328)
  ...
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
@winterNebs @drashna @noroadsleft
[Keymap] Add winterNebs keymaps (qmk#10328)
47e5fb3 
* Add kyria keymap

* Add planck keymap

* Add nyquist keymap

* Add vim movement instead of regular movement layer

* Use partial home row mods :)

* Update keyboards/keebio/nyquist/keymaps/winterNebs/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix outdated function call

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

somehow this wasn't added to the batch?

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* remove deprecated function

* Rename to lowercase

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* fix oled path

* rebase and add back nyquist that was lost by rename

* Add licenses

* License in the wrong file

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
@winterNebs @drashna @noroadsleft
[Keymap] Add winterNebs keymaps (qmk#10328)
c31bfeb 
* Add kyria keymap

* Add planck keymap

* Add nyquist keymap

* Add vim movement instead of regular movement layer

* Use partial home row mods :)

* Update keyboards/keebio/nyquist/keymaps/winterNebs/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix outdated function call

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

somehow this wasn't added to the batch?

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* remove deprecated function

* Rename to lowercase

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* fix oled path

* rebase and add back nyquist that was lost by rename

* Add licenses

* License in the wrong file

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
winterNebs added a commit to winterNebs/qmk_firmware that referenced this pull request Dec 20, 2020
@winterNebs @drashna @noroadsleft
[Keymap] Add winterNebs keymaps (qmk#10328)
0d07878 
* Add kyria keymap

* Add planck keymap

* Add nyquist keymap

* Add vim movement instead of regular movement layer

* Use partial home row mods :)

* Update keyboards/keebio/nyquist/keymaps/winterNebs/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix outdated function call

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

somehow this wasn't added to the batch?

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* remove deprecated function

* Rename to lowercase

* Update keyboards/planck/keymaps/winterNebs/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* fix oled path

* rebase and add back nyquist that was lost by rename

* Add licenses

* License in the wrong file

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@winterNebs @drashna @noroadsleft