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 soy20 PCB #10440

Merged
merged 33 commits into from
Oct 4, 2020
Merged

Add soy20 PCB #10440

merged 33 commits into from
Oct 4, 2020

Conversation

Friend-Or-F0H
Copy link
Contributor

adds default and VIA Keymaps for soy20 pcb by DrewKeys

Description

Added QMK support for Soy20 PCB by DrewKeys. Folded in VIA support with PR# 335 at Via repo (the-via/keyboards#335)

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

Corrects issues with initial pull request from PR# 10428 (#10428)
*

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

@Friend-Or-F0H
Add soy20 PCB
d646635 
adds default and VIA Keymaps for soy20 pcb by DrewKeys
@ridingqwerty
Copy link
Contributor

Much better! :)

ridingqwerty
ridingqwerty requested changes Sep 25, 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.

Just some updates to conventions/terminology and culling of unused bits.

keyboards/soy20/config.h Outdated Show resolved Hide resolved
keyboards/soy20/config.h Outdated Show resolved Hide resolved
keyboards/soy20/rules.mk Outdated Show resolved Hide resolved
keyboards/soy20/soy20.h Outdated Show resolved Hide resolved
keyboards/soy20/config.h Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/config.h Outdated Show resolved Hide resolved
keyboards/soy20/config.h Outdated Show resolved Hide resolved
keyboards/soy20/rules.mk Outdated Show resolved Hide resolved
Friend-Or-F0H and others added 12 commits September 25, 2020 15:31
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/config.h
1b100aa 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/config.h
0fb69b7 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/rules.mk
660bb38 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/soy20.h
20891c3 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/keymaps/via/keymap.c
9ff8534 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/keymaps/via/keymap.c
833a8e4 
Agreed. It was left over from the original file provided by the board makers original configurator file.

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/rules.mk
242c67d 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/config.h
274133f 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/config.h
8236bb2 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/config.h
ee843bf 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/keymaps/default/keymap.c
c6e9ef7 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H @ridingqwerty
Update keyboards/soy20/keymaps/default/keymap.c
4fa872a 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
@Friend-Or-F0H Friend-Or-F0H mentioned this pull request Sep 28, 2020
Merged
5 tasks
fauxpark
fauxpark requested changes Oct 1, 2020
View reviewed changes
keyboards/soy20/info.json Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/readme.md Outdated Show resolved Hide resolved
keyboards/soy20/rules.mk Outdated Show resolved Hide resolved
keyboards/soy20/rules.mk Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/soy20/info.json Outdated Show resolved Hide resolved
Friend-Or-F0H and others added 11 commits October 1, 2020 14:46
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/info.json
8f15137 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/readme.md
9355539 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/rules.mk
b0c3d7e 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/rules.mk
afbe972 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/rules.mk
d635d62 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/soy20.h
8e1b86f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/default/keymap.c
0df3868 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/default/keymap.c
81760c3 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/default/keymap.c
7604d20 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/via/keymap.c
5c264e8 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/via/keymap.c
da2dbfb 
Co-authored-by: Ryan <fauxpark@gmail.com>
Friend-Or-F0H and others added 2 commits October 1, 2020 14:54
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/keymaps/via/keymap.c
7ed9a0e 
Co-authored-by: Ryan <fauxpark@gmail.com>
@Friend-Or-F0H @fauxpark
Update keyboards/soy20/info.json
b29673e 
Co-authored-by: Ryan <fauxpark@gmail.com>
zvecr
zvecr requested changes Oct 1, 2020
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

Also, from the PR checklist

valid license headers on all *.c and *.h source files
GPL2/GPL3 recommended for consistency
other licenses are permitted, however they must be GPL-compatible and must allow for redistribution. Using a different license will almost certainly delay a PR getting merged.

keyboards/soy20/config.h Outdated Show resolved Hide resolved
@Friend-Or-F0H
Copy link
Contributor Author

Also, from the PR checklist

valid license headers on all *.c and *.h source files
GPL2/GPL3 recommended for consistency
other licenses are permitted, however they must be GPL-compatible and must allow for redistribution. Using a different license will almost certainly delay a PR getting merged.

Added.

@zvecr
Copy link
Member

zvecr commented Oct 1, 2020

@Friend-Or-F0H Can you take another look at those headers, they are not valid C comments.

@drashna drashna merged commit 89446ba into qmk:master Oct 4, 2020
@Friend-Or-F0H Friend-Or-F0H deleted the soy20 branch October 6, 2020 13:23
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
@Friend-Or-F0H @ridingqwerty
@fauxpark @zvecr
[Keyboard] Add soy20 PCB (qmk#10440)
5016999 
* Add soy20 PCB

adds default and VIA Keymaps for soy20 pcb by DrewKeys

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/soy20.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Agreed. It was left over from the original file provided by the board makers original configurator file.

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/soy20.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Updating *.c & *.h files with GPL3 license

* Delete rules.mk

* Delete keymap.c

* Corrected Header Comments

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
@Friend-Or-F0H @ridingqwerty
@fauxpark @zvecr
[Keyboard] Add soy20 PCB (qmk#10440)
5522eb7 
* Add soy20 PCB

adds default and VIA Keymaps for soy20 pcb by DrewKeys

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/soy20.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Agreed. It was left over from the original file provided by the board makers original configurator file.

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/soy20/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/soy20.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/keymaps/via/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/soy20/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Updating *.c & *.h files with GPL3 license

* Delete rules.mk

* Delete keymap.c

* Corrected Header Comments

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr requested changes

@ridingqwerty ridingqwerty ridingqwerty approved these changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@Friend-Or-F0H @ridingqwerty @zvecr @drashna @fauxpark