Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add weak refs on reading rows/cols. #13062

Merged
merged 1 commit into from
Jun 1, 2021
Merged

Add weak refs on reading rows/cols. #13062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions quantum/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static inline void setPinInputHigh_atomic(pin_t pin) {

#ifdef DIRECT_PINS

static void init_pins(void) {
__attribute__((weak)) void matrix_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];
Expand All @@ -58,7 +58,7 @@ static void init_pins(void) {
}
}

static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
__attribute__((weak)) bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
// Start with a clear matrix row
matrix_row_t current_row_value = 0;

Expand Down Expand Up @@ -90,14 +90,14 @@ static void unselect_rows(void) {
}
}

static void init_pins(void) {
__attribute__((weak)) void matrix_init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
setPinInputHigh_atomic(col_pins[x]);
}
}

static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
__attribute__((weak)) bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
// Start with a clear matrix row
matrix_row_t current_row_value = 0;

Expand Down Expand Up @@ -138,14 +138,14 @@ static void unselect_cols(void) {
}
}

static void init_pins(void) {
__attribute__((weak)) void matrix_init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
setPinInputHigh_atomic(row_pins[x]);
}
}

static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
__attribute__((weak)) bool matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
bool matrix_changed = false;

// Select col
Expand Down Expand Up @@ -190,7 +190,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)

void matrix_init(void) {
// initialize key pins
init_pins();
matrix_init_pins();

// initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
Expand All @@ -209,12 +209,12 @@ uint8_t matrix_scan(void) {
#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
// Set row, read cols
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
changed |= read_cols_on_row(raw_matrix, current_row);
changed |= matrix_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++) {
changed |= read_rows_on_col(raw_matrix, current_col);
changed |= matrix_read_rows_on_col(raw_matrix, current_col);
}
#endif

Expand Down
18 changes: 9 additions & 9 deletions quantum/split_common/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static inline void setPinInputHigh_atomic(pin_t pin) {

#ifdef DIRECT_PINS

static void init_pins(void) {
__attribute__((weak)) void matrix_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];
Expand All @@ -72,7 +72,7 @@ static void init_pins(void) {
}
}

static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
__attribute__((weak)) bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
// Start with a clear matrix row
matrix_row_t current_row_value = 0;

Expand Down Expand Up @@ -104,14 +104,14 @@ static void unselect_rows(void) {
}
}

static void init_pins(void) {
__attribute__((weak)) void matrix_init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
setPinInputHigh_atomic(col_pins[x]);
}
}

static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
__attribute__((weak)) bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
// Start with a clear matrix row
matrix_row_t current_row_value = 0;

Expand Down Expand Up @@ -152,14 +152,14 @@ static void unselect_cols(void) {
}
}

static void init_pins(void) {
__attribute__((weak)) void matrix_init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
setPinInputHigh_atomic(row_pins[x]);
}
}

static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
__attribute__((weak)) bool matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
bool matrix_changed = false;

// Select col
Expand Down Expand Up @@ -233,7 +233,7 @@ void matrix_init(void) {
thatHand = ROWS_PER_HAND - thisHand;

// initialize key pins
init_pins();
matrix_init_pins();

// initialize matrix state: all keys off
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
Expand Down Expand Up @@ -293,12 +293,12 @@ uint8_t matrix_scan(void) {
#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
// Set row, read cols
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
local_changed |= read_cols_on_row(raw_matrix, current_row);
local_changed |= matrix_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++) {
local_changed |= read_rows_on_col(raw_matrix, current_col);
local_changed |= matrix_read_rows_on_col(raw_matrix, current_col);
}
#endif

Expand Down