From 01f75591c66bcc25247d56d162ae2f37636228b6 Mon Sep 17 00:00:00 2001 From: Phr3d13 Date: Thu, 3 Jan 2019 10:46:49 -0500 Subject: [PATCH] Fix GTM32_PRO_VB Serial and HAL via watchdog (#12753) Move `watchdog_reset` from `.h` to `.cpp` to eliminate the need to include `MarlinConfig.h` in a HAL-related file. --- Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp | 7 +++++++ Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp index 7ecf3fd3f5..7a6ff7d020 100644 --- a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp +++ b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp @@ -33,6 +33,13 @@ #include #include "watchdog_STM32F1.h" +void watchdog_reset() { + #if PIN_EXISTS(LED) + TOGGLE(LED_PIN); // heartbeat indicator + #endif + iwdg_feed(); +} + void watchdogSetup(void) { // do whatever. don't remove this function. } diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h index d34efdc0a2..3d37cefc96 100644 --- a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h +++ b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h @@ -27,8 +27,6 @@ #include -#include "../../inc/MarlinConfig.h" - /** * The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and * 625 reload value (counts down to 0) @@ -43,9 +41,4 @@ void watchdog_init(); // Reset watchdog. MUST be called at least every 4 seconds after the // first watchdog_init or STM32F1 will reset. -inline void watchdog_reset() { - #if PIN_EXISTS(LED) - TOGGLE(LED_PIN); // heart beat indicator - #endif - iwdg_feed(); -} +void watchdog_reset();