aboutsummaryrefslogtreecommitdiff
path: root/keyboards/georgi/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/georgi/matrix.c')
-rw-r--r--keyboards/georgi/matrix.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c
index 22079ac61..58f0776c4 100644
--- a/keyboards/georgi/matrix.c
+++ b/keyboards/georgi/matrix.c
@@ -1,8 +1,4 @@
1/* 1/*
2Note for ErgoDox EZ customizers: Here be dragons!
3This is not a file you want to be messing with.
4All of the interesting stuff for you is under keymaps/ :)
5Love, Erez
6 2
7Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 3Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
8 4
@@ -248,8 +244,8 @@ uint8_t matrix_scan(void)
248 matrix_scan_quantum(); 244 matrix_scan_quantum();
249 245
250#ifdef DEBUG_MATRIX 246#ifdef DEBUG_MATRIX
251 for (uint8_t c = 0; c < MATRIX_COLS; c++) 247 for (uint8_t c = 0; c < MATRIX_COLS; c++)
252 for (uint8_t r = 0; r < MATRIX_ROWS; r++) 248 for (uint8_t r = 0; r < MATRIX_ROWS; r++)
253 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c); 249 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
254#endif 250#endif
255 251
@@ -359,7 +355,7 @@ static void select_row(uint8_t row)
359 if (row < 7) { 355 if (row < 7) {
360 // select on mcp23018 356 // select on mcp23018
361 if (mcp23018_status) { // do nothing on error 357 if (mcp23018_status) { // do nothing on error
362 } else { // set active row low : 0 // set other rows hi-Z : 1 358 } else { // set active row low : 0 // set other rows hi-Z : 1
363 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 359 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
364 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 360 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
365 mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 361 mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;