Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Move disable JTAG code from keyboard_init to keyboard_setup

Browse source 
This way all split keyboards are using that code instead of just those using split_common with the fix
This commit is contained in:
Danny Nguyen 2018-11-02 15:28:16 -04:00 • committed by Drashna Jaelre
parent 5779ffb59a
commit a5fa75fcb3
4 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
quantum/split_common/split_util.c
View file

@ -94,10 +94,6 @@ void split_keyboard_setup(void) {
void disable_JTAG(void);
void keyboard_slave_loop(void) {
// Disable JTAG since we skip calling keyboard_init() on the slave side
// Future fix will possible call keyboard_init() on the slave to remove this need
disable_JTAG();
matrix_init();
//Init RGB
@ -157,13 +153,3 @@ void matrix_setup(void) {
keyboard_slave_loop();
}
}
// Temporary code to disable JTAG on the slave board
void disable_JTAG(void) {
/* Copied from tmk_core/common/keybaord.c */
// 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
}