aboutsummaryrefslogtreecommitdiff
path: root/keyboards/custommk/evo70_r2/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk/evo70_r2/matrix.c')
-rw-r--r--keyboards/custommk/evo70_r2/matrix.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/keyboards/custommk/evo70_r2/matrix.c b/keyboards/custommk/evo70_r2/matrix.c
index 99a23a4542..5ee93a5c7d 100644
--- a/keyboards/custommk/evo70_r2/matrix.c
+++ b/keyboards/custommk/evo70_r2/matrix.c
@@ -1,6 +1,7 @@
// Copyright 2023 David Hoelscher (@customMK)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
+#include "matrix.h"
+#include <string.h>
// Pin definitions
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
@@ -9,7 +10,7 @@ void matrix_wait_for_pin(pin_t pin, uint8_t target_state) {
rtcnt_t start = chSysGetRealtimeCounterX();
rtcnt_t end = start + 5000;
while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) {
- if (readPin(pin) == target_state) {
+ if (gpio_read_pin(pin) == target_state) {
break;
}
}
@@ -26,22 +27,22 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) {
}
void shift_pulse_clock(void) {
- writePinHigh(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_high(COL_SHIFT_CLK_PIN);
matrix_wait_for_pin(COL_SHIFT_CLK_PIN, 1);
- writePinLow(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_low(COL_SHIFT_CLK_PIN);
}
void matrix_init_custom(void) {
//set all row pins as input with pullups
for (int i = 0; i < MATRIX_ROWS; ++i) {
- writePinHigh(row_pins[i]);
- setPinInputHigh(row_pins[i]);
+ gpio_write_pin_high(row_pins[i]);
+ gpio_set_pin_input_high(row_pins[i]);
}
//set all column pins high in ROW2COL matrix
- setPinOutput(COL_SHIFT_IN_PIN);
- setPinOutput(COL_SHIFT_CLK_PIN);
- writePinHigh(COL_SHIFT_IN_PIN);
+ gpio_set_pin_output(COL_SHIFT_IN_PIN);
+ gpio_set_pin_output(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_high(COL_SHIFT_IN_PIN);
matrix_wait_for_pin(COL_SHIFT_IN_PIN, 1);
for (int i = 0; i < MATRIX_COLS; ++i) {
@@ -53,13 +54,13 @@ void matrix_init_custom(void) {
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
static matrix_row_t temp_matrix[MATRIX_ROWS] = {0};
- writePinLow(COL_SHIFT_IN_PIN);
+ gpio_write_pin_low(COL_SHIFT_IN_PIN);
matrix_wait_for_pin(COL_SHIFT_IN_PIN, 0);
// Setup the output column pin
shift_pulse_clock();
- writePinHigh(COL_SHIFT_IN_PIN);
+ gpio_write_pin_high(COL_SHIFT_IN_PIN);
for (int current_col = 0; current_col < MATRIX_COLS; ++current_col) {
// Read the column ports