diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-05 22:21:23 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-05 22:21:23 +0000 |
| commit | 843643aef36165ee6b00a52e19a272e69f19e6e1 (patch) | |
| tree | e033218c8d1c6fed65b360e684b41530e96dca8a /keyboards/centromere/matrix.c | |
| parent | c3eee3a842366497abeacc22c02020622a339c46 (diff) | |
| parent | 5ea92a9c1cbe3e20bf4830d550d797a8e9650da8 (diff) | |
| download | qmk_firmware-843643aef36165ee6b00a52e19a272e69f19e6e1.tar.gz qmk_firmware-843643aef36165ee6b00a52e19a272e69f19e6e1.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/centromere/matrix.c')
| -rw-r--r-- | keyboards/centromere/matrix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c index c5fc8db6c..5ca083b43 100644 --- a/keyboards/centromere/matrix.c +++ b/keyboards/centromere/matrix.c | |||
| @@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 26 | #include "util.h" | 26 | #include "util.h" |
| 27 | #include "matrix.h" | 27 | #include "matrix.h" |
| 28 | #include "timer.h" | 28 | #include "timer.h" |
| 29 | #include "protocol/serial.h" | ||
| 29 | 30 | ||
| 30 | #if (MATRIX_COLS <= 8) | 31 | #if (MATRIX_COLS <= 8) |
| 31 | # define print_matrix_header() print("\nr/c 01234567\n") | 32 | # define print_matrix_header() print("\nr/c 01234567\n") |
| @@ -79,12 +80,11 @@ uint8_t matrix_cols(void) { | |||
| 79 | void matrix_init(void) { | 80 | void matrix_init(void) { |
| 80 | 81 | ||
| 81 | matrix_init_quantum(); | 82 | matrix_init_quantum(); |
| 83 | serial_init(); | ||
| 82 | } | 84 | } |
| 83 | 85 | ||
| 84 | uint8_t matrix_scan(void) | 86 | uint8_t matrix_scan(void) |
| 85 | { | 87 | { |
| 86 | SERIAL_UART_INIT(); | ||
| 87 | |||
| 88 | uint32_t timeout = 0; | 88 | uint32_t timeout = 0; |
| 89 | 89 | ||
| 90 | //the s character requests the RF remote slave to send the matrix information | 90 | //the s character requests the RF remote slave to send the matrix information |
