From 1c549256f0de21d81aa090f6f98ed101f1124af1 Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Wed, 9 Jun 2021 00:40:32 -0300 Subject: [PATCH 1/3] missing SDSS --- Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h index 27aa84e44f4c..9b71570b0838 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h @@ -288,3 +288,4 @@ #define ONBOARD_SPI_DEVICE 1 // SPI1 #define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card +#define SDSS ONBOARD_SD_CS_PIN From 69b1282b63df5297cc0ca4a686feb19482c28861 Mon Sep 17 00:00:00 2001 From: Victor Mateus Oliveira Date: Wed, 9 Jun 2021 13:52:18 -0300 Subject: [PATCH 2/3] Reset JTAG/SWD register when needed --- Marlin/src/HAL/STM32/HAL.h | 1 + Marlin/src/MarlinCore.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h index 2441c46eab0c..02bee57ba3ac 100644 --- a/Marlin/src/HAL/STM32/HAL.h +++ b/Marlin/src/HAL/STM32/HAL.h @@ -195,6 +195,7 @@ uint16_t HAL_adc_get_result(); #ifdef STM32F1xx #define JTAG_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_JTAGDISABLE) #define JTAGSWD_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_DISABLE) + #define JTAGSWD_RESET() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_RESET); // Reset: FULL SWD+JTAG #endif #define PLATFORM_M997_SUPPORT diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 18bee54009d6..404514f5292e 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -1127,7 +1127,12 @@ void setup() { OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING); #endif + #if defined(JTAGSWD_RESET) + JTAGSWD_RESET(); + #endif + #if EITHER(DISABLE_DEBUG, DISABLE_JTAG) + delay(10); // Disable any hardware debug to free up pins for IO #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE) JTAGSWD_DISABLE(); From ef44f849cd262230ae10f71be640630abee149ec Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 10 Jun 2021 03:20:53 -0500 Subject: [PATCH 3/3] Update MarlinCore.cpp --- Marlin/src/MarlinCore.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 404514f5292e..01dc7a61a411 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -1119,6 +1119,7 @@ void setup() { #endif #if HAS_FREEZE_PIN + SETUP_LOG("FREEZE_PIN"); SET_INPUT_PULLUP(FREEZE_PIN); #endif @@ -1127,7 +1128,8 @@ void setup() { OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING); #endif - #if defined(JTAGSWD_RESET) + #ifdef JTAGSWD_RESET + SETUP_LOG("JTAGSWD_RESET"); JTAGSWD_RESET(); #endif @@ -1135,8 +1137,10 @@ void setup() { delay(10); // Disable any hardware debug to free up pins for IO #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE) + SETUP_LOG("JTAGSWD_DISABLE"); JTAGSWD_DISABLE(); #elif defined(JTAG_DISABLE) + SETUP_LOG("JTAG_DISABLE"); JTAG_DISABLE(); #else #error "DISABLE_(DEBUG|JTAG) is not supported for the selected MCU/Board."