aboutsummaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorGravatar Danny Nguyen <danny@keeb.io>2018-11-02 15:28:16 -0400
committerGravatar Drashna Jaelre <drashna@live.com>2018-11-02 14:31:29 -0700
commita5fa75fcb3de822f4e43dcf29cee6eb9f945a992 (patch)
tree38e37e3e83e34f611293a266b59be0cee906de34 /quantum
parent5779ffb59a2e36fd45c3d4000d41ad73ad140de3 (diff)
downloadqmk_firmware-a5fa75fcb3de822f4e43dcf29cee6eb9f945a992.tar.gz
Move disable JTAG code from `keyboard_init` to `keyboard_setup`
This way all split keyboards are using that code instead of just those using split_common with the fix
Diffstat (limited to 'quantum')
-rw-r--r--quantum/split_common/matrix.c6
-rw-r--r--quantum/split_common/split_util.c14
2 files changed, 0 insertions, 20 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index ff6738b58..d6359b51f 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -128,12 +128,6 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
-#ifdef DISABLE_JTAG
- // JTAG disable for PORT F. write JTD bit twice within four cycles.
- MCUCR |= (1<<JTD);
- MCUCR |= (1<<JTD);
-#endif
-
debug_enable = true;
debug_matrix = true;
debug_mouse = true;
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 8d39329d4..7d1d7ee04 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -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
-}