From c83c2a50228be867b1188b80969c5e828b15c740 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 3 Oct 2019 15:37:04 -0500 Subject: [PATCH] Patch compile glitches --- Marlin/src/HAL/HAL_DUE/timers.h | 4 ++-- Marlin/src/lcd/ultralcd.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/HAL_DUE/timers.h b/Marlin/src/HAL/HAL_DUE/timers.h index 7ffb0486fe..b7b2cf7341 100644 --- a/Marlin/src/HAL/HAL_DUE/timers.h +++ b/Marlin/src/HAL/HAL_DUE/timers.h @@ -63,8 +63,8 @@ typedef uint32_t hal_timer_t; #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) -#ifndef HAL_STEP_TIMER_ISR() -#define HAL_STEP_TIMER_ISR() void TC2_Handler() +#ifndef HAL_STEP_TIMER_ISR + #define HAL_STEP_TIMER_ISR() void TC2_Handler() #endif #define HAL_TEMP_TIMER_ISR() void TC4_Handler() #define HAL_TONE_TIMER_ISR() void TC6_Handler() diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index d8278e4b48..10864da1c2 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -1425,6 +1425,7 @@ void MarlinUI::update() { #endif } + #include "../Marlin.h" #include "../module/printcounter.h" static const char print_paused[] PROGMEM = MSG_PRINT_PAUSED;