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 royal directory and add 2 keyboard releases #8877

Merged
merged 16 commits into from
Apr 27, 2020
Merged

Add royal directory and add 2 keyboard releases #8877

merged 16 commits into from
Apr 27, 2020

Conversation

The-Royal
Copy link
Contributor

@The-Royal The-Royal commented Apr 22, 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.
  • 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).

@The-Royal The-Royal changed the title Royal april branch Add royal directory and add 2 keyboard releases Apr 22, 2020
ridingqwerty
ridingqwerty requested changes Apr 22, 2020
View reviewed changes
Copy link
Contributor

@ridingqwerty ridingqwerty left a comment

Choose a reason for hiding this comment

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

Mostly some indentation and alignment stuff.

I made a comment re: a double-tapdance on both KC_QUOTE and KC_DQT -- I'm not certain KC_DQT will work there as it's a shifted character.

I also changed the indexing on the LAYOUT macros. Not a stopper for me, but I think it's clearer with 0-based indexing on both rows and columns, and hex digits for the higher column numbers.

keyboards/the_royal/liminal/keymaps/default/config.h Outdated Show resolved Hide resolved
keyboards/the_royal/liminal/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/liminal/keymaps/default/keymap.c Show resolved Hide resolved
keyboards/the_royal/liminal/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/liminal/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/schwann.h Outdated Show resolved Hide resolved
keyboards/the_royal/liminal/liminal.h Outdated Show resolved Hide resolved
@The-Royal
Copy link
Contributor Author

@ridingqwerty Okay why is this failing now lol

@The-Royal
Copy link
Contributor Author

I guess its because I deleted my #define TAPPING_TERM but I reference that in my Per-Key tapdancing stuff.

How do I format that?

      return 200;
  }

Like this?

@The-Royal
Copy link
Contributor Author

Cool, I Fixed it :D

@ridingqwerty
Copy link
Contributor

Cool, I Fixed it :D

Nice. I'm a little stumped why that mucked with get_tapping_term, which is implemented in action_tapping.c, and action_tapping.h has the core define for TAPPING_TERM. I'll probably back off suggesting people remove that setting when it's 200.

@The-Royal The-Royal requested a review from drashna April 24, 2020 17:18
@zvecr zvecr requested a review from a team April 25, 2020 21:14
@zvecr zvecr added the breaking_change Changes that need to wait for a version increment label Apr 25, 2020
@The-Royal
Copy link
Contributor Author

@zvecr Whats does the breaking_change label mean?

@zvecr
Copy link
Member

zvecr commented Apr 25, 2020

sorry that was a bad click...

@zvecr zvecr added keyboard and removed breaking_change Changes that need to wait for a version increment labels Apr 25, 2020
zvecr
zvecr requested changes Apr 25, 2020
View reviewed changes
keyboards/the_royal/schwann/rules.mk Outdated Show resolved Hide resolved
noroadsleft
noroadsleft requested changes Apr 27, 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.

Also, should put a rules.mk alongside keyboards/the_royal/schwann/keymaps/default/keymap.c with TAP_DANCE_ENABLE = yes, so it compiles.

keyboards/the_royal/liminal/readme.md Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/info.json Outdated Show resolved Hide resolved
keyboards/the_royal/schwann/readme.md Outdated Show resolved Hide resolved
@The-Royal
Copy link
Contributor Author

Cool got it all up to date

noroadsleft
noroadsleft approved these changes Apr 27, 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 merged commit c7449b3 into qmk:master Apr 27, 2020
@noroadsleft
Copy link
Member

Thanks!

@The-Royal
Copy link
Contributor Author

Awesome! Thanks again for everything you guy do! @ridingqwerty @zvecr @noroadsleft @drashna @fauxpark

mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request May 3, 2020
@The-Royal @mrlinuxfish
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
2b64eb5 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@The-Royal @lorenzoernesto
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
653fbd0 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@The-Royal @sowbug
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
5795ada 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@The-Royal @turky
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
3d429d1 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@The-Royal @jakobaa
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
a4a4279 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
@The-Royal @sjmacneil
[Keyboard] Add royal directory and add 2 keyboard releases (qmk#8877)
e83567b 
* add royal project folder and 2 released keyboards

* fix iso keymap clarification

* Apply suggestions from code review

* Update keyboards/the_royal/schwann/schwann.h

* Update keyboards/the_royal/liminal/liminal.h

* Update keyboards/the_royal/schwann/keymaps/default/keymap.c

* Apply suggestions from code review

new

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review

* Update rules.mk

* add rules.mk to schwann default

* Apply suggestions from code review

* add rules.mk to shwann default
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr requested changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

@ridingqwerty ridingqwerty Awaiting requested review from ridingqwerty

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

None yet
6 participants
@The-Royal @ridingqwerty @zvecr @noroadsleft @drashna @fauxpark