Disable JTAG in keyboard init
So that all boards, present and future will have JTAG disabled, even if using a custom matrix
This commit is contained in:
parent
c5db272c91
commit
ee3b9d2ef0
@ -148,12 +148,6 @@ uint8_t matrix_cols(void) {
|
|||||||
|
|
||||||
void matrix_init(void) {
|
void matrix_init(void) {
|
||||||
|
|
||||||
// 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
|
|
||||||
|
|
||||||
// initialize row and col
|
// initialize row and col
|
||||||
#if (DIODE_DIRECTION == COL2ROW)
|
#if (DIODE_DIRECTION == COL2ROW)
|
||||||
unselect_rows();
|
unselect_rows();
|
||||||
|
@ -148,6 +148,11 @@ bool is_keyboard_master(void) {
|
|||||||
*/
|
*/
|
||||||
void keyboard_init(void) {
|
void keyboard_init(void) {
|
||||||
timer_init();
|
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();
|
matrix_init();
|
||||||
#ifdef PS2_MOUSE_ENABLE
|
#ifdef PS2_MOUSE_ENABLE
|
||||||
ps2_mouse_init();
|
ps2_mouse_init();
|
||||||
@ -185,7 +190,7 @@ void keyboard_init(void) {
|
|||||||
|
|
||||||
/** \brief Keyboard task: Do keyboard routine jobs
|
/** \brief Keyboard task: Do keyboard routine jobs
|
||||||
*
|
*
|
||||||
* Do routine keyboard jobs:
|
* Do routine keyboard jobs:
|
||||||
*
|
*
|
||||||
* * scan matrix
|
* * scan matrix
|
||||||
* * handle mouse movements
|
* * handle mouse movements
|
||||||
|
Loading…
Reference in New Issue
Block a user