diff options
author | XScorpion2 <rcalt2vt@gmail.com> | 2019-04-03 18:01:17 -0500 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-04-03 16:01:17 -0700 |
commit | 63177760deaf23bb1f676974cecf211676285604 (patch) | |
tree | a0d60f4f55ef9632a20631c6f96b3f2e4e00367c /quantum/split_common/matrix.c | |
parent | 17e7762de7e3fdfc61c20aa61022f47370630c6a (diff) | |
download | qmk_firmware-63177760deaf23bb1f676974cecf211676285604.tar.gz qmk_firmware-63177760deaf23bb1f676974cecf211676285604.zip |
Added encoder support to split common code (#5477)
* Added slave encoder support to split common
* Fixing handwired/xealous/rev1 compile error
* Removed unnecessary ifdef
Diffstat (limited to 'quantum/split_common/matrix.c')
-rw-r--r-- | quantum/split_common/matrix.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index dcb96254f..eb110bd23 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c | |||
@@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
29 | #include "debounce.h" | 29 | #include "debounce.h" |
30 | #include "transport.h" | 30 | #include "transport.h" |
31 | 31 | ||
32 | #ifdef ENCODER_ENABLE | ||
33 | #include "encoder.h" | ||
34 | #endif | ||
35 | |||
32 | #if (MATRIX_COLS <= 8) | 36 | #if (MATRIX_COLS <= 8) |
33 | # define print_matrix_header() print("\nr/c 01234567\n") | 37 | # define print_matrix_header() print("\nr/c 01234567\n") |
34 | # define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row)) | 38 | # define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row)) |
@@ -320,6 +324,9 @@ uint8_t matrix_scan(void) { | |||
320 | matrix_scan_quantum(); | 324 | matrix_scan_quantum(); |
321 | } else { | 325 | } else { |
322 | transport_slave(matrix + thisHand); | 326 | transport_slave(matrix + thisHand); |
327 | #ifdef ENCODER_ENABLE | ||
328 | encoder_read(); | ||
329 | #endif | ||
323 | matrix_slave_scan_user(); | 330 | matrix_slave_scan_user(); |
324 | } | 331 | } |
325 | 332 | ||