Skip to content

2.0 add disable jtag for stm32 #11211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 1 commit into from
Sep 27, 2018
Merged

2.0 add disable jtag for stm32 #11211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Marlin/src/HAL/HAL_AVR/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@ inline void HAL_adc_init(void) {

#define HAL_SENSITIVE_PINS 0, 1

#ifdef __AVR_AT90USB1286__
#define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
#endif

// AVR compatibility
#define strtof strtod

Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/HAL/HAL_STM32F1/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,6 @@ void HAL_enable_AdcFreerun(void);
#define GET_PIN_MAP_INDEX(pin) pin
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)

#define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)

#endif // _HAL_STM32F1_H
2 changes: 2 additions & 0 deletions Marlin/src/HAL/HAL_STM32F4/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,6 @@ void HAL_enable_AdcFreerun(void);
#define GET_PIN_MAP_INDEX(pin) pin
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)

#define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)

#endif // _HAL_STM32F4_H
9 changes: 6 additions & 3 deletions Marlin/src/Marlin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,12 @@ void setup() {
#endif

#if ENABLED(DISABLE_JTAG)
// Disable JTAG on AT90USB chips to free up pins for IO
MCUCR = 0x80;
MCUCR = 0x80;
// Disable JTAG to free up pins for IO
#ifdef JTAG_DISABLE
JTAG_DISABLE();
#else
#error "DISABLE_JTAG is not supported for the selected MCU/Board"
#endif
#endif

#if ENABLED(FILAMENT_RUNOUT_SENSOR)
Expand Down