diff options
Diffstat (limited to 'keyboards/qvex/lynepad2/matrix.c')
-rw-r--r-- | keyboards/qvex/lynepad2/matrix.c | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/keyboards/qvex/lynepad2/matrix.c b/keyboards/qvex/lynepad2/matrix.c index 878ee6e2f7..23b22cdb69 100644 --- a/keyboards/qvex/lynepad2/matrix.c +++ b/keyboards/qvex/lynepad2/matrix.c @@ -14,13 +14,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdint.h> -#include <stdbool.h> -#include <string.h> -#include "util.h" #include "matrix.h" -#include "debounce.h" -#include "quantum.h" +#include "wait.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; @@ -29,31 +24,31 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values static void select_row(uint8_t row) { - setPinOutput(row_pins[row]); - writePinLow(row_pins[row]); + gpio_set_pin_output(row_pins[row]); + gpio_write_pin_low(row_pins[row]); } static void unselect_row(uint8_t row) { - setPinInputHigh(row_pins[row]); + gpio_set_pin_input_high(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputHigh(row_pins[x]); + gpio_set_pin_input_high(row_pins[x]); } } static void init_pins(void) { unselect_rows(); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputHigh(col_pins[x]); + gpio_set_pin_input_high(col_pins[x]); } - setPinInputHigh(PIN_JU); - setPinInputHigh(PIN_JD); - setPinInputHigh(PIN_JL); - setPinInputHigh(PIN_JR); - setPinInputHigh(PIN_JC); - setPinInputHigh(PIN_TC); + gpio_set_pin_input_high(PIN_JU); + gpio_set_pin_input_high(PIN_JD); + gpio_set_pin_input_high(PIN_JL); + gpio_set_pin_input_high(PIN_JR); + gpio_set_pin_input_high(PIN_JC); + gpio_set_pin_input_high(PIN_TC); } static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { @@ -67,7 +62,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) wait_us(30); for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - uint8_t pin_state = readPin(col_pins[col_index]); + uint8_t pin_state = gpio_read_pin(col_pins[col_index]); current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); } @@ -83,16 +78,16 @@ static bool read_encoder_switches(matrix_row_t current_matrix[]) { current_matrix[3] = 0; current_matrix[4] = 0; - current_matrix[4] |= !readPin(PIN_TC) ? (1 << 1) : 0; + current_matrix[4] |= !gpio_read_pin(PIN_TC) ? (1 << 1) : 0; - if (!readPin(PIN_JC)) { - if (!readPin(PIN_JU)) { + if (!gpio_read_pin(PIN_JC)) { + if (!gpio_read_pin(PIN_JU)) { current_matrix[3] |= (1 << 0); - } else if (!readPin(PIN_JD)) { + } else if (!gpio_read_pin(PIN_JD)) { current_matrix[3] |= (1 << 1); - } else if (!readPin(PIN_JL)) { + } else if (!gpio_read_pin(PIN_JL)) { current_matrix[3] |= (1 << 2); - } else if (!readPin(PIN_JR)) { + } else if (!gpio_read_pin(PIN_JR)) { current_matrix[3] |= (1 << 3); } else { current_matrix[4] |= (1 << 0); |