summaryrefslogtreecommitdiff
path: root/tmk_core/common/matrix.h
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-01-04 20:29:44 +0000
committerGitHub <noreply@github.com>2020-01-04 20:29:44 +0000
commitdcb7ca3f7910420cfa85ba659d48285b3633a978 (patch)
treed571ff362775734c533ed5b9d1982c62a609d20b /tmk_core/common/matrix.h
parentc1feeaa57f28c781e39996e5d4eea3a31f083439 (diff)
Move some common matrix code to a common location (#7699)
* Move some common matrix code to a common location * Refactor some 'custom_matrix_helper' logic to use custom matrix lite * Fix build for kinesis/stapelberg - abuse of vpath was picking up matrix.c from core when custom matrix was enabled * Add validation for CUSTOM_MATRIX
Diffstat (limited to 'tmk_core/common/matrix.h')
-rw-r--r--tmk_core/common/matrix.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 7624d51376..a2fedf5ff0 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -40,6 +40,8 @@ typedef uint32_t matrix_col_t;
# error "MATRIX_ROWS: invalid value"
#endif
+#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
+
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
#ifdef __cplusplus
@@ -79,11 +81,6 @@ void matrix_scan_kb(void);
void matrix_init_user(void);
void matrix_scan_user(void);
-#ifdef I2C_SPLIT
-void slave_matrix_init(void);
-uint8_t slave_matrix_scan(void);
-#endif
-
#ifdef __cplusplus
}
#endif