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 support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory #14194

Merged
merged 29 commits into from
Sep 29, 2021
Merged

Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory #14194

merged 29 commits into from
Sep 29, 2021

Conversation

nachie
Copy link
Contributor

@nachie nachie commented Aug 28, 2021 •
edited
Loading

Description

Add support for PaladinPad PCBs.

Move all keyboards maintained by nachie into the KapCave directory. This makes sure all PCBs with the same vendor ID are in the same directory. Generated a unique vendor ID (hex for KC), made sure it wasn't being used at the time.

Update the files to match the current standards required for PRs removing old code and null functions.

Add in via keymaps

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 Aug 28, 2021
@drashna
Copy link
Member

drashna commented Aug 29, 2021

Just a heads up, moving keybof folders around usually means that the PR needs to target develop (you can edit the title to change the target). If you want to still target master, then it may be worth splitting up the PR into two PRs.

Also, there are some merge conflicts here.

@nachie nachie changed the base branch from master to develop August 30, 2021 23:04
@nachie
Copy link
Contributor Author

nachie commented Aug 30, 2021

Changed the target to develop.

Ill rebase locally to see if I can get rid of the merge conflicts

@nachie nachie force-pushed the nachie/kapcave-support branch 2 times, most recently from d319a4f to 96b47a3 Compare August 30, 2021 23:31
@nachie
Copy link
Contributor Author

nachie commented Aug 31, 2021 •
edited
Loading

The lint for the new paths passes, but for some reason its trying to lint paladin64 in the old path and that is failing (since it was moved). Not sure how to handle that.

❯ qmk lint --strict -kb kapcave/paladin64
Ψ Lint check passed!

@nachie nachie force-pushed the nachie/kapcave-support branch from 96b47a3 to 89cbdcd Compare September 2, 2021 05:10
@nachie
Copy link
Contributor Author

nachie commented Sep 2, 2021

Resolved merged conflicts again.

@zvecr
Copy link
Member

zvecr commented Sep 4, 2021

In its current form, this PR cannot be accepted due to the submodule changes in lib, most likely from before the previous develop cycle merged. These will need to be resolved before the PR can move forward.

@nachie nachie force-pushed the nachie/kapcave-support branch 2 times, most recently from bee0cff to 402de44 Compare September 8, 2021 20:31
@nachie
Copy link
Contributor Author

nachie commented Sep 8, 2021

In its current form, this PR cannot be accepted due to the submodule changes in lib, most likely from before the previous develop cycle merged. These will need to be resolved before the PR can move forward.

Deleted the old branch, updated develop and made a new branch based off of that. This should now be rid of all the submodule changes.

@nachie nachie force-pushed the nachie/kapcave-support branch from 402de44 to a337b72 Compare September 9, 2021 02:12
drashna
drashna requested changes Sep 9, 2021
View reviewed changes
keyboards/kapcave/gskt00/keymaps/default-poly/config.h Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/rev1/config.h Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/rev2/config.h Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/rules.mk Outdated Show resolved Hide resolved
@nachie nachie requested a review from drashna September 9, 2021 07:18
@nachie
Copy link
Contributor Author

nachie commented Sep 9, 2021

Thank you for the suggestions @drashna , I've accepted all. I didn't know the RGB animations could be broken out, I should be reading the core files more I guess :)

@nachie nachie force-pushed the nachie/kapcave-support branch from 97cefef to c2ca9fb Compare September 17, 2021 08:17
@nachie
Copy link
Contributor Author

nachie commented Sep 17, 2021

Adding in another PCB that is slated for GB alongside a board in the coming months.

