diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-08-21 15:18:52 +1000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-08-20 22:18:52 -0700 |
| commit | f2c179de58c63b2202a490d283fd8fa216680ce7 (patch) | |
| tree | b6ac2946b63566f604251af6c2e160457ca5e11c /keyboards/vitamins_included | |
| parent | 977c316eb1bdca7f0e13026936322cb9a9fcd0d2 (diff) | |
| download | firmware-f2c179de58c63b2202a490d283fd8fa216680ce7.tar.gz firmware-f2c179de58c63b2202a490d283fd8fa216680ce7.tar.bz2 firmware-f2c179de58c63b2202a490d283fd8fa216680ce7.zip | |
Remove superfluous JTAG disable code (#6445)
* Remove superfluous JTAG disable code
* 32A has differently named register
* Accidentally some operators
* 32A also has different JTAG pins
* Wrap disable_jtag() in an ifndef
* Document this new define
* Rename the define, it conflicts with a LUFA thing
Also, move the ifndef wrapping to the call in keyboard_setup()
Diffstat (limited to 'keyboards/vitamins_included')
| -rw-r--r-- | keyboards/vitamins_included/matrix.c | 6 | ||||
| -rw-r--r-- | keyboards/vitamins_included/rev1/rev1.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/vitamins_included/matrix.c b/keyboards/vitamins_included/matrix.c index 1f5071c69..d44e70f08 100644 --- a/keyboards/vitamins_included/matrix.c +++ b/keyboards/vitamins_included/matrix.c @@ -136,12 +136,6 @@ bool has_usb(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 - // initialize row and col #if (DIODE_DIRECTION == COL2ROW) unselect_rows(); diff --git a/keyboards/vitamins_included/rev1/rev1.h b/keyboards/vitamins_included/rev1/rev1.h index aa5029034..ee97e09cf 100644 --- a/keyboards/vitamins_included/rev1/rev1.h +++ b/keyboards/vitamins_included/rev1/rev1.h @@ -1,6 +1,5 @@ #ifndef REV1_H #define REV1_H -#define DISABLE_JTAG // The keyboard uses PF4, PF5 and PF7, which are used by JTAG. #define EE_HANDS // This isn't optional for the vitamins included #include QMK_KEYBOARD_H |