Update Keychron K Pro series keyboards

1 files changed, 110 insertions, 94 deletions

diff --git a/keyboards/keychron/k13_pro/matrix.c b/keyboards/keychron/k13_pro/matrix.c
index 072cfc3280..22d2ac1e11 100755
--- a/keyboards/keychron/k13_pro/matrix.c
+++ b/keyboards/keychron/k13_pro/matrix.c
@@ -14,78 +14,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "stdint.h"
-#include "hal.h"
-#include "gpio.h"
 #include "quantum.h"
 
 #define HC595_STCP B0
 #define HC595_SHCP A1
 #define HC595_DS A7
 
-#define DIRECT_COL_NUM 1
-
 pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
-static inline void HC595_delay(uint16_t n) {
-    while (n-- > 0) {
-        asm volatile("nop" ::: "memory");
-    }
-}
-
-#ifdef DRIVE_SHRIFT_REGISTER_WITH_SPI
-// clang-format off
-const SPIConfig hs_spicfg = {
-    .circular = false,
-    .slave = false,
-    .data_cb = NULL,
-    .error_cb = NULL,
-    .ssport = PAL_PORT(HC595_STCP),
-    .sspad = PAL_PAD(HC595_STCP),
-    .cr1 = SPI_CR1_BR_1,
-    .cr2 = SPI_CR2_DS_3 | SPI_CR2_DS_2 | SPI_CR2_DS_1 | SPI_CR2_DS_0 | SPI_CR2_SSOE | SPI_CR2_NSSP
-};
-// clang-format on
-#endif
-static void HC595_output(uint16_t data) {
-#ifdef DRIVE_SHRIFT_REGISTER_WITH_SPI
-    spiSend(&SPID1, 1, &data);
-#else
-    uint8_t i;
-    uint8_t n = 1;
-
-    for (i = 16; i > 0; i--) {
-        writePinLow(HC595_SHCP);
-
-        if (data & 0x8000)
-            writePinHigh(HC595_DS);
-        else
-            writePinLow(HC595_DS);
-
-        data <<= 1;
-
-        HC595_delay(n);
-
-        writePinHigh(HC595_SHCP);
-        HC595_delay(n);
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
     }
-
-    HC595_delay(n);
-    writePinLow(HC595_STCP);
-    HC595_delay(n);
-    writePinHigh(HC595_STCP);
-#endif
 }
 
-static inline void setPinOutput_writeLow(pin_t pin) {
+static inline void setPinOutput_writeHigh(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
         setPinOutput(pin);
-        writePinLow(pin);
+        writePinHigh(pin);
     }
 }
 
-static inline void setPinInputHigh_atomic(pin_t pin) {
+static inline void setPinInput_high(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
         setPinInputHigh(pin);
     }
@@ -99,16 +51,65 @@ static inline uint8_t readMatrixPin(pin_t pin) {
     }
 }
 
