summaryrefslogtreecommitdiff
path: root/keyboards/comet46/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/comet46/matrix.c')
-rw-r--r--keyboards/comet46/matrix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c
index 34930af7e2..1403f410c0 100644
--- a/keyboards/comet46/matrix.c
+++ b/keyboards/comet46/matrix.c
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "matrix.h"
#include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
#if (MATRIX_COLS <= 8)
# define print_matrix_header() print("\nr/c 01234567\n")
@@ -79,7 +79,7 @@ uint8_t matrix_cols(void) {
void matrix_init(void) {
matrix_init_quantum();
- serial_init();
+ uart_init(1000000);
}
uint8_t matrix_scan(void)
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void)
uint32_t timeout = 0;
//the s character requests the RF slave to send the matrix
- SERIAL_UART_DATA = 's';
+ uart_write('s');
//trust the external keystates entirely, erase the last data
uint8_t uart_data[11] = {0};
@@ -97,13 +97,13 @@ uint8_t matrix_scan(void)
//wait for the serial data, timeout if it's been too long
//this only happened in testing with a loose wire, but does no
//harm to leave it in here
- while(!SERIAL_UART_RXD_PRESENT){
+ while(!uart_available()){
timeout++;
if (timeout > 10000){
break;
}
}
- uart_data[i] = SERIAL_UART_DATA;
+ uart_data[i] = uart_read();
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0