diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-10-28 13:54:41 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-28 13:54:41 -0400 |
| commit | 8643e01286816baecfc8784529f35155f55aaa63 (patch) | |
| tree | e2277066867573e00758317aa5b5adb7bf87f282 /keyboard/ergodox_ez/matrix.c | |
| parent | 1fb8b4ce3a14c98b54962a9829471e3e0c68bca6 (diff) | |
| parent | d3db8d62f6fc6a7dee43978ddc8356579b502b37 (diff) | |
merging
Diffstat (limited to 'keyboard/ergodox_ez/matrix.c')
| -rw-r--r-- | keyboard/ergodox_ez/matrix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c index 09380d3083..3e1d69444b 100644 --- a/keyboard/ergodox_ez/matrix.c +++ b/keyboard/ergodox_ez/matrix.c @@ -277,7 +277,7 @@ static void unselect_rows(void) mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out; mcp23018_status = i2c_write(GPIOA); if (mcp23018_status) goto out; mcp23018_status = i2c_write( 0xFF - & ~(ergodox_left_led_3<<LEFT_LED_3_SHIFT) + & ~(0<<7) ); if (mcp23018_status) goto out; out: i2c_stop(); @@ -305,7 +305,7 @@ static void select_row(uint8_t row) mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out; mcp23018_status = i2c_write(GPIOA); if (mcp23018_status) goto out; mcp23018_status = i2c_write( 0xFF & ~(1<<row) - & ~(ergodox_left_led_3<<LEFT_LED_3_SHIFT) + & ~(0<<7) ); if (mcp23018_status) goto out; out: i2c_stop(); |