diff options
author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2021-01-13 10:46:22 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-13 12:46:22 +1100 |
commit | 302b35c2a0ac90208e523944e8cc4b44a793d8d5 (patch) | |
tree | 473bf6d47b42125027fde59c409971b0b1c925c6 /quantum/split_common/matrix.c | |
parent | 017aa5988af308ae6d585b4afea6f28c28e2d238 (diff) | |
download | qmk_firmware-302b35c2a0ac90208e523944e8cc4b44a793d8d5.tar.gz qmk_firmware-302b35c2a0ac90208e523944e8cc4b44a793d8d5.zip |
fix matrix_io_delay() timing in quantum/matrix.c (#9603)
* fix matrix_io_delay() timing in quantum/matrix.c
* Updated comments explaining the need for matrix_io_delay() in quantum/matrix.c
* fix matrix_io_delay() timing in quantum/split_common/matrix.c
* Update quantum/matrix.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/split_common/matrix.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/matrix.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/split_common/matrix.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* add waitOutputPinValid() and wait_cpuclock() into quantum/quantum.h and tmk_core/common/wait.h
* add matrix_output_select_delay() and matrix_output_unselect_delay()
* fix quantum/matrix_common.c, tmk_core/common/matrix.h
* fix tmk_core/common/wait.h
* fix quantum/quantum.h, tmk_core/common/wait.h
* waitOutputPinValid() rename to waitInputPinDelay() in quantum/quantum.h.
* waitOutputPinValid() rename to waitInputPinDelay() in quantum/matrix_common.c
* update tmk_core/common/wait.h
* update comment in quantum/matrix.c, quantum/split_common/matrix.c
* update quantum/quantum.h: Make more margin in the GPIO_INPUT_PIN_DELAY default value.
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'quantum/split_common/matrix.c')
-rw-r--r-- | quantum/split_common/matrix.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index 06bab734e..067815c99 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c | |||
@@ -114,9 +114,9 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) | |||
114 | // Start with a clear matrix row | 114 | // Start with a clear matrix row |
115 | matrix_row_t current_row_value = 0; | 115 | matrix_row_t current_row_value = 0; |
116 | 116 | ||
117 | // Select row and wait for row selecton to stabilize | 117 | // Select row |
118 | select_row(current_row); | 118 | select_row(current_row); |
119 | matrix_io_delay(); | 119 | matrix_output_select_delay(); |
120 | 120 | ||
121 | // For each col... | 121 | // For each col... |
122 | for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { | 122 | for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { |
@@ -129,6 +129,9 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) | |||
129 | 129 | ||
130 | // Unselect row | 130 | // Unselect row |
131 | unselect_row(current_row); | 131 | unselect_row(current_row); |
132 | if (current_row + 1 < MATRIX_ROWS) { | ||
133 | matrix_output_unselect_delay(); // wait for row signal to go HIGH | ||
134 | } | ||
132 | 135 | ||
133 | // If the row has changed, store the row and return the changed flag. | 136 | // If the row has changed, store the row and return the changed flag. |
134 | if (current_matrix[current_row] != current_row_value) { | 137 | if (current_matrix[current_row] != current_row_value) { |
@@ -160,9 +163,9 @@ static void init_pins(void) { | |||
160 | static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { | 163 | static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { |
161 | bool matrix_changed = false; | 164 | bool matrix_changed = false; |
162 | 165 | ||
163 | // Select col and wait for col selecton to stabilize | 166 | // Select col |
164 | select_col(current_col); | 167 | select_col(current_col); |
165 | matrix_io_delay(); | 168 | matrix_output_select_delay(); |
166 | 169 | ||
167 | // For each row... | 170 | // For each row... |
168 | for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { | 171 | for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { |
@@ -188,6 +191,9 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) | |||
188 | 191 | ||
189 | // Unselect col | 192 | // Unselect col |
190 | unselect_col(current_col); | 193 | unselect_col(current_col); |
194 | if (current_col + 1 < MATRIX_COLS) { | ||
195 | matrix_output_unselect_delay(); // wait for col signal to go HIGH | ||
196 | } | ||
191 | 197 | ||
192 | return matrix_changed; | 198 | return matrix_changed; |
193 | } | 199 | } |