localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Added JTAG disable code to the split_common (#4309) 

Added JTAG disable code to the split_common slave code since the slave never calls keyboard_init(). In the future the slave should likely be modified to call keyboard_init() in some way, but without calling any of the unnecessary USB initialization code.
This commit is contained in:
That-Canadian 2018-10-31 17:42:15 -04:00 committed by Drashna Jaelre
parent 75d657b525
commit 5630ad7604
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quantum/split_common/split_util.c
View File

@ -93,6 +93,10 @@ void split_keyboard_setup(void) {
} }
void keyboard_slave_loop(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(); matrix_init();
//Init RGB //Init RGB
@ -152,3 +156,13 @@ void matrix_setup(void) {
keyboard_slave_loop(); 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
}