From 0e2439e00f9f299653619ca016e6a4c607f9bd2b Mon Sep 17 00:00:00 2001 From: Mark Stosberg Date: Wed, 13 Nov 2024 20:15:14 -0500 Subject: [PATCH] linting: qmk format-c on matrix.c No other changes --- keyboards/aki27/cocot46plus/matrix.c | 91 ++++++++++++---------------- 1 file changed, 38 insertions(+), 53 deletions(-) diff --git a/keyboards/aki27/cocot46plus/matrix.c b/keyboards/aki27/cocot46plus/matrix.c index c5e93d9b76e..5f30e382cdf 100644 --- a/keyboards/aki27/cocot46plus/matrix.c +++ b/keyboards/aki27/cocot46plus/matrix.c @@ -20,55 +20,48 @@ along with this program. If not, see . static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; -static void select_row(uint8_t row) -{ +static void select_row(uint8_t row) { gpio_set_pin_output(row_pins[row]); gpio_write_pin_low(row_pins[row]); } -static void unselect_row(uint8_t row) -{ +static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); } -static void unselect_rows(void) -{ - for(uint8_t x = 0; x < MATRIX_ROWS; x++) { +static void unselect_rows(void) { + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { gpio_set_pin_input_high(row_pins[x]); } } -static void select_col(uint8_t col) -{ +static void select_col(uint8_t col) { gpio_set_pin_output(col_pins[col]); gpio_write_pin_low(col_pins[col]); } -static void unselect_col(uint8_t col) -{ +static void unselect_col(uint8_t col) { gpio_set_pin_input_high(col_pins[col]); } -static void unselect_cols(void) -{ - for(uint8_t x = 0; x < MATRIX_COLS; x++) { +static void unselect_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { gpio_set_pin_input_high(col_pins[x]); } } static void init_pins(void) { - unselect_rows(); - unselect_cols(); - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - gpio_set_pin_input_high(col_pins[x]); - } - for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - gpio_set_pin_input_high(row_pins[x]); - } + unselect_rows(); + unselect_cols(); + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + gpio_set_pin_input_high(col_pins[x]); + } + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + gpio_set_pin_input_high(row_pins[x]); + } } -static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) -{ +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]; @@ -80,13 +73,12 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) wait_us(30); // For each col... - for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - + for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { // Select the col pin to read (active low) uint8_t pin_state = gpio_read_pin(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); + current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); } // Unselect row @@ -95,8 +87,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) return (last_row_value != current_matrix[current_row]); } -static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) -{ +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 @@ -104,27 +95,22 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) wait_us(30); // For each row... - for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++) - { - uint8_t tmp = row_index + MATRIX_ROWS/2; + for (uint8_t row_index = 0; row_index < MATRIX_ROWS / 2; row_index++) { + uint8_t tmp = row_index + MATRIX_ROWS / 2; // Store last value of row prior to reading matrix_row_t last_row_value = current_matrix[tmp]; // Check row pin state - if (gpio_read_pin(row_pins[row_index]) == 0) - { + if (gpio_read_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col); - } - else - { + } else { // Pin HI, clear col bit current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col); } // Determine if the matrix changed state - if ((last_row_value != current_matrix[tmp]) && !(matrix_changed)) - { + if ((last_row_value != current_matrix[tmp]) && !(matrix_changed)) { matrix_changed = true; } } @@ -140,19 +126,18 @@ void matrix_init_custom(void) { init_pins(); } -bool matrix_scan_custom(matrix_row_t current_matrix[]) -{ - bool changed = false; +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool changed = false; - // Set row, read cols - for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) { - changed |= read_cols_on_row(current_matrix, current_row); - } - //else - // Set col, read rows - for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { - changed |= read_rows_on_col(current_matrix, current_col); - } - - return (uint8_t)changed; + // Set row, read cols + for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) { + changed |= read_cols_on_row(current_matrix, current_row); + } + // else + // Set col, read rows + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { + changed |= read_rows_on_col(current_matrix, current_col); + } + + return (uint8_t)changed; }