diff options
| author | Joel Challis <git@zvecr.com> | 2020-01-04 20:29:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 20:29:44 +0000 |
| commit | dcb7ca3f7910420cfa85ba659d48285b3633a978 (patch) | |
| tree | d571ff362775734c533ed5b9d1982c62a609d20b /tmk_core | |
| parent | c1feeaa57f28c781e39996e5d4eea3a31f083439 (diff) | |
| download | firmware-dcb7ca3f7910420cfa85ba659d48285b3633a978.tar.gz firmware-dcb7ca3f7910420cfa85ba659d48285b3633a978.tar.bz2 firmware-dcb7ca3f7910420cfa85ba659d48285b3633a978.zip | |
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')
| -rw-r--r-- | tmk_core/common/matrix.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 7624d5137..a2fedf5ff 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 |