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

[Keyboard] Maartenwut Wonderland PCB #6492

Merged
merged 14 commits into from
Aug 25, 2019
Merged

Conversation

yanfali
Copy link
Contributor

@yanfali yanfali commented Aug 5, 2019

Adds Maartenwut Wonderland PCB to QMK. Will be used in the upcoming lubrigante GB and sold separately with a mini-usb connector for people who want to replace their Alice PCBs.

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

keyboards/wonderland/config.h Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
keyboards/wonderland/wonderland.c Outdated Show resolved Hide resolved
@yanfali
Copy link
Contributor Author

yanfali commented Aug 6, 2019

@fauxpark good points. I will get keebs to test firmware before adding to main repo.

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 great timing, because I just merged a PR that puts all Maarten's keyboards in keyboards/maartenwut/. These files will need to be moved.

keyboards/wonderland/rules.mk Outdated Show resolved Hide resolved
keyboards/wonderland/config.h Outdated Show resolved Hide resolved
@yanfali yanfali force-pushed the yanfali-wonderland branch from 8807846 to 88bd68b Compare August 7, 2019 16:53
@yanfali
Copy link
Contributor Author

yanfali commented Aug 9, 2019

TODO: info.json and README.md

@yanfali
Copy link
Contributor Author

yanfali commented Aug 25, 2019

@noroadsleft you still have issues with this PR?

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.

@yanfali Nothing that can't wait for a different PR. Looks good!

@noroadsleft noroadsleft merged commit f6da00b into qmk:master Aug 25, 2019
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Aug 27, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (42 commits)
  pegasushoof Specify the bootloader to use :flash (qmk#6614)
  Fix Typo in :flash target for missing bootloader (qmk#6615)
  Mars80 Bug: Physical/Electrical Matrix Mismatch (qmk#6612)
  [Keymap] Redox_w Use layer_state_set_user instead of matrix_scan_user (qmk#6608)
  Added OLED Display autoscroll during periods of OLED data inactivity (qmk#6546)
  Refactor `qmk compile-json` to `qmk compile` (qmk#6592)
  RGB Inidcator example for new van pcbs (qmk#6544)
  Add new 60% Tsangan HHKB layout (qmk#6607)
  [Keyboard] Maartenwut Wonderland PCB (qmk#6492)
  Add 2015 revision of Pegasus Hoof to QMK (qmk#6595)
  [Keyboard] New Keyboard: EVE Meteor (qmk#6565)
  updates the coc
  [Keymap] a keymap to "transform" a jj40 info a simil Alpha28, to enjoy its simplicity and power (qmk#6599)
  [Keyboard] Add JNAO keyboard (qmk#6598)
  [Keymap] ISO keymap for TADA68 with programming in mind (qmk#6597)
  [Keymap] Update to userspace kuchosauroand0 (qmk#6596)
  Add 'bootloadHID' flash target (qmk#5587)
  Add Zadig 101 to docs (qmk#6585)
  Add Soft Serial Speed to Diverge3 keyboard config for compatibility (qmk#5076)
  Added 4by3 keyboard (qmk#6547)
  ...
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
* Initial Commit

* ID

* Use current manu name

* Fix define DEBOUNCE

Co-Authored-By: fauxpark <[email protected]>

* Fix NUM Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix CAPs LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix Scroll Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Use correct convention for setting pins

* Move folder to maartenwut

 - enable velocikey

* Fix columns size

* Sync with homerowco

* Add Keebs keymap

* Best practices

* Latest keymap changes from homerowco
swanmatch pushed a commit to swanmatch/qmk_firmware that referenced this pull request Sep 3, 2019
* Initial Commit

* ID

* Use current manu name

* Fix define DEBOUNCE

Co-Authored-By: fauxpark <[email protected]>

* Fix NUM Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix CAPs LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix Scroll Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Use correct convention for setting pins

* Move folder to maartenwut

 - enable velocikey

* Fix columns size

* Sync with homerowco

* Add Keebs keymap

* Best practices

* Latest keymap changes from homerowco
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* Initial Commit

* ID

* Use current manu name

* Fix define DEBOUNCE

Co-Authored-By: fauxpark <[email protected]>

* Fix NUM Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix CAPs LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix Scroll Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Use correct convention for setting pins

* Move folder to maartenwut

 - enable velocikey

* Fix columns size

* Sync with homerowco

* Add Keebs keymap

* Best practices

* Latest keymap changes from homerowco
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* Initial Commit

* ID

* Use current manu name

* Fix define DEBOUNCE

Co-Authored-By: fauxpark <[email protected]>

* Fix NUM Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix CAPs LED detection

Co-Authored-By: fauxpark <[email protected]>

* Fix Scroll Lock LED detection

Co-Authored-By: fauxpark <[email protected]>

* Use correct convention for setting pins

* Move folder to maartenwut

 - enable velocikey

* Fix columns size

* Sync with homerowco

* Add Keebs keymap

* Best practices

* Latest keymap changes from homerowco
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants