From aa72884a6e483f290a62236573d4364e7d6cd139 Mon Sep 17 00:00:00 2001 From: Karl Andersson Date: Tue, 23 Oct 2018 22:24:58 +0200 Subject: [PATCH] Enable use of SERIAL_PORT_2 on HAL_STM32 (#12197) --- Marlin/src/HAL/HAL_STM32/HAL.cpp | 2 ++ Marlin/src/HAL/HAL_STM32/HAL.h | 1 + Marlin/src/HAL/HAL_STM32/watchdog_STM32.h | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32/HAL.cpp b/Marlin/src/HAL/HAL_STM32/HAL.cpp index 2cef2bd0e2..09c598e238 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL.cpp @@ -29,6 +29,8 @@ #include "HAL.h" +#include "../../inc/MarlinConfig.h" + #if ENABLED(EEPROM_EMULATED_WITH_SRAM) #if STM32F7xx #include "stm32f7xx_ll_pwr.h" diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/HAL_STM32/HAL.h index f43716871f..aa2c98f268 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL.h +++ b/Marlin/src/HAL/HAL_STM32/HAL.h @@ -41,6 +41,7 @@ #include #endif +#include "../../inc/MarlinConfigPre.h" #include "../shared/math_32bit.h" #include "../shared/HAL_SPI.h" #include "fastio_STM32.h" diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.h b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.h index ec0c53b4f0..e860d16793 100644 --- a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.h +++ b/Marlin/src/HAL/HAL_STM32/watchdog_STM32.h @@ -21,7 +21,5 @@ */ #pragma once -#include "../../inc/MarlinConfig.h" - void watchdog_init(); void watchdog_reset();