From ee3b9d2ef08b3a176257b1082a0f367b9f29fc67 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 21 Jun 2018 20:29:40 -0700 Subject: Disable JTAG in keyboard init So that all boards, present and future will have JTAG disabled, even if using a custom matrix --- tmk_core/common/keyboard.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tmk_core/common') diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 4eff764e2..d3fbe2d87 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -148,6 +148,11 @@ bool is_keyboard_master(void) { */ void keyboard_init(void) { timer_init(); +// To use PORTF disable JTAG with writing JTD bit twice within four cycles. +#if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__)) + MCUCR |= _BV(JTD); + MCUCR |= _BV(JTD); +#endif matrix_init(); #ifdef PS2_MOUSE_ENABLE ps2_mouse_init(); @@ -185,7 +190,7 @@ void keyboard_init(void) { /** \brief Keyboard task: Do keyboard routine jobs * - * Do routine keyboard jobs: + * Do routine keyboard jobs: * * * scan matrix * * handle mouse movements -- cgit v1.2.3-70-g09d2