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

Adding bootleg and waffling60 rev b #10846

Merged
merged 80 commits into from
Dec 1, 2020
Merged

Adding bootleg and waffling60 rev b #10846

merged 80 commits into from
Dec 1, 2020

Conversation

4pplet
Copy link
Contributor

@4pplet 4pplet commented Nov 3, 2020

Description

Adding bootleg (non tray-mount 60% PCB) and waffling60 rev b (Updated matrix and RGB-led implementation that fits QMK better). Thanks! :)

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

Stefan and others added 30 commits April 26, 2020 22:54
added 4pplet keyboards
a16ded6 
added 4pplet keyboards
@fauxpark
Update keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h
40e5cc0 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/aekiso60_rev_a/config.h
bade8f8 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/aekiso60_rev_a/config.h
d53da6e 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/waffling60_rev_a/config.h
77de85c 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/aekiso60_rev_a/rules.mk
02e21ac 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/aekiso60_rev_a/rules.mk
2ff611d 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/waffling60_rev_a/rules.mk
99205e0 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/waffling60_rev_a/rules.mk
8264359 
Co-Authored-By: Ryan <[email protected]>
@fauxpark
Update keyboards/4pplet/steezy60_rev_a/config.h
ffa2342 
Co-Authored-By: Ryan <[email protected]>
Delete info.json
de2a112
Delete info.json
d0f4f66
Delete info.json
9fe7bf8
removed VIA_ENABLE
aab47a7
Update config.h
8c04f91
Update rules.mk
ddb0505
Update steezy60_rev_a.h
dad690f
Update config.h
f4587a1
Removed VIA_ENABLE
82a0f1a
@fauxpark
Update keyboards/4pplet/steezy60_rev_a/rules.mk
c623a2d 
Co-Authored-By: Ryan <[email protected]>
Removed VIA_ENABLE
e3192f9
Update config.h
976afae
Update config.h
cc1c93b
Update config.h
65bd3b6
adding fauxpark suggestion
d663067
@noroadsleft
Update keyboards/4pplet/aekiso60_rev_a/config.h
bf665cc 
Co-Authored-By: James Young <[email protected]>
@noroadsleft
Update keyboards/4pplet/aekiso60_rev_a/rules.mk
cf6750c 
Co-Authored-By: James Young <[email protected]>
some updates recommended by noroadsleft, still work in progress
20e4790 
some updates recommended by noroadsleft, still work in progress
made directorys for revisions per noroadsleft suggestion
9832d66 
made directorys for revisions per noroadsleft  suggestion
renamed keyboard_pre_init_user to keyboard_pre_init_kb
a4e6fd0
@drashna drashna requested a review from a team November 25, 2020 19:14
fauxpark
fauxpark requested changes Nov 26, 2020
View reviewed changes
keyboards/4pplet/bootleg/README.md Outdated Show resolved Hide resolved
keyboards/4pplet/bootleg/rev_a/config.h Outdated Show resolved Hide resolved
keyboards/4pplet/bootleg/rev_a/rules.mk Outdated Show resolved Hide resolved
keyboards/4pplet/bootleg/rev_a/rules.mk Outdated Show resolved Hide resolved
keyboards/4pplet/waffling60/rev_b/config.h Outdated Show resolved Hide resolved
keyboards/4pplet/waffling60/rev_b/rev_b.c Outdated Show resolved Hide resolved
keyboards/4pplet/waffling60/rev_b/rules.mk Outdated Show resolved Hide resolved
keyboards/4pplet/waffling60/rev_b/rules.mk Outdated Show resolved Hide resolved
4pplet and others added 9 commits November 26, 2020 12:55
@4pplet 4pplet requested a review from fauxpark November 26, 2020 11:58
@fauxpark fauxpark requested a review from a team November 26, 2020 12:03
@4pplet 4pplet mentioned this pull request Nov 26, 2020
Merged
6 tasks
@4pplet
Copy link
Contributor Author

4pplet commented Nov 30, 2020

Everything should be in order for merge? :)

@fauxpark
Copy link
Member

fauxpark commented Dec 1, 2020

Thanks!

@fauxpark fauxpark merged commit c7dab4b into qmk:master Dec 1, 2020
xgnxs pushed a commit to xgnxs/qmk_firmware that referenced this pull request Jan 9, 2021
@fauxpark @noroadsleft
@drashna @xgnxs
Adding bootleg and waffling60 rev b (qmk#10846)
60b59f5 
Co-authored-by: Ryan <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
@4pplet 4pplet deleted the 4pplet_keyboards branch January 31, 2021 19:15
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
@4pplet @drashna @fauxpark