aboutsummaryrefslogtreecommitdiff
path: root/keyboards/dc01/left/matrix.c
diff options
context:
space:
mode:
authorJames Churchill <pelrun@gmail.com>2019-01-27 16:30:25 +1000
committerDrashna Jaelre <drashna@live.com>2019-01-27 08:37:26 -0800
commit6d2071ad6e9bdeb63126c00c4baea88d597cd7d7 (patch)
tree78a5b24c7f801e6188b740d5e5db9429b68f8cee /keyboards/dc01/left/matrix.c
parent4d9b11af14fd83c1e6b556165d41ce005abb4a84 (diff)
downloadqmk_firmware-6d2071ad6e9bdeb63126c00c4baea88d597cd7d7.tar.gz
qmk_firmware-6d2071ad6e9bdeb63126c00c4baea88d597cd7d7.zip
Fix `1<col` instead of `1<<col` typo in matrix_is_on()
Diffstat (limited to 'keyboards/dc01/left/matrix.c')
-rw-r--r--keyboards/dc01/left/matrix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index 806583580..cbe3b3f3d 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -158,7 +158,7 @@ void matrix_init(void) {
158 matrix[i] = 0; 158 matrix[i] = 0;
159 matrix_debouncing[i] = 0; 159 matrix_debouncing[i] = 0;
160 } 160 }
161 161
162 matrix_init_quantum(); 162 matrix_init_quantum();
163} 163}
164 164
@@ -209,7 +209,7 @@ uint8_t matrix_scan(void)
209 debouncing = false; 209 debouncing = false;
210 } 210 }
211# endif 211# endif
212 212
213 if (i2c_transaction(SLAVE_I2C_ADDRESS_RIGHT, 0x3F, 0)){ //error has occured for main right half 213 if (i2c_transaction(SLAVE_I2C_ADDRESS_RIGHT, 0x3F, 0)){ //error has occured for main right half
214 error_count_right++; 214 error_count_right++;
215 if (error_count_right > ERROR_DISCONNECT_COUNT){ //disconnect half 215 if (error_count_right > ERROR_DISCONNECT_COUNT){ //disconnect half
@@ -220,7 +220,7 @@ uint8_t matrix_scan(void)
220 }else{ //no error 220 }else{ //no error
221 error_count_right = 0; 221 error_count_right = 0;
222 } 222 }
223 223
224 if (i2c_transaction(SLAVE_I2C_ADDRESS_ARROW, 0X3FFF, 8)){ //error has occured for arrow cluster 224 if (i2c_transaction(SLAVE_I2C_ADDRESS_ARROW, 0X3FFF, 8)){ //error has occured for arrow cluster
225 error_count_arrow++; 225 error_count_arrow++;
226 if (error_count_arrow > ERROR_DISCONNECT_COUNT){ //disconnect arrow cluster 226 if (error_count_arrow > ERROR_DISCONNECT_COUNT){ //disconnect arrow cluster
@@ -258,7 +258,7 @@ bool matrix_is_modified(void)
258inline 258inline
259bool matrix_is_on(uint8_t row, uint8_t col) 259bool matrix_is_on(uint8_t row, uint8_t col)
260{ 260{
261 return (matrix[row] & ((matrix_row_t)1<col)); 261 return (matrix[row] & ((matrix_row_t)1<<col));
262} 262}
263 263
264inline 264inline