diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2021-07-24 01:05:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 09:05:06 -0700 |
| commit | 5b904a92c4ef143fe1d10927bbda94dd27f78a1d (patch) | |
| tree | 486d1f4355fc9675a9deb6ceee9923a0824c1152 | |
| parent | 6747890562d7580a8d9b82df764322bdcd294a3b (diff) | |
| download | qmk_firmware-5b904a92c4ef143fe1d10927bbda94dd27f78a1d.tar.gz qmk_firmware-5b904a92c4ef143fe1d10927bbda94dd27f78a1d.zip | |
[Keyboard] Fix symmetric70_proto build break on develop branch (#13667)
Co-authored-by: Drashna Jaelre <drashna@live.com>
| -rw-r--r-- | keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index a892707f8..ba0018a70 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c | |||
| @@ -205,7 +205,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) | |||
| 205 | # endif | 205 | # endif |
| 206 | if (MATRIX_IO_DELAY_ALWAYS || current_row + 1 < MATRIX_ROWS) { | 206 | if (MATRIX_IO_DELAY_ALWAYS || current_row + 1 < MATRIX_ROWS) { |
| 207 | MATRIX_DEBUG_DELAY_START(); | 207 | MATRIX_DEBUG_DELAY_START(); |
| 208 | matrix_output_unselect_delay(current_row, current_row_value != 0); | 208 | matrix_output_unselect_delay(current_row, current_row_value != 0); // wait for col signal to go HIGH |
| 209 | MATRIX_DEBUG_DELAY_END(); | 209 | MATRIX_DEBUG_DELAY_END(); |
| 210 | } | 210 | } |
| 211 | 211 | ||
| @@ -238,6 +238,7 @@ static void init_pins(void) { | |||
| 238 | 238 | ||
| 239 | static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { | 239 | static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { |
| 240 | bool matrix_changed = false; | 240 | bool matrix_changed = false; |
| 241 | bool key_pressed = false; | ||
| 241 | 242 | ||
| 242 | // Select col | 243 | // Select col |
| 243 | select_col(current_col); | 244 | select_col(current_col); |
| @@ -253,6 +254,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) | |||
| 253 | if (readPin(row_pins[row_index]) == 0) { | 254 | if (readPin(row_pins[row_index]) == 0) { |
| 254 | // Pin LO, set col bit | 255 | // Pin LO, set col bit |
| 255 | current_row_value |= (MATRIX_ROW_SHIFTER << current_col); | 256 | current_row_value |= (MATRIX_ROW_SHIFTER << current_col); |
| 257 | key_pressed = true; | ||
| 256 | } else { | 258 | } else { |
| 257 | // Pin HI, clear col bit | 259 | // Pin HI, clear col bit |
| 258 | current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col); | 260 | current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col); |
| @@ -268,7 +270,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) | |||
| 268 | // Unselect col | 270 | // Unselect col |
| 269 | unselect_col(current_col); | 271 | unselect_col(current_col); |
| 270 | if (MATRIX_IO_DELAY_ALWAYS || current_col + 1 < MATRIX_COLS) { | 272 | if (MATRIX_IO_DELAY_ALWAYS || current_col + 1 < MATRIX_COLS) { |
| 271 | matrix_output_unselect_delay(current_row, current_row_value != 0); | 273 | matrix_output_unselect_delay(current_col, key_pressed); // wait for col signal to go HIGH |
| 272 | } | 274 | } |
| 273 | 275 | ||
| 274 | return matrix_changed; | 276 | return matrix_changed; |
