7 files changed, 20 insertions, 29 deletions
diff --git a/keyboards/40percentclub/ut47/keymaps/default/keymap.c b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
index 0fa7838dfd..4eb2c190c1 100644
--- a/keyboards/40percentclub/ut47/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -108,11 +108,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
index 0c1c2e7599..8a0ba7b391 100644
--- a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -108,11 +108,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
index 52372e2857..5e79cdb9a4 100644
--- a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 
 #endif
 
@@ -151,11 +151,11 @@ LAYOUT( /* GAMING, toggled on and off - L5 */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
index ae8ad3e378..75dba3a2d4 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -60,11 +60,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
index e47c7f8e13..89537592c5 100644
--- a/keyboards/40percentclub/ut47/matrix.c
+++ b/keyboards/40percentclub/ut47/matrix.c
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#ifdef LED_ENABLE
-    #include "protocol/serial.h"
-#endif
-
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
@@ -69,10 +65,6 @@ void matrix_init(void)
         matrix[i] = 0;
         matrix_debouncing[i] = 0;
     }
-  
-#ifdef LED_ENABLE
-    serial_init();
-#endif
 }
 
 uint8_t matrix_scan(void)
@@ -104,12 +96,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
index 29cee474ff..6c9805e0fc 100644
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -18,4 +18,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # custom matrix setup
 CUSTOM_MATRIX = yes
-SRC += matrix.c protocol/serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index 9054335e5a..864edaeb57 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -15,7 +15,11 @@
  */
 #include "ut47.h"
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
+
+void matrix_init_kb() {
+  uart_init(9600);
+}
 #endif
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
@@ -23,7 +27,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 	// runs for every action, just before processing by the firmware
   if (record->event.pressed) {
     #ifdef LED_ENABLE
-      serial_send((record->event.key.row*16)+record->event.key.col);
+      uart_write((record->event.key.row*16)+record->event.key.col);
     #endif
   }
 	return process_record_user(keycode, record);