aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/split_common
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-01-15 01:58:32 +0000
committerGitHub <noreply@github.com>2020-01-15 01:58:32 +0000
commit48cac9e3c8710ae3e27c66fbd7043f38e7c6535e (patch)
treea34180fc73b535f3d2b8508f7267b872f0ddcb32 /quantum/split_common
parent537b8713e5bc9690dca3c1ad8733132892d48ea2 (diff)
downloadfirmware-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/split_common')
-rw-r--r--quantum/split_common/matrix.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index 58602af85..ed1ff5acf 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -41,8 +41,8 @@ static 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
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
// row offsets for each hand
uint8_t thisHand, thatHand;
@@ -50,12 +50,6 @@ uint8_t thisHand, thatHand;
// user-defined overridable functions
__attribute__((weak)) void matrix_slave_scan_user(void) {}
-// 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) { return matrix[row]; }
-
// matrix code
#ifdef DIRECT_PINS