From c12268807d8622a05dc445e6101a575eae16860d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 15 Dec 2021 22:00:39 +1100
Subject: 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
---
 keyboards/dichotomy/config.h    |  9 ---------
 keyboards/dichotomy/dichotomy.c |  8 +++++---
 keyboards/dichotomy/matrix.c    | 10 +++++-----
 keyboards/dichotomy/rules.mk    |  3 ++-
 4 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'keyboards/dichotomy')

diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h
index 03e19b1388..40e7f18e6f 100644
--- a/keyboards/dichotomy/config.h
+++ b/keyboards/dichotomy/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 1000000
-#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/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c
index 967d7e603c..afd52cc8b3 100755
--- a/keyboards/dichotomy/dichotomy.c
+++ b/keyboards/dichotomy/dichotomy.c
@@ -1,11 +1,13 @@
 #include "dichotomy.h"
 
+//#include "uart.h"
+
 void pointing_device_task(void){
 	/*report_mouse_t currentReport = {};
     uint32_t timeout = 0;
 
     //the m character requests the RF slave to send the mouse report
-    SERIAL_UART_DATA = 'm';
+    uart_write('m');
 
     //trust the external inputs completely, erase old data
     uint8_t uart_data[5] = {0};
@@ -15,7 +17,7 @@ void pointing_device_task(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){
 		xprintf("\r\nTIMED OUT");
@@ -23,7 +25,7 @@ void pointing_device_task(void){
             }
         }
 	xprintf("\r\nGOT DATA for %d",i);
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, bytes 1-4 are movement and scroll
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index ed83bd452c..806b66d498 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "dichotomy.h"
 #include "pointing_device.h"
 #include "report.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -94,7 +94,7 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -104,7 +104,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};
@@ -114,14 +114,14 @@ 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){
 		xprintf("\r\nTime out in keyboard.");
                 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/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index 2b5eb0360c..a6029e3dbf 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -18,4 +18,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
-- 
cgit v1.2.3