X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fergodox%2Fmatrix.c;h=cecfe574c08abb7379c10bc4ab9ebc235f1f5783;hb=3e8289b53ce929484651fc065fb5f718e4e3ae21;hp=ee0d5d230f33a188c4bc70503e4cd53d8c8ad50e;hpb=c5d3988e7ace6a7c940f543ab2539be8ef15bd7d;p=max%2Ftmk_keyboard.git diff --git a/keyboard/ergodox/matrix.c b/keyboard/ergodox/matrix.c index ee0d5d23..cecfe574 100644 --- a/keyboard/ergodox/matrix.c +++ b/keyboard/ergodox/matrix.c @@ -44,7 +44,7 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; static matrix_row_t read_cols(uint8_t row); static void init_cols(void); -static void unselect_rows(); +static void unselect_rows(void); static void select_row(uint8_t row); static uint8_t mcp23018_reset_loop; @@ -233,11 +233,11 @@ uint8_t matrix_key_count(void) * * Teensy * col: 0 1 2 3 4 5 - * pin: F0 F1 F4 F5 F6 F7 + * pin: F0 F1 F4 F5 F6 F7 * * MCP23018 * col: 0 1 2 3 4 5 - * pin: B5 B4 B3 B2 B1 B0 + * pin: B5 B4 B3 B2 B1 B0 */ static void init_cols(void) { @@ -326,7 +326,7 @@ static void select_row(uint8_t row) // set other rows hi-Z : 1 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<