drashna
drashna requested changes Sep 18, 2021
View reviewed changes
keyboards/kapcave/arya/rules.mk Outdated Show resolved Hide resolved
keyboards/kapcave/arya/rules.mk Outdated Show resolved Hide resolved
nachie and others added 2 commits September 20, 2021 10:47
@nachie @drashna
Update keyboards/kapcave/arya/rules.mk
2e457cc 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/arya/rules.mk
b665ea8 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie nachie requested a review from drashna September 20, 2021 20:46
nachie and others added 2 commits September 20, 2021 13:47
@nachie @drashna
Update keyboards/kapcave/paladinpad/rules.mk
f364c4c 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/rev2/config.h
4fdb9af 
Co-authored-by: Drashna Jaelre <drashna@live.com>
nachie and others added 7 commits September 24, 2021 15:23
@nachie @fauxpark
Update keyboards/kapcave/arya/keymaps/via/keymap.c
b94d648 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/arya/info.json
56612b2 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/arya/keymaps/default/keymap.c
a7158e1 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/paladin64/info.json
019821d 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/gskt00/readme.md
3acc33c 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/paladin64/readme.md
d07344e 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie @fauxpark
Update keyboards/kapcave/paladinpad/readme.md
91d301e 
Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie nachie requested a review from fauxpark September 24, 2021 22:24
@nachie nachie changed the title Add support for PaladinPad pcb, move keyboards by KapCave into their own directory Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory Sep 25, 2021
@nachie @fauxpark
Update keyboards/kapcave/paladinpad/paladinpad.h
2d47eef 
:D

Co-authored-by: Ryan <fauxpark@gmail.com>
@nachie nachie requested a review from fauxpark September 25, 2021 19:25
drashna
drashna requested changes Sep 28, 2021
View reviewed changes
keyboards/kapcave/arya/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/aek/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/info.json Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/aek/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/aek/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/kapcave/paladinpad/paladinpad.h Outdated Show resolved Hide resolved
nachie and others added 9 commits September 28, 2021 12:22
@nachie @drashna
Update keyboards/kapcave/arya/keymaps/via/keymap.c
0ab1029 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/default/keymap.c
7f995b7 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/paladinpad.h
916a0bc 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/via/keymap.c
efd78d9 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/ortho/keymap.c
feb2d85 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
251c23c 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
7d0657d 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/info.json
8774a44 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie @drashna
Update keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
c6d45c2 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@nachie nachie requested a review from drashna September 28, 2021 19:25
@drashna drashna merged commit 6779d5b into qmk:develop Sep 29, 2021
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Sep 29, 2021
Merge remote-tracking branch 'qmk/develop' into develop
dd15199 
* qmk/develop: (21 commits)
  massdrop alt/ctrl: support saving into nvm (qmk#6068)
  Added power tracking api (qmk#12691)
  Mechlovin Hannah60RGB touch-up (qmk#14646)
  [Core] Fix "6kro enable" and clarify naming (qmk#14563)
  [Keymap] Update to Drashna Code (qmk#14644)
  [Keyboard] add support for Quark_LP (qmk#14552)
  [Keyboard] Update Grandiceps to Rev2 (qmk#14618)
  [Keymap] Jonavin murphpad keymap update (qmk#14637)
  [Keyboard] Updates for Tractyl Manuform config (qmk#14641)
  [Keyboard] Fix end of file issue for Owlab suit80 (qmk#14640)
  [Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory (qmk#14194)
  [Keymap] Keychron Q1 user keymap (qmk#14636)
  Fix for mechlovin/adelais/standard_led/arm/rev4 (qmk#14639)
  convert checkerboards/quark_squared:via rules.mk to Unix line endings (qmk#14638)
  Mechlovin Delphine: add LAYOUT_numpad_6x4 (qmk#14635)
  Move "firmware size check skipped" note to message.mk (qmk#14632)
  [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code (qmk#14278)
  [Keyboard] Yampad VIA support (qmk#14397)
  [Keyboard] Add OwLab Suit80 (qmk#14362)
  [Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change (qmk#14623)
  ...
@peepeetee peepeetee mentioned this pull request Jan 2, 2022
Closed
@nachie nachie mentioned this pull request Feb 4, 2022
Merged
6 tasks
ptrxyz pushed a commit to ptrxyz/qmk_firmware that referenced this pull request Apr 9, 2022
@nachie @drashna
@fauxpark @ptrxyz
[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by…
b4bb677 
… KapCave into their own directory (qmk#14194)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
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.
4 participants
@nachie @drashna @zvecr @fauxpark