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

added SPIN Macro Pad and respective keymaps #8820

Merged
merged 24 commits into from
Apr 21, 2020
Merged

added SPIN Macro Pad and respective keymaps #8820

merged 24 commits into from
Apr 21, 2020

Conversation

Quarren42
Copy link
Contributor

Added the new SPIN macropad and two keymaps for it.

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

ridingqwerty
ridingqwerty requested changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@ridingqwerty ridingqwerty left a comment

Choose a reason for hiding this comment

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

Mainly just some suggestions on alignment and convention.

keyboards/dmqdesign/spin/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/rules.mk Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/spin.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/spin.h Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
Quarren42 and others added 6 commits April 16, 2020 12:47
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/keymaps/default/keymap.c
94c1300 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c
46e5e00 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/rules.mk
0ffe6db 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/spin.c
00f9f41 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/spin.h
5b79569 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c
27e0dba 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
@Quarren42
Copy link
Contributor Author

Re-requested review after adding your suggestions. Thanks for the help cleaning everything up.

@Quarren42 @ridingqwerty
Update keyboards/dmqdesign/spin/readme.md
a46c530 
Co-Authored-By: ridingqwerty <george.g.koenig@gmail.com>
fauxpark
fauxpark requested changes Apr 16, 2020
View reviewed changes
keyboards/dmqdesign/spin/config.h Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/rules.mk Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/spin.h Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/readme.md Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c Outdated Show resolved Hide resolved
Quarren42 and others added 11 commits April 16, 2020 16:34
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/readme.md
6d43446 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/spin.h
498593e 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/rules.mk
95ce89f 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/config.h
bab0a75 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c
6ac5c98 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42 @fauxpark
Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c
6790abe 
Co-Authored-By: Ryan <fauxpark@gmail.com>
@Quarren42
changed keymap to all lowercase, removed LED typecasts
aecea81
@Quarren42
Merge branch 'keyboard_spin' of https://github.com/Quarren42/qmk_firm…
c778255 
…ware into keyboard_spin

accepted changes from a pull request, merging with my local branch.
@Quarren42
made encoderLayers all lowercase
400b208
@Quarren42
fixed the duplicate folder after changing name (hopefully)
4706c4d
@Quarren42
Merge branch 'keyboard_spin' of https://github.com/Quarren42/qmk_firm…
366b8fd 
…ware into keyboard_spin

merging again because I messed some stuff up when attempting to remove
the duplicate keymap
@Quarren42 Quarren42 requested a review from fauxpark April 16, 2020 22:06
@fauxpark fauxpark requested a review from a team April 16, 2020 23:38
@drashna drashna requested a review from a team April 19, 2020 01:32
noroadsleft
noroadsleft requested changes Apr 20, 2020
View reviewed changes
keyboards/dmqdesign/spin/info.json Outdated Show resolved Hide resolved
noroadsleft
noroadsleft requested changes Apr 21, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Adds a bit of aesthetic polish and corrects the object sequence.

image

keyboards/dmqdesign/spin/info.json Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/info.json Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/info.json Outdated Show resolved Hide resolved
keyboards/dmqdesign/spin/info.json Outdated Show resolved Hide resolved
Quarren42 and others added 2 commits April 20, 2020 21:10
@Quarren42 @noroadsleft
Update keyboards/dmqdesign/spin/info.json
88dee9f 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@Quarren42 @noroadsleft
Update keyboards/dmqdesign/spin/info.json
29582c4 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@noroadsleft
Copy link
Member

Still missing #8820 (comment) and #8820 (comment).

Quarren42 and others added 2 commits April 20, 2020 21:37
@Quarren42 @noroadsleft
Update keyboards/dmqdesign/spin/info.json
bfd8fd9 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@Quarren42 @noroadsleft
Update keyboards/dmqdesign/spin/info.json
c166367 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@noroadsleft noroadsleft merged commit 92a50a3 into qmk:master Apr 21, 2020
@noroadsleft
Copy link
Member

Thanks!

@Quarren42
Copy link
Contributor Author

Thanks everyone for the help :)

kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@Quarren42 @kujawakk
[Keyboard] DMQ Design SPIN (qmk#8820)
1c3271d 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
rockwarrior added a commit to rockwarrior/qmk_firmware that referenced this pull request Apr 23, 2020
@rockwarrior
Merge branch 'upstream'
dff8c1b 
* upstream: (1037 commits)
  [Keyboard] Add wasdat code controller (qmk#8858)
  fix sample code indent in feature_encoders.md (qmk#8883)
  [Keymap] Clean up my ergo keymaps and userspace (qmk#8857)
  idb 60 Bugfixes / Preparations for Open Source Hardware (qmk#8866)
  Rebound: add rev2 and thus rev1 as well (qmk#8630)
  Update vitamins included default keymap, enable NKRO, rev2 rgbsplit (qmk#8871)
  Update to xealousbrown. (qmk#8215)
  [Keyboard] DMQ Design SPIN (qmk#8820)
  Wheatfield Blocked65: Update RGBLED num (qmk#8725)
  Add VIA support to ID80 (qmk#8791)
  CFTKB Mysterium & Discipad VIA support (qmk#8794)
  Clean up ATSAM ifdefs (qmk#8808)
  [Docs] Japanese translation of docs/feature_encoders.md (qmk#8843)
  Add naked60 layout, clean up my userspace files and rules.mk. (qmk#8848)
  Fixing DecadePad Numlock LED Bug (qmk#8831)
  [Docs] Japanese translation of docs/feature_command.md (qmk#8672)
  Add support for YMD75 rev 2 (qmk#8853)
  Remove no-longer-necessary LTO checks from keyboards' config.h files (qmk#8773)
  Fix ta-65 tsangan layouts (qmk#8855)
  Fix Plain60 layout (qmk#8854)
  ...
mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request May 3, 2020
@Quarren42 @mrlinuxfish
[Keyboard] DMQ Design SPIN (qmk#8820)
b7a4cd2 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@Quarren42 @lorenzoernesto
[Keyboard] DMQ Design SPIN (qmk#8820)
c6ab1a6 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@Quarren42 @sowbug
[Keyboard] DMQ Design SPIN (qmk#8820)
576d08b 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@Quarren42 @turky
[Keyboard] DMQ Design SPIN (qmk#8820)
485fce7 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@Quarren42 @jakobaa
[Keyboard] DMQ Design SPIN (qmk#8820)
54902b3 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
@Quarren42 @sjmacneil
[Keyboard] DMQ Design SPIN (qmk#8820)
7ad572b 
* added SPIN keyboard and respective keymaps

* Update keyboards/dmqdesign/spin/keymaps/default/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/spin.c

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/readme.md

* Update keyboards/dmqdesign/spin/spin.h

* Update keyboards/dmqdesign/spin/rules.mk

* Update keyboards/dmqdesign/spin/config.h

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* Update keyboards/dmqdesign/spin/keymaps/encoderLayers/keymap.c

* changed keymap to all lowercase, removed LED typecasts

* made encoderLayers all lowercase

* fixed the duplicate folder after changing name (hopefully)

* fixed the info.json, followed the keyboard support doc

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json

* Update keyboards/dmqdesign/spin/info.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

@ridingqwerty ridingqwerty Awaiting requested review from ridingqwerty

Assignees
No one assigned
Labels
keyboard keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Quarren42 @noroadsleft @drashna @fauxpark @ridingqwerty