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

Remove CUSTOM_MATRIX option from diode direction #5090

Merged
merged 3 commits into from
Feb 18, 2019

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Feb 10, 2019

Description

Discussion within #5026

There seems to be an existing comment, both within the docs, templates and code base,

/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
#define DIODE_DIRECTION CUSTOM_MATRIX

However digging into the implementation, it currently does not do much. Currently if you set the documented option (both in the existing template and online docs) DIODE_DIRECTION = CUSTOM_MATRIX you end up with a matrix.c being included that will not function at all, and no clean way to implement anything that fixes that.

This PR removes the option, via find replace. In a future PR (or maybe this one if requested), functionality will be added to provide warnings or messages when the above 'broken matrix.c' is encountered.

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. (https://docs.qmk.fm/#/contributing)
  • 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 Feb 10, 2019

There is a merge conflict. :(

@zvecr
Copy link
Member Author

zvecr commented Feb 10, 2019

@drashna thanks for the heads up, I will fix the issue ASAP.

The merge conflict has at least flagged with me, that this will need a 2nd pass in the future for any boards added against the previous code base.

@zvecr zvecr force-pushed the feature/remove_diode_CUSTOM_MATRIX branch 2 times, most recently from 1aca6fb to f46b301 Compare February 11, 2019 00:59
@drashna
Copy link
Member

drashna commented Feb 15, 2019

Well, I'll try to catch the text in future PRs. Can't make any promises though.

And either still a merge conflict or another has popped up.

@zvecr zvecr force-pushed the feature/remove_diode_CUSTOM_MATRIX branch from f46b301 to 04a3762 Compare February 17, 2019 00:04
@zvecr
Copy link
Member Author

zvecr commented Feb 17, 2019

@drashna was another commit, i have updated again to reflect the current state of master.

@drashna drashna merged commit fc06986 into qmk:master Feb 18, 2019
@zvecr
Copy link
Member Author

zvecr commented Feb 18, 2019

Thanks @drashna, i will schedule a 2nd pass for any that slip through.

@zvecr zvecr deleted the feature/remove_diode_CUSTOM_MATRIX branch February 25, 2019 23:41
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 2, 2019
* Remove CUSTOM_MATRIX refs from DIODE_DIRECTION

* Remove '#define DIODE_DIRECTION CUSTOM_MATRIX'

* Remove CUSTOM_MATRIX refs from DIODE_DIRECTION documentation
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
* Remove CUSTOM_MATRIX refs from DIODE_DIRECTION

* Remove '#define DIODE_DIRECTION CUSTOM_MATRIX'

* Remove CUSTOM_MATRIX refs from DIODE_DIRECTION documentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants