diff options
author | James Churchill <pelrun@gmail.com> | 2019-01-27 16:30:25 +1000 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-01-27 08:37:26 -0800 |
commit | 6d2071ad6e9bdeb63126c00c4baea88d597cd7d7 (patch) | |
tree | 78a5b24c7f801e6188b740d5e5db9429b68f8cee | |
parent | 4d9b11af14fd83c1e6b556165d41ce005abb4a84 (diff) | |
download | qmk_firmware-6d2071ad6e9bdeb63126c00c4baea88d597cd7d7.tar.gz qmk_firmware-6d2071ad6e9bdeb63126c00c4baea88d597cd7d7.zip |
Fix `1<col` instead of `1<<col` typo in matrix_is_on()
-rw-r--r-- | keyboards/chimera_ergo/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/chimera_ls/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/chimera_ortho/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/comet46/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/dc01/arrow/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/dc01/left/matrix.c | 8 | ||||
-rw-r--r-- | keyboards/dc01/numpad/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/dc01/right/matrix.c | 2 | ||||
-rwxr-xr-x | keyboards/dichotomy/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/handwired/promethium/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/kmac/matrix.c | 2 | ||||
-rwxr-xr-x | keyboards/kmini/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/mitosis/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/redox_w/matrix.c | 8 | ||||
-rw-r--r-- | keyboards/sx60/matrix.c | 8 | ||||
-rw-r--r-- | keyboards/telophase/matrix.c | 4 | ||||
-rw-r--r-- | quantum/matrix.c | 2 |
17 files changed, 32 insertions, 32 deletions
diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c index 21d46ef9b4..d512a51d97 100644 --- a/keyboards/chimera_ergo/matrix.c +++ b/keyboards/chimera_ergo/matrix.c @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -134,7 +134,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c index 665d0d3573..72fe441370 100644 --- a/keyboards/chimera_ls/matrix.c +++ b/keyboards/chimera_ls/matrix.c @@ -116,7 +116,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -138,7 +138,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c index 66d29f8b38..dc38ba74f8 100644 --- a/keyboards/chimera_ortho/matrix.c +++ b/keyboards/chimera_ortho/matrix.c @@ -102,7 +102,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -124,7 +124,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c index 66d29f8b38..dc38ba74f8 100644 --- a/keyboards/comet46/matrix.c +++ b/keyboards/comet46/matrix.c @@ -102,7 +102,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -124,7 +124,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index 85591f6026..dd5e2ee9c9 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index 806583580d..cbe3b3f3d8 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -158,7 +158,7 @@ void matrix_init(void) { matrix[i] = 0; matrix_debouncing[i] = 0; } - + matrix_init_quantum(); } @@ -209,7 +209,7 @@ uint8_t matrix_scan(void) debouncing = false; } # endif - + if (i2c_transaction(SLAVE_I2C_ADDRESS_RIGHT, 0x3F, 0)){ //error has occured for main right half error_count_right++; if (error_count_right > ERROR_DISCONNECT_COUNT){ //disconnect half @@ -220,7 +220,7 @@ uint8_t matrix_scan(void) }else{ //no error error_count_right = 0; } - + if (i2c_transaction(SLAVE_I2C_ADDRESS_ARROW, 0X3FFF, 8)){ //error has occured for arrow cluster error_count_arrow++; if (error_count_arrow > ERROR_DISCONNECT_COUNT){ //disconnect arrow cluster @@ -258,7 +258,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index 39637241d7..5a13f3ff24 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 50fe19b8d1..6d981797c3 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index 14c3f0d8e3..f14c901288 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -198,7 +198,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c index 00f2b8e9dc..0b4456e289 100644 --- a/keyboards/handwired/promethium/matrix.c +++ b/keyboards/handwired/promethium/matrix.c @@ -167,7 +167,7 @@ inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c index cfafa90e66..82f0621f2b 100644 --- a/keyboards/kmac/matrix.c +++ b/keyboards/kmac/matrix.c @@ -97,7 +97,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c index 5f9bfe3d7f..69135909a5 100755 --- a/keyboards/kmini/matrix.c +++ b/keyboards/kmini/matrix.c @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c index 4b87242b91..e149b68bd7 100644 --- a/keyboards/mitosis/matrix.c +++ b/keyboards/mitosis/matrix.c @@ -103,7 +103,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -125,7 +125,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c index 5e61103f20..31233af101 100644 --- a/keyboards/redox_w/matrix.c +++ b/keyboards/redox_w/matrix.c @@ -1,15 +1,15 @@ /* Copyright 2017 Mattia Dal Ben - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -132,7 +132,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c index e91b4f4418..634a98a12c 100644 --- a/keyboards/sx60/matrix.c +++ b/keyboards/sx60/matrix.c @@ -137,7 +137,7 @@ void matrix_init(void) { uint8_t matrix_scan(void) { - if (mcp23018_status) { + if (mcp23018_status) { /* if there was an error */ if (++mcp23018_reset_loop == 0) { /* since mcp23018_reset_loop is 8 bit - we'll try to reset once in 255 matrix scans @@ -190,7 +190,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline @@ -246,7 +246,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) select_row(current_row); wait_us(30); - if (mcp23018_status) { + if (mcp23018_status) { /* if there was an error */ return 0; } else { @@ -279,7 +279,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void select_row(uint8_t row) { - if (mcp23018_status) { + if (mcp23018_status) { /* if there was an error do nothing */ } else { /* set active row low : 0 diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c index b3544453e7..c332eba556 100644 --- a/keyboards/telophase/matrix.c +++ b/keyboards/telophase/matrix.c @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) if (timeout > 10000){ break; } - } + } uart_data[i] = SERIAL_UART_DATA; } @@ -134,7 +134,7 @@ uint8_t matrix_scan(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/quantum/matrix.c b/quantum/matrix.c index 49a1845696..d2b805d7f1 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -184,7 +184,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline |