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

Dual RGB Matrix IS31FL3737 driver support to address #13442 #13457

Merged
merged 9 commits into from
Jul 15, 2021
Merged

Dual RGB Matrix IS31FL3737 driver support to address #13442 #13457

merged 9 commits into from
Jul 15, 2021

Conversation

ccullin
Copy link

@ccullin ccullin commented Jul 5, 2021 •
edited by zvecr
Loading

Description

Enables Dual RGB Matrix IS31FL3737 driver support. Is fully backward compatible and will not break existing keyboard configs.

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

@drashna
Copy link
Member

drashna commented Jul 5, 2021

You have some merge conflicts here. You may need a rebase.

@ccullin
Copy link
Author

ccullin commented Jul 6, 2021

There appears to be 2 chibios files caught up in my PR if I look at files changed. These are not part of this PR but I'm not sure if a problem or how to fix.

zvecr
zvecr requested changes Jul 6, 2021
View reviewed changes
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.

There appears to be 2 chibios files caught up in my PR if I look at files changed. These are not part of this PR but I'm not sure if a problem or how to fix.

While not your intention, they are currently considered "part of this PR" and need to be reverted before the PR can be merged.

I imagine the submodules point to whats currently on master, rather than develop.

quantum/rgb_matrix/rgb_matrix_drivers.c Outdated Show resolved Hide resolved
docs/feature_rgb_matrix.md Outdated Show resolved Hide resolved
drivers/issi/is31fl3737.c Outdated Show resolved Hide resolved
drivers/issi/is31fl3737.c Outdated Show resolved Hide resolved
drivers/issi/is31fl3737.c Outdated Show resolved Hide resolved
zvecr
zvecr reviewed Jul 6, 2021
View reviewed changes
docs/feature_rgb_matrix.md Outdated Show resolved Hide resolved
@ccullin
Copy link
Author

ccullin commented Jul 7, 2021

All comments actioned and I believe rebase'd to development correctly now.

@ccullin ccullin requested a review from zvecr July 7, 2021 02:40
@ccullin
Copy link
Author

ccullin commented Jul 7, 2021

You have some merge conflicts here. You may need a rebase.

rebase to upstream/develop. Should not longer have merge conflicts

@drashna
Copy link
Member

drashna commented Jul 7, 2021

Still has changes to the submodules (lib/*).

You may need to rebase to fix it.
https://docs.qmk.fm/#/newbs_git_resolving_merge_conflicts

@ccullin
Copy link
Author

ccullin commented Jul 8, 2021

This should now have no merge conflicts with sub-modules and all comments addressed

@ccullin
Copy link
Author

ccullin commented Jul 8, 2021

Still has changes to the submodules (lib/*).

You may need to rebase to fix it.
https://docs.qmk.fm/#/newbs_git_resolving_merge_conflicts

make git-submodule seems to have fixed merge conflicts.

@ccullin
Copy link
Author

ccullin commented Jul 10, 2021 •
edited
Loading

@zvecr - are any further updates required for this PR. (This is my first PR and I am learning the process).

@drashna drashna requested a review from a team July 11, 2021 05:41
@github-actions github-actions bot removed the keyboard label Jul 14, 2021
@zvecr zvecr merged commit 70267b3 into qmk:develop Jul 15, 2021
@zvecr
Copy link
Member

zvecr commented Jul 15, 2021

Thanks!

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@ccullin @nhongooi
Dual RGB Matrix IS31FL3737 driver support to address qmk#13442 (qmk#1…
177240b 
…3457)

* initial commit

* removed changes to write_pwm_buffer

* backward compatbility added

* fixed issue with backward compatibility

* documentation update

* removed unneccessary comment. branched from master

* updated per comments qmk#13457

* removed blank line

* cformat on diff files
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@ccullin
Dual RGB Matrix IS31FL3737 driver support to address qmk#13442 (qmk#1…
72dc049 
…3457)

* initial commit

* removed changes to write_pwm_buffer

* backward compatbility added

* fixed issue with backward compatibility

* documentation update

* removed unneccessary comment. branched from master

* updated per comments qmk#13457

* removed blank line

* cformat on diff files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
core documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ccullin @drashna @zvecr