From 828cc71847190f61e2d9991147091c010d121745 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Jul 2019 23:56:29 -0500 Subject: [PATCH] Tweaks to STM32 headers --- Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp | 6 ++++-- Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp index 6f8b070e7b..ae9f1e3583 100644 --- a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp @@ -22,10 +22,12 @@ #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) -#include "../../inc/MarlinConfig.h" +#include "../../inc/MarlinConfigPre.h" #if ENABLED(USE_WATCHDOG) + #include "../../inc/MarlinConfig.h" + #include "watchdog_STM32.h" #include @@ -33,7 +35,7 @@ void watchdog_reset() { IWatchdog.reload(); - #if PIN_EXISTS(LED) + #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED) TOGGLE(LED_PIN); // heartbeat indicator #endif } diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp index 69dca32680..62e4d077eb 100644 --- a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp +++ b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp @@ -56,5 +56,4 @@ void watchdog_init(void) { } #endif // USE_WATCHDOG - #endif // __STM32F1__