summaryrefslogtreecommitdiff
path: root/keyboards/centromere
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-12-15 22:00:39 +1100
committerGitHub <noreply@github.com>2021-12-15 11:00:39 +0000
commitc12268807d8622a05dc445e6101a575eae16860d (patch)
treeaa9c32aac0a35235143c012ca1d021fe43b0c818 /keyboards/centromere
parentc0bb15315170f9265143833ad879b7c8f87b06ac (diff)
downloadqmk_firmware-c12268807d8622a05dc445e6101a575eae16860d.tar.gz
qmk_firmware-c12268807d8622a05dc445e6101a575eae16860d.zip
Migrate serial_uart usages to UART driver (#15479)
* Migrate Thermal Printer feature to UART driver * Migrate 40percentclub UT47 to UART driver * Migrate Centromere to UART driver * Migrate Chimera Ergo to UART driver * Migrate Chimera Let's Split to UART driver * Migrate Chimera Ortho to UART driver * Migrate Chimera Ortho Plus to UART driver * Migrate Comet46 to UART driver * Migrate Palm USB converter to UART driver * Migrate Sun USB converter to UART driver * Migrate Dichotomy to UART driver * Migrate Honeycomb to UART driver * Migrate Mitosis to UART driver * Migrate Redox W to UART driver * Migrate Uni660 to UART driver * Migrate Telophase to UART driver
Diffstat (limited to 'keyboards/centromere')
-rw-r--r--keyboards/centromere/config.h9
-rw-r--r--keyboards/centromere/matrix.c10
-rw-r--r--keyboards/centromere/rules.mk3
3 files changed, 7 insertions, 15 deletions
diff --git a/keyboards/centromere/config.h b/keyboards/centromere/config.h
index e502e2534b..b4cae20332 100644
--- a/keyboards/centromere/config.h
+++ b/keyboards/centromere/config.h
@@ -56,12 +56,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 500000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM \
- /* enable TX and RX */ \
- UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
- /* 8-bit data */ \
- UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c
index 7256cd5cb5..a46701275a 100644
--- a/keyboards/centromere/matrix.c
+++ b/keyboards/centromere/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")
@@ -80,7 +80,7 @@ uint8_t matrix_cols(void) {
void matrix_init(void) {
matrix_init_quantum();
- serial_init();
+ uart_init(500000);
}
uint8_t matrix_scan(void)
@@ -88,7 +88,7 @@ uint8_t matrix_scan(void)
uint32_t timeout = 0;
//the s character requests the RF remote slave to send the matrix information
- SERIAL_UART_DATA = 's';
+ uart_write('s');
//trust the external keystates, erase the last set of data
uint8_t uart_data[11] = {0};
@@ -96,13 +96,13 @@ uint8_t matrix_scan(void)
//there are 10 bytes corresponding to 1w columns, and an end byte
for (uint8_t i = 0; i < 11; i++) {
//wait for the serial data, timeout if it's been too long
- 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
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index ed777e1b9e..15c6a20746 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -21,6 +21,7 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
UNICODE_ENABLE = yes # Unicode
# # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
LAYOUTS = split_3x5_3 split_3x6_3