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

[RGB_MATRIX] Changed LED positions for Massdrop CTRL and DZ60RGB #5801

Merged
merged 8 commits into from
May 29, 2019
Merged

[RGB_MATRIX] Changed LED positions for Massdrop CTRL and DZ60RGB #5801

merged 8 commits into from
May 29, 2019

Conversation

MatthewRobo
Copy link
Contributor

@MatthewRobo MatthewRobo commented May 6, 2019 •
edited
Loading

Description

Changed positions of the Massdrop (Drop?) CTRL and the DZ60RGB to more accurately reflect their physical LED positions.
Also changed modifiers to highlight the keys that would come in a keyset's modifier kit.
This means ESC, F5-F8, the nav cluster, non-alphanumeric keys, and more.

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.
  • [x ] I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna
Copy link
Member

drashna commented May 6, 2019

@moyi4681 and @patrickmt, any issues with this?

@moyi4681
Copy link
Contributor

moyi4681 commented May 6, 2019

LGTM

XScorpion2
XScorpion2 suggested changes May 6, 2019
View reviewed changes
keyboards/massdrop/ctrl/config_led.c Outdated Show resolved Hide resolved
@drashna
Copy link
Member

drashna commented May 10, 2019

@MatthewRobo Some merge conflicts are present now.

If you could fix them?

@patrickmt
Copy link
Contributor

patrickmt commented May 10, 2019 •
edited
Loading

What's the reasoning behind changing the corner LEDs on the CTRL to NOT reflect their actual physical positioning? The original positions are derived from the PCB layout coordinates.

@drashna
Copy link
Member

drashna commented May 10, 2019

@MatthewRobo It looks like you have some merge conflicts due to the new structure.

@patrickmt I think that he's trying to change them to be more "accurate" in appearance, rather than physical location.

@MatthewRobo
Copy link
Contributor Author

@MatthewRobo It looks like you have some merge conflicts due to the new structure.

I think I fixed it, though I might have accidentally added some garbage in my keymaps with and I don't know how to remove it at this point because I suck at git.

XScorpion2
XScorpion2 approved these changes May 13, 2019
View reviewed changes
Copy link
Contributor

@XScorpion2 XScorpion2 left a comment

Choose a reason for hiding this comment

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

Errors are related to qmk master changes that were not propagated to all the keymaps for these boards.
Otherwise looks good to me.

@drashna
Copy link
Member

drashna commented May 28, 2019

@patrickmt were you okay with this change, or...?

@patrickmt
Copy link
Contributor

Yeah the changes are fine

@drashna
Copy link
Member

drashna commented May 29, 2019

Thanks!

@drashna drashna merged commit 38d3b7a into qmk:master May 29, 2019
tenderlove added a commit to tenderlove/qmk_firmware that referenced this pull request Jun 10, 2019
@tenderlove
Merge branch 'master' into merging
a1a19e0 
* master: (790 commits)
  [Keyboard] YMD96 refactor (qmk#5472)
  Update reference_configurator_support.md
  Use qmk docker image for travis CI builds
  [Keyboard] Remove file with same name and different case (qmk#6028)
  [Keyboard] Fix json for NK65 (qmk#6026)
  [Keymap] added hhkb layout for tada68 (qmk#6027)
  [Keymap] Added keymap for user jasondunsmore (qmk#6023)
  [Keyboard] Fix jc65 when RGB or BACKLIGHT disabled (qmk#6022)
  Update feature_encoders.md
  Copy avr teensy flash logic to arm (qmk#6016)
  [Keyboard] E6V2 R2 BMC PCB (qmk#6009)
  Add belgian layout for sendstring (qmk#6008)
  [Keyboard] Added XW60 PCB (qmk#6011)
  [Keymap] Georgi flippydippy layout (qmk#6005)
  Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)
  Update 333fred keymaps and add new iris map. (qmk#6010)
  [Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801)
  [Keyboard] Add support for AKB boards (qmk#5996)
  Duck Octagon V1 Configurator cleanup (qmk#5957)
  Fixing matrix_scan so it properly returns changed status
  ...
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
@MatthewRobo @Timbus
[Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801
97a6f24 
)

* changed rgb positions and modifiers within RGB matrix thing for CTRL and DZ60RGB

* changed CTRL corner LEDs + centered horizontally

* whoops - changed CTRL's underglow LEDs back to the underglow flag

* whitespace

* I changed the right file this time

* Fixed DZ60RGB left shift out of position
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
@MatthewRobo @drashna
[Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801
5eb32c5 
)

* changed rgb positions and modifiers within RGB matrix thing for CTRL and DZ60RGB

* changed CTRL corner LEDs + centered horizontally

* whoops - changed CTRL's underglow LEDs back to the underglow flag

* whitespace

* I changed the right file this time

* Fixed DZ60RGB left shift out of position
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
@MatthewRobo @JeffreyPalmer
[Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801
acceb59 
)

* changed rgb positions and modifiers within RGB matrix thing for CTRL and DZ60RGB

* changed CTRL corner LEDs + centered horizontally

* whoops - changed CTRL's underglow LEDs back to the underglow flag

* whitespace

* I changed the right file this time

* Fixed DZ60RGB left shift out of position
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XScorpion2 XScorpion2 XScorpion2 approved these changes

@drashna drashna Awaiting requested review from drashna

@algernon algernon Awaiting requested review from algernon

@ezuk ezuk Awaiting requested review from ezuk

@fredizzimo fredizzimo Awaiting requested review from fredizzimo

@jackhumbert jackhumbert Awaiting requested review from jackhumbert

@mechmerlin mechmerlin Awaiting requested review from mechmerlin

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

@skullydazed skullydazed Awaiting requested review from skullydazed

@yanfali yanfali Awaiting requested review from yanfali

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@MatthewRobo @drashna @moyi4681 @patrickmt @XScorpion2