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

Durgod K310/K320 Refactor #18224

Merged
merged 19 commits into from
Sep 26, 2022
Merged

Durgod K310/K320 Refactor #18224

merged 19 commits into from
Sep 26, 2022

Conversation

noroadsleft
Copy link
Member

Description

Simplifies the structure of the Durgod K310 and K320 codebases, at the cost of some code duplication.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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

@noroadsleft noroadsleft added optimization in progress keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Aug 31, 2022
@noroadsleft
Copy link
Member Author

noroadsleft commented Aug 31, 2022

8b94086 b146f17 leaves keyboards/durgod/k3x0/readme.md in place deliberately instead of deleting it, even though 0985714 aa77ee3 leaves it as the only file in this directory. I intend to combine this file with the readme from keyboards/durgod/dgk6x/, but I want to refactor that codebase similarly to this one, and combine the contents in that refactor.

@noroadsleft
Copy link
Member Author

I don't understand why the lint check fails on durgod/k320/base:

 noroadsleft  ~/qmk_firmware/keyboards/durgod  (rf/durgod)
$ git log -1 --oneline
d73821aea3 (HEAD -> rf/durgod, origin/rf/durgod) fix broken links in keyboard readmes

 noroadsleft  ~/qmk_firmware/keyboards/durgod  (rf/durgod)
$ qmk compile -e SILENT=true -kb durgod/k320/base -km default
Ψ Compiling keymap with make --jobs=4 --output-sync=target SILENT=true durgod/k320/base:default


Making durgod/k320/base with keymap default                                                            [OK]

@fauxpark
Copy link
Member

Could it be something to do with this?
image

@noroadsleft
Copy link
Member Author

That was exactly it. I messed up a git add -N somewhere.

@noroadsleft noroadsleft requested a review from a team September 3, 2022 20:50
@noroadsleft noroadsleft marked this pull request as ready for review September 3, 2022 20:50
@noroadsleft
Copy link
Member Author

PR Notes

This PR consolidates the build options for the Durgod K310 and K320 keyboards as follows:

What was... is now...
make durgod/k310:<keymap> make durgod/k310/base:<keymap>
make durgod/k310/base:<keymap> make durgod/k310/base:<keymap>
make durgod/k3x0/k310:<keymap> make durgod/k310/base:<keymap>
make durgod/k3x0/k310/base:<keymap> make durgod/k310/base:<keymap>
make durgod/k320:<keymap> make durgod/k320/base:<keymap>
make durgod/k320/base:<keymap> make durgod/k320/base:<keymap>
make durgod/k3x0/k320:<keymap> make durgod/k320/base:<keymap>
make durgod/k3x0/k320/base:<keymap> make durgod/k320/base:<keymap>

As such, keymaps have been relocated as follows:

  • The user keymap kuenhlee (@kuenhlee) has been moved from keyboards/durgod/k3x0/k320/keymaps/kuenhlee/ to keyboards/durgod/k320/keymaps/kuenhlee/
  • The keymaps that were formerly located in keyboards/durgod/k3x0/keymaps/chimera, default, default_mac, typhon, and via – are now located in keyboards/durgod/k310/keymaps/.
  • The default, default_mac and via keymaps now have equivalent versions for the K320 in keyboards/durgod/k320/keymaps/.

@moults31, your keymap remains present in keyboards/durgod/k320/keymaps/, but please note the changes to the keyboard names, and adjust your compilation method accordingly.

cc @dkjer, @tylert (keyboard maintainers)

@drashna drashna merged commit e64ec53 into qmk:develop Sep 26, 2022
@noroadsleft noroadsleft deleted the rf/durgod branch September 26, 2022 21:45
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap optimization via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants