summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/split_common/split_util.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 7c87de4d9..7ca68c56c 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -93,6 +93,10 @@ void split_keyboard_setup(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
@@ -152,3 +156,13 @@ 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
+}