Serial refactor (#11521)

4 files changed, 9 insertions, 38 deletions

diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c
index 0710b8e33..7c7edba93 100644
--- a/keyboards/comet46/comet46.c
+++ b/keyboards/comet46/comet46.c
@@ -1,22 +1 @@
 #include "comet46.h"
-
-void uart_init(void) {
-        SERIAL_UART_INIT();
-}
-
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-        uart_init();
-}
-
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/comet46/config.h b/keyboards/comet46/config.h
index d50224eb6..5ae026f92 100644
--- a/keyboards/comet46/config.h
+++ b/keyboards/comet46/config.h
@@ -66,19 +66,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //UART settings for communication with the RF microcontroller
 #define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_DATA UDR1
-#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1)
-#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
 #define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT() do { \
-        /* baud rate */ \
-        UBRR1L = SERIAL_UART_UBRR; \
-        /* baud rate */ \
-        UBRR1H = SERIAL_UART_UBRR >> 8; \
-        /* enable TX and RX */ \
-        UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-        /* 8-bit data */ \
-        UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
-        } while(0)
+#define SERIAL_UART_INIT_CUSTOM       \
+    /* enable TX and RX */            \
+    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
+    /* 8-bit data */                  \
+    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
 
 #endif
diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c
index dc38ba74f..eb2f18473 100644
--- a/keyboards/comet46/matrix.c
+++ b/keyboards/comet46/matrix.c
@@ -26,6 +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"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -78,12 +79,11 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
+    serial_init();
 }
 
 uint8_t matrix_scan(void)
 {
-    SERIAL_UART_INIT();
-
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk
index 2aaa5483c..1f22b7535 100644
--- a/keyboards/comet46/rules.mk
+++ b/keyboards/comet46/rules.mk
@@ -28,8 +28,8 @@ NKRO_ENABLE = yes		# USB Nkey Rollover - not yet supported in LUFA
 UNICODE_ENABLE = YES            # Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
 
-USB = /dev/ttyACM0
 # project specific files
 SRC += matrix.c \
        i2c.c \
-       ssd1306.c
+       ssd1306.c \
+       serial_uart.c