+static inline void HC595_delay(uint16_t n) {
+    while (n-- > 0) {
+        asm volatile("nop" ::: "memory");
+    }
+}
+
+static void HC595_output(uint16_t data) {
+    ATOMIC_BLOCK_FORCEON {
+        for (uint8_t i = 0; i < MATRIX_COLS; i++) {
+            if (data & 0x1) {
+                writePinHigh(HC595_DS);
+            } else {
+                writePinLow(HC595_DS);
+            }
+
+            data = data >> 1;
+
+            writePinHigh(HC595_SHCP);
+            HC595_delay(1);
+            writePinLow(HC595_SHCP);
+            HC595_delay(1);
+        }
+        writePinHigh(HC595_STCP);
+        HC595_delay(1);
+        writePinLow(HC595_STCP);
+        HC595_delay(1);
+    }
+}
+
+static void HC595_output_oneBit(uint8_t data) {
+    ATOMIC_BLOCK_FORCEON {
+        if (data & 0x1) {
+            writePinHigh(HC595_DS);
+        } else {
+            writePinLow(HC595_DS);
+        }
+
+        writePinHigh(HC595_SHCP);
+        HC595_delay(1);
+        writePinLow(HC595_SHCP);
+        HC595_delay(1);
+
+        writePinHigh(HC595_STCP);
+        HC595_delay(1);
+        writePinLow(HC595_STCP);
+        HC595_delay(1);
+    }
+}
+
 static bool select_col(uint8_t col) {
     pin_t pin = col_pins[col];
 
-    if (col < 1) {
-        if (pin != NO_PIN) {
-            setPinOutput_writeLow(pin);
-            return true;
-        }
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
     } else {
-        HC595_output(~(0x01 << (col - 1)));
+        if (col == 1) {
+            HC595_output_oneBit(0x00);
+        }
         return true;
     }
     return false;
@@ -117,81 +118,96 @@ static bool select_col(uint8_t col) {
 static void unselect_col(uint8_t col) {
     pin_t pin = col_pins[col];
 
-    if (col < 1) {
-        if (pin != NO_PIN) {
-            setPinInputHigh_atomic(pin);
-        }
+    if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#else
+        setPinInput_high(pin);
+#endif
     } else {
-        if (col >= MATRIX_COLS - 1) HC595_output(0xFFFF);
+        HC595_output_oneBit(0x01);
     }
 }
 
 static void unselect_cols(void) {
-    if (col_pins[0] != NO_PIN) setPinInputHigh_atomic(col_pins[0]);
-    HC595_output(0xFFFF);
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+        if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+            setPinOutput_writeHigh(pin);
+#else
+            setPinInput_high(pin);
+#endif
+        } else {
+            if (x == 1) HC595_output(0xFFFF);
+        }
+    }
 }
 
 void select_all_cols(void) {
-    if (col_pins[0] != NO_PIN) setPinOutput_writeLow(col_pins[0]);
-    HC595_output(0x0000);
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        pin_t pin = col_pins[x];
+        if (pin != NO_PIN) {
+            setPinOutput_writeLow(pin);
+        } else {
+            if (x == 1) HC595_output(0x0000);
+        }
+    }
 }
 
-void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+    bool key_pressed = false;
+
     // Select col
     if (!select_col(current_col)) { // select col
         return;                     // skip NO_PIN col
     }
 
-    HC595_delay(100);
+    matrix_output_select_delay();
 
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
         // Check row pin state
         if (readMatrixPin(row_pins[row_index]) == 0) {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
-            // key_pressed = true;
+            current_matrix[row_index] |= row_shifter;
+            key_pressed = true;
         } else {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~row_shifter;
         }
     }
 
+    // Unselect col
     unselect_col(current_col);
-    HC595_delay(100);
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
 }
 
 void matrix_init_custom(void) {
+    setPinOutput(HC595_DS);
+    setPinOutput(HC595_STCP);
+    setPinOutput(HC595_SHCP);
+
     for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
         if (row_pins[x] != NO_PIN) {
-            setPinInputHigh_atomic(row_pins[x]);
+            setPinInput_high(row_pins[x]);
         }
     }
-#ifdef DRIVE_SHRIFT_REGISTER_WITH_SPI
-    palSetPadMode(PAL_PORT(HC595_SHCP), PAL_PAD(HC595_SHCP), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST); /* SCK */
-    palSetPadMode(PAL_PORT(HC595_DS), PAL_PAD(HC595_DS), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST);     /* MOSI*/
-    palSetPadMode(PAL_PORT(HC595_STCP), PAL_PAD(HC595_STCP), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST); /* CS*/
-    spiStart(&SPID1, &hs_spicfg);
-#else
-    setPinOutput(HC595_DS);
-    setPinOutput(HC595_STCP);
-    setPinOutput(HC595_SHCP);
-#endif
+
     unselect_cols();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool matrix_has_changed = false;
-
     matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
 
     // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-        matrix_read_rows_on_col(curr_matrix, current_col);
+    matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+        matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
     }
 
-    matrix_has_changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
-    if (matrix_has_changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
 
-    return matrix_has_changed;
+    return changed;
 }