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

Made it possible for real to choose register on io expander for cols and rows #6124

Merged
merged 3 commits into from
Jun 13, 2019

Conversation

robertrosman
Copy link
Contributor

Description

@ErinCall has made a huge effort to generalize matrix.c for io expander keyboards in #2065. When I tried to put the columns on register B on the io expander I just couldn't get it to work, so I dug into the code. This pretty simple fix solves the issues I faced, and IMHO brings a little bit more clarity to what's going on.

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

@@ -36,7 +36,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COL_EXPANDED { true, true, true, true, true, true, false, false, false, false, false, false}
#define MATRIX_ONBOARD_ROW_PINS { F0, F1, F4, F5, F6, F7 }
#define MATRIX_ONBOARD_COL_PINS { 0, 0, 0, 0, 0, 0, B1, B2, B3, D2, D3, C6 }
#define EXPANDER_COL_REGISTER 0
#define EXPANDER_COL_REGISTER GPIOA
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah yeah, way better!

+-------+---------------+---------------+
*/

#if (EXPANDER_COLUMN_REGISTER == 0)
#if (EXPANDER_COL_REGISTER == GPIOA)
Copy link
Contributor

Choose a reason for hiding this comment

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

Geez, I really wrote half of this feature and committed it without any testing, huh?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess so :) Apart from this little typo, you've done a great job and it's a joy working with an expander thanks to your code! To be honest I haven't done any serious testing with the cols on A and rows on B, but in theory it should work.

@drashna drashna merged commit 1cd2660 into qmk:master Jun 13, 2019
@drashna
Copy link
Member

drashna commented Jun 22, 2019

Oh man, this is close to be merged into core....

Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
…r for cols and rows (qmk#6124)

* Replace deprecated EXPANDER_MASK with dynamic expander_pin_input_mask

* Made it possible to switch rows and cols registers on expander
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
…r for cols and rows (qmk#6124)

* Replace deprecated EXPANDER_MASK with dynamic expander_pin_input_mask

* Made it possible to switch rows and cols registers on expander
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
…r for cols and rows (qmk#6124)

* Replace deprecated EXPANDER_MASK with dynamic expander_pin_input_mask

* Made it possible to switch rows and cols registers on expander
JeffreyPalmer pushed a commit to JeffreyPalmer/qmk_firmware that referenced this pull request Feb 27, 2020
…r for cols and rows (qmk#6124)

* Replace deprecated EXPANDER_MASK with dynamic expander_pin_input_mask

* Made it possible to switch rows and cols registers on expander
swamp09 pushed a commit to swamp09/qmk_firmware that referenced this pull request Mar 11, 2020
…r for cols and rows (qmk#6124)

* Replace deprecated EXPANDER_MASK with dynamic expander_pin_input_mask

* Made it possible to switch rows and cols registers on expander
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants