From fc7e984c8a8d07d4ab2a1c982a20cbdca1f06ddd Mon Sep 17 00:00:00 2001
From: Takeshi Nishio <kkeennnn@gmail.com>
Date: Sat, 14 Mar 2020 09:36:31 +0900
Subject: [PATCH] =?UTF-8?q?Update=20Duplex-Matrix=E3=81=8C=E5=8B=95?=
 =?UTF-8?q?=E4=BD=9C=E3=81=97=E3=81=9F=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/test_duplex_dp/config.h             |  20 +-
 .../test_duplex_dp/keymaps/default/keymap.c   |  13 +-
 keyboards/test_duplex_dp/matrix.c             | 267 +++++++++++-------
 keyboards/test_duplex_dp/rules.mk             |   4 +-
 keyboards/test_duplex_dp/test_duplex_dp.h     |   6 +-
 5 files changed, 193 insertions(+), 117 deletions(-)

diff --git a/keyboards/test_duplex_dp/config.h b/keyboards/test_duplex_dp/config.h
index 6ba057f34e7..4458cb526cd 100644
--- a/keyboards/test_duplex_dp/config.h
+++ b/keyboards/test_duplex_dp/config.h
@@ -23,12 +23,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID 0xFEED
 #define PRODUCT_ID 0x0000
 #define DEVICE_VER 0x0001
-#define MANUFACTURER e3w2q
-#define PRODUCT 2x3test
+#define MANUFACTURER jpskenn
+#define PRODUCT test_duplex_dp
 #define DESCRIPTION A custom keyboard
 
 /* key matrix size */
-#define MATRIX_ROWS 2*2 // 行数 右手側と左手側があるので、*2
+#define MATRIX_ROWS 1*2 // 右手側と左手側があるので、*2
 #define MATRIX_COLS 3*2 // 列数 Duprex Matrix法により、*2
 
 /*
@@ -41,13 +41,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS { F6  }     // 各行に割り当てるピン番号
-#define MATRIX_COL_PINS { D1, D0, D4, D1, D0, D4 } // 各列に割り当てるピン番号
+#define MATRIX_ROW_PINS { F6 }     // 各行に割り当てるピン番号
+#define MATRIX_COL_PINS { D1, D0, D4 } // 各列に割り当てるピン番号
 #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 // #define DIODE_DIRECTION CUSTOM_MATRIX  // COL（列）のピンからROW（行）のピンに電流が流れるようにダイオードを付けた場合はCOL2ROW、逆向きの場合はROW2COL、独自にマトリクススキャンを行う場合はCUSTOM_MATRIX
-#define DIODE_DIRECTION BOTHWAYS
+// #define DIODE_DIRECTION CUSTOM_MATRIX
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
@@ -194,10 +194,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 /* disable these deprecated features by default */
-#ifndef LINK_TIME_OPTIMIZATION_ENABLE
-  #define NO_ACTION_MACRO
-  #define NO_ACTION_FUNCTION
-#endif
+// #ifndef LINK_TIME_OPTIMIZATION_ENABLE
+//   #define NO_ACTION_MACRO
+//   #define NO_ACTION_FUNCTION
+// #endif
 /*
  * MIDI options
  */
diff --git a/keyboards/test_duplex_dp/keymaps/default/keymap.c b/keyboards/test_duplex_dp/keymaps/default/keymap.c
index e98b18625f4..d8ba767aab7 100644
--- a/keyboards/test_duplex_dp/keymaps/default/keymap.c
+++ b/keyboards/test_duplex_dp/keymaps/default/keymap.c
@@ -30,10 +30,10 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_1,    KC_2,   KC_3,    KC_4, KC_5, KC_6, KC_7, KC_8
+        KC_1,    KC_2,   KC_3,    KC_4, KC_5, KC_6, KC_A,KC_B,KC_C,KC_D,KC_E,KC_F
     ),
     [_FN] = LAYOUT(
-      KC_1,    KC_2,   KC_3,    KC_4, KC_5, KC_6, KC_7, KC_8
+      KC_1,    KC_2,   KC_3,    KC_4, KC_5, KC_6, KC_A,KC_B,KC_C,KC_D,KC_E,KC_F
     )
 };
 
@@ -72,3 +72,12 @@ bool led_update_user(led_t led_state) {
     return true;
 }
 */
+
+// Debugging
+void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  debug_enable=true;
+  debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
diff --git a/keyboards/test_duplex_dp/matrix.c b/keyboards/test_duplex_dp/matrix.c
index a12ec9d4931..e0d7a23c750 100644
--- a/keyboards/test_duplex_dp/matrix.c
+++ b/keyboards/test_duplex_dp/matrix.c
@@ -16,50 +16,141 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <stdint.h>
 #include <stdbool.h>
-#include "wait.h"
 #include "util.h"
 #include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
 #include "split_util.h"
 #include "config.h"
-#include "quantum.h"
-#include "debounce.h"
 #include "transport.h"
+#include "wait.h"
+#include "print.h"
+#include "debug.h"
 
 #ifdef ENCODER_ENABLE
 #    include "encoder.h"
 #endif
 
 #if (MATRIX_COLS <= 8)
-#    define print_matrix_header() print("\nr/c 01234567\n")
-#    define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop(matrix[i])
+#    define print_matrix_header()  print("\nr/c 01234567\n")
+#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
+#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
-#    define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop16(matrix[i])
+#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
+#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
+#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
-#    define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop32(matrix[i])
-#    define ROW_SHIFTER ((uint32_t)1)
+#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
+#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
+#    define matrix_bitpop(i)       bitpop32(matrix[i])
+#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #define ERROR_DISCONNECT_COUNT 5
 
 #define ROWS_PER_HAND (MATRIX_ROWS / 2)
 
-#ifdef DIRECT_PINS
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
-#else
-static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+#ifdef MATRIX_MASKED
+    extern const matrix_row_t matrix_mask[];
 #endif
 
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
 /* matrix state(1:on, 0:off) */
-static matrix_row_t raw_matrix[ROWS_PER_HAND];  // raw values
-static matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
+static matrix_row_t matrix[MATRIX_ROWS]; //debounced values //ROWS_PER_HAND?
+
+__attribute__ ((weak))
+void matrix_init_quantum(void) {
+    matrix_init_kb();
+}
+
+__attribute__ ((weak))
+void matrix_scan_quantum(void) {
+    matrix_scan_kb();
+}
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
+inline
+uint8_t matrix_rows(void) {
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void) {
+    return MATRIX_COLS;
+}
+
+//Deprecated.
+bool matrix_is_modified(void)
+{
+    if (debounce_active()) return false;
+    return true;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & ((matrix_row_t)1<<col));
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
+    // switch blocker installed and the switch is always pressed.
+#ifdef MATRIX_MASKED
+    return matrix[row] & matrix_mask[row];
+#else
+    return matrix[row];
+#endif
+}
+
+void matrix_print(void)
+{
+    print_matrix_header();
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        phex(row); print(": ");
+        print_matrix_row(row);
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += matrix_bitpop(i);
+    }
+    return count;
+}
+
+
+// /* matrix state(1:on, 0:off) */
+// extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
+// extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
 // row offsets for each hand
 uint8_t thisHand, thatHand;
@@ -69,36 +160,6 @@ __attribute__((weak)) void matrix_slave_scan_user(void) {}
 
 // matrix code
 
-#ifdef DIRECT_PINS
-
-static void init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            pin_t pin = direct_pins[row][col];
-            if (pin != NO_PIN) {
-                setPinInputHigh(pin);
-            }
-        }
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    matrix_row_t last_row_value = current_matrix[current_row];
-    current_matrix[current_row] = 0;
-
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-        pin_t pin = direct_pins[current_row][col_index];
-        if (pin != NO_PIN) {
-            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-        }
-    }
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif defined(DIODE_DIRECTION)
-#    if (DIODE_DIRECTION == COL2ROW)
-
 static void select_row(uint8_t row) {
     setPinOutput(row_pins[row]);
     writePinLow(row_pins[row]);
@@ -112,41 +173,6 @@ static void unselect_rows(void) {
     }
 }
 
-static void init_pins(void) {
-    unselect_rows();
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[current_row];
-
-    // Clear data in matrix row
-    current_matrix[current_row] = 0;
-
-    // Select row and wait for row selecton to stabilize
-    select_row(current_row);
-    matrix_io_delay();
-
-    // For each col...
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-        // Select the col pin to read (active low)
-        uint8_t pin_state = readPin(col_pins[col_index]);
-
-        // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-    }
-
-    // Unselect row
-    unselect_row(current_row);
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#    elif (DIODE_DIRECTION == ROW2COL)
-
 static void select_col(uint8_t col) {
     setPinOutput(col_pins[col]);
     writePinLow(col_pins[col]);
@@ -155,24 +181,69 @@ static void select_col(uint8_t col) {
 static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
 
 static void unselect_cols(void) {
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    for (uint8_t x = 0; x < MATRIX_COLS / 2 ; x++) {
         setPinInputHigh(col_pins[x]);
     }
 }
 
 static void init_pins(void) {
+    unselect_rows();
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
     unselect_cols();
     for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
         setPinInputHigh(row_pins[x]);
     }
 }
 
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // NOTE Stop clearing to not to clear read_rows_on_col value.
+    // Clear data in matrix row
+    // current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    // matrix_io_delay();
+    wait_us(30);
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) {
+        // // Select the col pin to read (active low)
+        // uint8_t pin_state = readPin(col_pins[col_index]);
+        //
+        // // Populate the matrix row with the state of the col pin
+        // current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
+
+        // Check col pin pin_state
+        if (readPin(col_pins[col_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[current_row] |= (ROW_SHIFTER << col_index);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[current_row] &= ~(ROW_SHIFTER << col_index);
+        }
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+// dprintf("\nCoR %d\n" ,(last_row_value != current_matrix[current_row]));
+// matrix_print();
+    return (last_row_value != current_matrix[current_row]);
+}
+
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+
     bool matrix_changed = false;
 
     // Select col and wait for col selecton to stabilize
     select_col(current_col);
-    matrix_io_delay();
+    // matrix_io_delay();
+    wait_us(30);
 
     // For each row...
     for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
@@ -182,12 +253,12 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
         // Check row pin state
         if (readPin(row_pins[row_index]) == 0) {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+            current_matrix[row_index] |= (ROW_SHIFTER << (current_col + MATRIX_COLS / 2));
         } else {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~(ROW_SHIFTER << (current_col + MATRIX_COLS / 2));
         }
-
+// dprintf("\nRoC %d\n", current_matrix[row_index]);
         // Determine if the matrix changed state
         if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
             matrix_changed = true;
@@ -196,16 +267,11 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 
     // Unselect col
     unselect_col(current_col);
-
+ // dprintf("\nRoC %d\n" ,matrix_changed);
     return matrix_changed;
 }
 
-#    else
-#        error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
-#    endif
-#else
-#    error DIODE_DIRECTION is not defined!
-#endif
+
 
 void matrix_init(void) {
     split_pre_init();
@@ -283,20 +349,19 @@ void matrix_post_scan(void) {
 uint8_t matrix_scan(void) {
     bool changed = false;
 
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
     // Set row, read cols
     for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
         changed |= read_cols_on_row(raw_matrix, current_row);
     }
-#elif (DIODE_DIRECTION == ROW2COL)
     // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS / 2; current_col++) {
         changed |= read_rows_on_col(raw_matrix, current_col);
     }
-#endif
 
     debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
 
     matrix_post_scan();
+    dprintf("\nR+C %d\n" ,changed);
+// dprintf("\nscan raw_matrix[0] = %d\n", raw_matrix[0]);
     return (uint8_t)changed;
 }
diff --git a/keyboards/test_duplex_dp/rules.mk b/keyboards/test_duplex_dp/rules.mk
index a6227abe153..72efbc77546 100644
--- a/keyboards/test_duplex_dp/rules.mk
+++ b/keyboards/test_duplex_dp/rules.mk
@@ -43,6 +43,8 @@ HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
 
 SPLIT_KEYBOARD = yes
 CUSTOM_MATRIX = yes         # for Duplex-Matrix
-SRC += matrix_apuro.c
+# SRC += matrix_apuro.c
 # SRC += my_matrix.c
 # SRC += matrix2x3.c
+# SRC += matrix_split.c
+SRC += matrix.c
diff --git a/keyboards/test_duplex_dp/test_duplex_dp.h b/keyboards/test_duplex_dp/test_duplex_dp.h
index 573175fff57..b49ceda0528 100644
--- a/keyboards/test_duplex_dp/test_duplex_dp.h
+++ b/keyboards/test_duplex_dp/test_duplex_dp.h
@@ -27,9 +27,9 @@
  * represents the switch matrix.
  */
 #define LAYOUT( \
-     l00, l01, l02, l03, r00, r01, r02, r03 \
+     l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05 \
  ) \
  { \
-     { l00, l01, l02, l03}, \
-     { r00, r01, r02, r03}, \
+     { l00, l01, l02, l03,l04,l05}, \
+     { r00, r01, r02, r03,r04,r05}, \
  }