aboutsummaryrefslogtreecommitdiff
path: root/quantum/split_common/matrix.c
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-02-21 03:49:33 +0000
committerGitHub <noreply@github.com>2020-02-21 14:49:33 +1100
commit7707724dc4864cb4ede738ee9e2c3568df99ced2 (patch)
treea8107c5eaf6254ce71ae1e3c4b61d69b6c4ef7d4 /quantum/split_common/matrix.c
parent42d6270f28831e95d1cb9c14a7423d5b1d864d67 (diff)
downloadqmk_firmware-7707724dc4864cb4ede738ee9e2c3568df99ced2.tar.gz
qmk_firmware-7707724dc4864cb4ede738ee9e2c3568df99ced2.zip
Allow 30us matrix delay to be keyboard/user overridable (#8216)
* Allow 30us matrix delay to be configurable via define * Move wait logic to matrix_common * Move wait logic to matrix_common - fix wait includes
Diffstat (limited to 'quantum/split_common/matrix.c')
-rw-r--r--quantum/split_common/matrix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index 2c0e028f7..a82334128 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17#include <stdint.h> 17#include <stdint.h>
18#include <stdbool.h> 18#include <stdbool.h>
19#include "wait.h"
20#include "util.h" 19#include "util.h"
21#include "matrix.h" 20#include "matrix.h"
22#include "debounce.h" 21#include "debounce.h"
@@ -111,7 +110,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
111 110
112 // Select row and wait for row selecton to stabilize 111 // Select row and wait for row selecton to stabilize
113 select_row(current_row); 112 select_row(current_row);
114 wait_us(30); 113 matrix_io_delay();
115 114
116 // For each col... 115 // For each col...
117 for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { 116 for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
@@ -155,7 +154,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
155 154
156 // Select col and wait for col selecton to stabilize 155 // Select col and wait for col selecton to stabilize
157 select_col(current_col); 156 select_col(current_col);
158 wait_us(30); 157 matrix_io_delay();
159 158
160 // For each row... 159 // For each row...
161 for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { 160 for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {