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 Macropad 6Pad ] #23099

Merged
merged 33 commits into from
Mar 20, 2024
Merged

[ Add Macropad 6Pad ] #23099

merged 33 commits into from
Mar 20, 2024

Conversation

zlabkeeb
Copy link
Contributor

@zlabkeeb zlabkeeb commented Feb 17, 2024 •
edited
Loading

Description

Add Macropad 6Pad Simple

  • Update PCB V2 ✅

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 keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 17, 2024
@waffle87 waffle87 requested a review from a team February 17, 2024 18:11
@zlabkeeb @waffle87
Update keyboards/zlabkeeb/6pad/info.json
2487dd9 
Co-authored-by: jack <0x6a73@protonmail.com>
waffle87
waffle87 requested changes Feb 18, 2024
View reviewed changes
keyboards/zlabkeeb/6pad/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/zlabkeeb/6pad/keymaps/via/keymap.c Outdated Show resolved Hide resolved
@waffle87
Copy link
Member

There are also some build failures that need to be addressed.

zlabkeeb and others added 2 commits February 19, 2024 07:16
@zlabkeeb @waffle87
Update keyboards/zlabkeeb/6pad/keymaps/default/keymap.c
92b34ed 
Co-authored-by: jack <0x6a73@protonmail.com>
@zlabkeeb @waffle87
Update keyboards/zlabkeeb/6pad/keymaps/via/keymap.c
6808d85 
Co-authored-by: jack <0x6a73@protonmail.com>
@zlabkeeb
Copy link
Contributor Author

There are also some build failures that need to be addressed.

how to fix this sir :(

@zlabkeeb @fauxpark
Update keyboards/zlabkeeb/6pad/rules.mk
cc94d05 
Co-authored-by: Ryan <fauxpark@gmail.com>
@zlabkeeb
Copy link
Contributor Author

Please check again, sir. Is there anything else that is still wrong? Since I am not busy at the moment
@waffle87 , @fauxpark

@waffle87 waffle87 requested a review from a team February 23, 2024 19:19
fauxpark
fauxpark requested changes Mar 13, 2024
View reviewed changes
keyboards/zlabkeeb/6pad/rev1/info.json Outdated Show resolved Hide resolved
@zlabkeeb @fauxpark
Update keyboards/zlabkeeb/6pad/rev1/info.json
1c5b38f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@zlabkeeb zlabkeeb requested a review from fauxpark March 13, 2024 13:36
drashna
drashna reviewed Mar 17, 2024
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.

Do you plan on having more than one revision of this?
If not, then it may be best to simply remove the rev1 stuff, and roll it into a single folder.

@zlabkeeb
Copy link
Contributor Author

Do you plan on having more than one revision of this? If not, then it may be best to simply remove the rev1 stuff, and roll it into a single folder.

Update Done!!
Please Check @drashna
Thanks

@zvecr zvecr merged commit 977f667 into qmk:master Mar 20, 2024
3 checks passed
@zlabkeeb zlabkeeb mentioned this pull request Mar 20, 2024
Merged
7 tasks
dlip added a commit to dlip/qmk_firmware that referenced this pull request Mar 21, 2024
@dlip
Merge remote-tracking branch 'upstream/master' into dlip
6077434 
* upstream/master: (40 commits)
  [Keyboard] Add marshkeys flowerpad (qmk#23240)
  Add TechnicPad macropad (qmk#23238)
  Add handwired/Jotlily60 (qmk#23212)
  Add the EQUATOR keyboard (qmk#23237)
  Support for slice65 from PizzaKeyboards (qmk#23148)
  Add Swiss support (qmk#23272)
  Assume only 32u4 boards can run 'promicro' converters (qmk#23312)
  Add Macropad 6Pad (qmk#23099)
  Fix invalid use of stemcell converter (qmk#23317)
  Updates to PR Checklist (qmk#23318)
  [Keyboard] Add posey_split v4/v5 (qmk#23258)
  Added WT65-H3 (HIBI HIBIKI) (qmk#22886)
  Added WT65-G3 (HIBI HIBIKI) (qmk#22888)
  Modify wording in 'getting_started_introduction.md' (qmk#23232)
  Bump tj-actions/changed-files from 42 to 43 (qmk#23282)
  AMJKeyboard AMJ96 Layout Additions (qmk#23267)
  Fixup cipulot eeprom. (qmk#23280)
  Update feature_tri_layer.md - typo (qmk#23275)
  [Keyboard] add glyphkbd_v2 (qmk#23131)
  Add support new kb_elmo PCBs (qmk#23138)
  ...
mzyt pushed a commit to mzyt/qmk_firmware that referenced this pull request May 6, 2024
@zlabkeeb
Add Macropad 6Pad (qmk#23099)
ed89c6c
girtsf pushed a commit to girtsf/qmk_firmware that referenced this pull request Jun 5, 2024
@zlabkeeb @girtsf
Add Macropad 6Pad (qmk#23099)
271b7ab
whoisjordangarcia pushed a commit to whoisjordangarcia/qmk_firmware that referenced this pull request Jun 8, 2024
@zlabkeeb @whoisjordangarcia
Add Macropad 6Pad (qmk#23099)
a8d6064
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr approved these changes

@waffle87 waffle87 waffle87 approved these changes

@fauxpark fauxpark Awaiting requested review from fauxpark

@drashna drashna Awaiting requested review from drashna

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.

None yet
6 participants
@zlabkeeb @waffle87 @drashna @fauxpark @zvecr @zahranetme