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 wings42 keyboard #12734

Merged
merged 27 commits into from
Jul 3, 2021
Merged

Add wings42 keyboard #12734

merged 27 commits into from
Jul 3, 2021

Conversation

yfuku
Copy link
Contributor

@yfuku yfuku commented Apr 29, 2021

Description

add wings42 keyboard

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 dependencies keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Apr 29, 2021
@yfuku yfuku mentioned this pull request Apr 29, 2021
Merged
6 tasks
drashna
drashna requested changes May 30, 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.

You have changes to a couple of git submodules.

You'll probably need to rebase to fix the issue.

keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/readme.md Show resolved Hide resolved
yfuku and others added 10 commits May 31, 2021 11:47
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
256e745 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
1d5ae77 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
44f6c3a 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
fe30bba 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/via/keymap.c
7bf1184 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
420f0e0 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
49d1ebb 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
d946255 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
d091edb 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku
fix
594927f
@yfuku
Copy link
Contributor Author

yfuku commented May 31, 2021

You have changes to a couple of git submodules.

You'll probably need to rebase to fix the issue.

Thank you for reviewing it.
I've fixed the git submodules.

drashna
drashna requested changes Jul 3, 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.

Since the layout matches the split_3x6_3 layout, should add support for that.

would also need LAYOUTS = split_3x6_3 in the rev1 rules.mk file.

keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/wings42/rev1/rev1.h Outdated Show resolved Hide resolved
keyboards/wings42/wings42.h Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/rev1_extkeys.h Outdated Show resolved Hide resolved
keyboards/wings42/rev1_extkeys/readme.md Show resolved Hide resolved
yfuku and others added 2 commits July 3, 2021 19:31
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
90c8871 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
394583c 
Co-authored-by: Drashna Jaelre <drashna@live.com>
yfuku and others added 6 commits July 3, 2021 19:31
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
9253de7 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/keymaps/default/keymap.c
b659c0a 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1/rev1.h
060b52f 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/wings42.h
94fb7f0 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku @drashna
Update keyboards/wings42/rev1_extkeys/rev1_extkeys.h
88e01a2 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku
The same change is applied to the via keymap.
080ced2
@yfuku
Copy link
Contributor Author

yfuku commented Jul 3, 2021

@drashna
Thank you.
I tested it and it was fine.

@drashna drashna requested a review from a team July 3, 2021 15:12
@drashna
Copy link
Member

drashna commented Jul 3, 2021

Thanks!

@drashna drashna merged commit 3b1506b into qmk:master Jul 3, 2021
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Jul 4, 2021
Merge branch 'develop' of /~https://github.com/qmk/qmk_firmware into de…
0e12685 
…velop

* 'develop' of /~https://github.com/qmk/qmk_firmware: (37 commits)
  [Keyboard] Add CX60 (qmk#13402)
  Specskeys Configurator Bugfix and Refactor (qmk#13439)
  [Keyboard] IDOBAO ID67 (qmk#13378)
  [Keyboard] ortho boards from the technik gb (qmk#13382)
  [Keyboard] Add soldered variant of Titan 65 keyboard.  (qmk#13270)
  Pisces: correct layout macro reference in info.json (qmk#13410)
  [Keymap] Update Miryoku (qmk#13307)
  [Keyboard] Add wings42 keyboard (qmk#12734)
  [Keyboard] Added LAYOUT_60_iso_split_rshift to ok60 (qmk#12902)
  [Keymap] Jonavin merc additional encoder functionality (qmk#13039)
  [Bug] Pachi RGB - fix rgb placement (qmk#13428)
  AW20216 use register increment for framebuffer flushes (qmk#13430)
  Improve 'show_build_options' target (qmk#13425)
  [Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (qmk#13406)
  [Keymap] Jonavin quefrency keymap add encoder functionality + 2tap Shift CAPSLOCK (qmk#13376)
  [Docs] RGB Matrix Caps Lock and Layer indicator example (qmk#13367)
  [Keymap] Add stanrc85 community layout (qmk#13338)
  [Keymap] 2Moons-JP Keymap Update (qmk#13279)
  [Keyboard] Added pistachio rev2 (qmk#13248)
  [Keymap] niclake - Keymap updates - Boardwalk updates & DZ60 create (qmk#13245)
  ...
jakeprime pushed a commit to jakeprime/qmk_firmware that referenced this pull request Jul 10, 2021
@yfuku @drashna @jakeprime
[Keyboard] Add wings42 keyboard (qmk#12734)
9887aad 
Co-authored-by: Drashna Jaelre <drashna@live.com>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
@yfuku @drashna @HokieGeek
[Keyboard] Add wings42 keyboard (qmk#12734)
3aa46e5 
Co-authored-by: Drashna Jaelre <drashna@live.com>
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
@yfuku @drashna @wox
[Keyboard] Add wings42 keyboard (qmk#12734)
92379cb 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@yfuku yfuku deleted the topic-wings42 branch August 15, 2021 11:45
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@yfuku @drashna @nhongooi
[Keyboard] Add wings42 keyboard (qmk#12734)
a2e4406 
Co-authored-by: Drashna Jaelre <drashna@live.com>
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

Assignees
No one assigned
Labels
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.
3 participants
@yfuku @drashna @fauxpark