aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authorWilliam Chang <william@factual.com>2019-07-13 10:18:33 -0700
committerWilliam Chang <william@factual.com>2019-07-13 10:18:33 -0700
commit71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (patch)
tree3bb3e5e496621535611e087720aa5c4d7a533e5e /quantum/matrix.c
parent86ad4988fe7ff64916127509d84f44c56fa097aa (diff)
parentda1f05fbc19477c05c0c01bb07fabfaf1ece9d54 (diff)
downloadfirmware-71493b2f9bbd5f3d18373c518fa14ccafcbf48fc.tar.gz
firmware-71493b2f9bbd5f3d18373c518fa14ccafcbf48fc.tar.bz2
firmware-71493b2f9bbd5f3d18373c518fa14ccafcbf48fc.zip
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r--quantum/matrix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index ca63f50f2..7ccac3533 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -183,7 +183,7 @@ static void unselect_row(uint8_t row)
static void unselect_rows(void)
{
for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInput(row_pins[x]);
+ setPinInputHigh(row_pins[x]);
}
}
@@ -326,5 +326,5 @@ uint8_t matrix_scan(void)
debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
matrix_scan_quantum();
- return 1;
+ return (uint8_t)changed;
}