diff options
author | XScorpion2 <rcalt2vt@gmail.com> | 2021-03-25 06:33:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 22:33:18 +1100 |
commit | ff41c22fdccd30cdba44ba840d68261f74f45135 (patch) | |
tree | b9711e03582216c297e365c2eb5247aead397e64 | |
parent | 2f6236d1eab8601f097d4acb0553a4511b5c4be7 (diff) | |
download | qmk_firmware-ff41c22fdccd30cdba44ba840d68261f74f45135.tar.gz qmk_firmware-ff41c22fdccd30cdba44ba840d68261f74f45135.zip |
Adding keyboard level weak function for slave matrix scan (#12317)
-rw-r--r-- | quantum/matrix.h | 5 | ||||
-rw-r--r-- | quantum/split_common/matrix.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/quantum/matrix.h b/quantum/matrix.h index ce57010a4..3fe691aae 100644 --- a/quantum/matrix.h +++ b/quantum/matrix.h | |||
@@ -74,6 +74,11 @@ void matrix_scan_kb(void); | |||
74 | void matrix_init_user(void); | 74 | void matrix_init_user(void); |
75 | void matrix_scan_user(void); | 75 | void matrix_scan_user(void); |
76 | 76 | ||
77 | #ifdef SPLIT_KEYBOARD | ||
78 | void matrix_slave_scan_kb(void); | ||
79 | void matrix_slave_scan_user(void); | ||
80 | #endif | ||
81 | |||
77 | #ifdef __cplusplus | 82 | #ifdef __cplusplus |
78 | } | 83 | } |
79 | #endif | 84 | #endif |
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index d6636b886..f8de17809 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c | |||
@@ -43,6 +43,7 @@ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values | |||
43 | uint8_t thisHand, thatHand; | 43 | uint8_t thisHand, thatHand; |
44 | 44 | ||
45 | // user-defined overridable functions | 45 | // user-defined overridable functions |
46 | __attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); } | ||
46 | __attribute__((weak)) void matrix_slave_scan_user(void) {} | 47 | __attribute__((weak)) void matrix_slave_scan_user(void) {} |
47 | 48 | ||
48 | static inline void setPinOutput_writeLow(pin_t pin) { | 49 | static inline void setPinOutput_writeLow(pin_t pin) { |
@@ -284,7 +285,7 @@ bool matrix_post_scan(void) { | |||
284 | } else { | 285 | } else { |
285 | transport_slave(matrix + thatHand, matrix + thisHand); | 286 | transport_slave(matrix + thatHand, matrix + thisHand); |
286 | 287 | ||
287 | matrix_slave_scan_user(); | 288 | matrix_slave_scan_kb(); |
288 | } | 289 | } |
289 | 290 | ||
290 | return changed; | 291 | return changed; |