diff options
| author | Joel Challis <git@zvecr.com> | 2020-01-15 01:58:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 01:58:32 +0000 |
| commit | 48cac9e3c8710ae3e27c66fbd7043f38e7c6535e (patch) | |
| tree | a34180fc73b535f3d2b8508f7267b872f0ddcb32 /quantum/matrix.c | |
| parent | 537b8713e5bc9690dca3c1ad8733132892d48ea2 (diff) | |
| download | firmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.tar.gz firmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.tar.bz2 firmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.zip | |
Migrate more custom matrix 'lite' code to core (#7863)
* Migrate more custom matrix lite code to core
* Align function names
* fix up MATRIX_MASKED
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 62a86fba6..1675f2477 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -22,10 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "debounce.h" #include "quantum.h" -#ifdef MATRIX_MASKED -extern const matrix_row_t matrix_mask[]; -#endif - #ifdef DIRECT_PINS static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS; #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) @@ -34,22 +30,8 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; #endif /* matrix state(1:on, 0:off) */ -static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values -static matrix_row_t matrix[MATRIX_ROWS]; // debounced values - -// helper functions - -inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); } - -inline matrix_row_t matrix_get_row(uint8_t row) { - // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a - // switch blocker installed and the switch is always pressed. -#ifdef MATRIX_MASKED - return matrix[row] & matrix_mask[row]; -#else - return matrix[row]; -#endif -} +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values // matrix code |