From 756d92c1a071b6c481b67a44671308fc9d680afe Mon Sep 17 00:00:00 2001
From: Kosuke Adachi <ks@fstn.jp>
Date: Mon, 5 Nov 2018 03:46:26 +0900
Subject: Keyboard: Update the serial.c of crkbd based on the helix-serial.c
 (#4349)

---
 keyboards/crkbd/rev1/serial_config.h | 12 +++------
 keyboards/crkbd/rev1/split_scomm.c   | 49 +++++++++++++++++++++++++-----------
 keyboards/crkbd/rev1/split_scomm.h   |  5 +++-
 keyboards/crkbd/rev1/split_util.h    |  5 +++-
 4 files changed, 45 insertions(+), 26 deletions(-)

(limited to 'keyboards/crkbd/rev1')

diff --git a/keyboards/crkbd/rev1/serial_config.h b/keyboards/crkbd/rev1/serial_config.h
index 671ed821d2..4fab8e8ddf 100644
--- a/keyboards/crkbd/rev1/serial_config.h
+++ b/keyboards/crkbd/rev1/serial_config.h
@@ -1,10 +1,4 @@
-#pragma once
-
-/* Soft Serial defines */
-#define SERIAL_PIN_DDR DDRD
-#define SERIAL_PIN_PORT PORTD
-#define SERIAL_PIN_INPUT PIND
-#define SERIAL_PIN_MASK _BV(PD2)
-#define SERIAL_PIN_INTERRUPT INT2_vect
-
+#ifndef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN D2
 #define SERIAL_USE_MULTI_TRANSACTION
+#endif
diff --git a/keyboards/crkbd/rev1/split_scomm.c b/keyboards/crkbd/rev1/split_scomm.c
index 9719eb22ea..ada7867960 100644
--- a/keyboards/crkbd/rev1/split_scomm.c
+++ b/keyboards/crkbd/rev1/split_scomm.c
@@ -7,8 +7,8 @@
 #include <stddef.h>
 #include <split_scomm.h>
 #include "serial.h"
-#ifdef SERIAL_DEBUG_MODE
-#include <avr/io.h>
+#ifdef CONSOLE_ENABLE
+  #include <print.h>
 #endif
 
 uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
@@ -17,6 +17,7 @@ uint8_t volatile status_com = 0;
 uint8_t volatile status1 = 0;
 uint8_t slave_buffer_change_count = 0;
 uint8_t s_change_old = 0xff;
+uint8_t s_change_new = 0xff;
 
 SSTD_t transactions[] = {
 #define GET_SLAVE_STATUS 0
@@ -41,12 +42,12 @@ SSTD_t transactions[] = {
 
 void serial_master_init(void)
 {
-    soft_serial_initiator_init(transactions);
+    soft_serial_initiator_init(transactions, TID_LIMIT(transactions));
 }
 
 void serial_slave_init(void)
 {
-    soft_serial_target_init(transactions);
+    soft_serial_target_init(transactions, TID_LIMIT(transactions));
 }
 
 // 0 => no error
@@ -54,19 +55,37 @@ void serial_slave_init(void)
 // 2 => checksum error
 int serial_update_buffers(int master_update)
 {
-    int status;
+    int status, smatstatus;
     static int need_retry = 0;
-    if( s_change_old != slave_buffer_change_count ) {
-	status = soft_serial_transaction(GET_SLAVE_BUFFER);
-	if( status == TRANSACTION_END )
-	    s_change_old = slave_buffer_change_count;
+
+    if( s_change_old != s_change_new ) {
+        smatstatus = soft_serial_transaction(GET_SLAVE_BUFFER);
+        if( smatstatus == TRANSACTION_END ) {
+            s_change_old = s_change_new;
+#ifdef CONSOLE_ENABLE
+            uprintf("slave matrix = %b %b %b %b %b\n",
+                    serial_slave_buffer[0], serial_slave_buffer[1],
+                    serial_slave_buffer[2], serial_slave_buffer[3],
+                    serial_slave_buffer[4] );
+#endif
+        }
+    } else {
+        // serial_slave_buffer dosen't change
+        smatstatus = TRANSACTION_END; // dummy status
+    }
+
+    if( !master_update && !need_retry) {
+        status = soft_serial_transaction(GET_SLAVE_STATUS);
+    } else {
+        status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
+    }
+    if( status == TRANSACTION_END ) {
+        s_change_new = slave_buffer_change_count;
+        need_retry = 0;
+    } else {
+        need_retry = 1;
     }
-    if( !master_update && !need_retry)
-	status = soft_serial_transaction(GET_SLAVE_STATUS);
-    else
-	status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
-    need_retry = ( status == TRANSACTION_END ) ? 0 : 1;
-    return status;
+    return smatstatus;
 }
 
 #endif // SERIAL_USE_MULTI_TRANSACTION
diff --git a/keyboards/crkbd/rev1/split_scomm.h b/keyboards/crkbd/rev1/split_scomm.h
index 16887eb74f..873d8939d8 100644
--- a/keyboards/crkbd/rev1/split_scomm.h
+++ b/keyboards/crkbd/rev1/split_scomm.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SPLIT_COMM_H
+#define SPLIT_COMM_H
 
 #ifndef SERIAL_USE_MULTI_TRANSACTION
 /* --- USE Simple API (OLD API, compatible with let's split serial.c) --- */
@@ -19,3 +20,5 @@ void serial_slave_init(void);
 int serial_update_buffers(int master_changed);
 
 #endif
+
+#endif /* SPLIT_COMM_H */
diff --git a/keyboards/crkbd/rev1/split_util.h b/keyboards/crkbd/rev1/split_util.h
index f593047560..687ca19bd3 100644
--- a/keyboards/crkbd/rev1/split_util.h
+++ b/keyboards/crkbd/rev1/split_util.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SPLIT_KEYBOARD_UTIL_H
+#define SPLIT_KEYBOARD_UTIL_H
 
 #include <stdbool.h>
 #include "eeconfig.h"
@@ -14,3 +15,5 @@ void split_keyboard_setup(void);
 bool has_usb(void);
 
 void matrix_master_OLED_init (void);
+
+#endif
-- 
cgit v1.2.3