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

Add QuadrumLabs Delta #20409

Merged
merged 9 commits into from
Apr 20, 2023
Merged

Conversation

Sleepdealr
Copy link
Contributor

@Sleepdealr Sleepdealr commented Apr 11, 2023

This replaces #18198 because lfg went AWOL

I had to remake this from the gerbers and it was awful

Description

Adds QuadrumLabs Delta to QMK

Types of Changes

  • Core
  • Bugfix
  • Enhancement/optimization
  • New feature
  • 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 dependencies keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Apr 11, 2023
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keyboards/quadrum/delta/keymaps/default/rules.mk should be added with just ENCODER_MAP_ENABLE = yes

Submodule changes must also be reverted before this PR can be accepted.

keyboards/quadrum/delta/rules.mk Outdated Show resolved Hide resolved
keyboards/quadrum/delta/config.h Outdated Show resolved Hide resolved
keyboards/quadrum/delta/info.json Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/via/delta.json Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/via/rules.mk Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/default/keymap.c Outdated Show resolved Hide resolved
@Sleepdealr Sleepdealr requested a review from zvecr April 11, 2023 04:05
@Sleepdealr
Copy link
Contributor Author

How can I remove the lib stuff from it? Every time I commit it seems to include it for whatever reason

@waffle87
Copy link
Member

How can I remove the lib stuff from it? Every time I commit it seems to include it for whatever reason

git checkout develop
make git-submodule
git submodule foreach 'git log -n1 --oneline'
# remember the first abcdef1234 on the submodules that have an issue
git checkout @@your-branch@@
# for each of the problematic repo's:
cd lib/@@name@@
git checkout abcdef1234
cd @@qmk_firmware@@
git commit -m 'Resync submodules'

@Sleepdealr
Copy link
Contributor Author

Fixed, thanks @waffle87!

keyboards/quadrum/delta/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/via/keymap.c Outdated Show resolved Hide resolved
Copy link
Contributor

@sigprof sigprof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Layouts need some work — apparently what you have here is LAYOUT_all (unbuildable as it is, because ANSI backslash is separate from ISO NUHS on this PCB, therefore you need to use 1.25u Enter to make all matrix positions assignable), but a lone LAYOUT_all is not allowed by the rules, so you would need to add at least LAYOUT_ansi and LAYOUT_iso with appropriate modifications. (Maybe you should also provide layout variations for 2u Backspace, but you would need to check which matrix location corresponds to the 2u position.)

keyboards/quadrum/delta/info.json Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/via/keymap.c Outdated Show resolved Hide resolved
@Sleepdealr Sleepdealr requested a review from sigprof April 12, 2023 16:59
keyboards/quadrum/delta/keymaps/ansi/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/iso/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/quadrum/delta/keymaps/ansi/keymap.c Outdated Show resolved Hide resolved
Co-authored-by: Joel Challis <git@zvecr.com>
@drashna drashna requested a review from a team April 14, 2023 21:17
@keyboard-magpie keyboard-magpie merged commit 6d8a1aa into qmk:master Apr 20, 2023
quangd42 pushed a commit to quangd42/qmk_firmware that referenced this pull request Apr 20, 2023
queyenth pushed a commit to queyenth/qmk_firmware that referenced this pull request Apr 21, 2023
stratosgear pushed a commit to stratosgear/qmk_firmware that referenced this pull request Apr 26, 2023
struckmb pushed a commit to struckmb/qmk_firmware that referenced this pull request May 1, 2023
rodrigob pushed a commit to rodrigob/qmk_firmware that referenced this pull request May 2, 2023
SjB added a commit to SjB/qmk_firmware that referenced this pull request May 12, 2023
* master:
  NK Plus (qmk#20392)
  [Docs] Fix suggested code pattern when a specific mod-mask is required. (qmk#20512)
  [Docs] Remove combo count from array (qmk#20511)
  Add QuadrumLabs Delta (qmk#20409)
  Adds Docs option for ArduinoIDE's example `ArduinoISP` (qmk#20486)
  GMMK 2 volume up/down Fn keys are backwards in default mapping (qmk#20476)
  Fix typo in `feature_wpm.md` title (qmk#20464)
  [Keyboard] Add Kalakos Bahrnob65 (qmk#20424)
  Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460)
  [Keyboard] Add zoom75 wired (qmk#20396)
  [Keyboard] Add dymium65 (qmk#20257)
  Lotus58 glow (qmk#20386)
  ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants