diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-05-28 11:56:06 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-28 11:56:06 -0400 |
| commit | de57799530d3184722532f93d156364067d8fcd5 (patch) | |
| tree | e328efac498525222a5d415c0a7e1303a8c0d775 /quantum | |
| parent | 209ee3cd052b22b4cc32aecbc4b03cb8fb229a23 (diff) | |
brings alps64 up-to-date (needs testing)
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/matrix.c | 6 | ||||
| -rw-r--r-- | quantum/quantum.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index d5fd7def8a..412662a794 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -68,8 +68,10 @@ uint8_t matrix_cols(void) { void matrix_init(void) { /* frees PORTF by setting the JTD bit twice within four cycles */ - MCUCR |= _BV(JTD); - MCUCR |= _BV(JTD); + #ifdef __AVR_ATmega32U4__ + MCUCR |= _BV(JTD); + MCUCR |= _BV(JTD); + #endif /* initializes the I/O pins */ #if DIODE_DIRECTION == COL2ROW for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { diff --git a/quantum/quantum.h b/quantum/quantum.h index 69a0d8126a..71533f48b9 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -23,6 +23,7 @@ #include "eeconfig.h" #include <stddef.h> #include <avr/io.h> +#include <util/delay.h> extern uint32_t default_layer_state; |