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.

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

New keyboard: wsk/g4m3ralpha #10431

Merged
merged 18 commits into from
Oct 1, 2020
Merged

New keyboard: wsk/g4m3ralpha #10431

merged 18 commits into from
Oct 1, 2020

Conversation

ridingqwerty
Copy link
Contributor

Description

This keyboard is a variant of Alpha28 by PyroL with a partial numrow.
Submitted on behalf of Worldspawn00.

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

keyboards/wsk/g4m3ralpha/config.h Outdated Show resolved Hide resolved
keyboards/wsk/g4m3ralpha/rules.mk Outdated Show resolved Hide resolved
keyboards/wsk/g4m3ralpha/g4m3ralpha.c Show resolved Hide resolved
keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@zvecr zvecr requested a review from a team September 26, 2020 23:39
keyboards/wsk/g4m3ralpha/config.h Outdated Show resolved Hide resolved
keyboards/wsk/g4m3ralpha/info.json Outdated Show resolved Hide resolved
keyboards/wsk/g4m3ralpha/rules.mk Outdated Show resolved Hide resolved
@zvecr zvecr merged commit 7264995 into qmk:master Oct 1, 2020
@zvecr
Copy link
Member

zvecr commented Oct 1, 2020

Thanks!

rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* Add new keyboard: wsk/g4m3ralpha

* Added license attribution to .{c,h} files

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/g4m3ralpha.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: James Young <[email protected]>

* Update keyboards/wsk/g4m3ralpha/info.json

Co-authored-by: James Young <[email protected]>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Ryan <[email protected]>

Co-authored-by: worldspawn00 <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* Add new keyboard: wsk/g4m3ralpha

* Added license attribution to .{c,h} files

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/g4m3ralpha.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: James Young <[email protected]>

* Update keyboards/wsk/g4m3ralpha/info.json

Co-authored-by: James Young <[email protected]>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Ryan <[email protected]>

Co-authored-by: worldspawn00 <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants