summaryrefslogtreecommitdiff
path: root/keyboards/sx60
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/sx60
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/sx60')
-rw-r--r--keyboards/sx60/matrix.c8
1 files changed, 4 insertions, 4 deletions
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