bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Patch compile glitches

Browse Source
This commit is contained in:
Scott Lahteine 2019-10-03 15:37:04 -05:00
parent 6b945eb548
commit c83c2a5022
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/HAL_DUE/timers.h
View File

@ -63,8 +63,8 @@ typedef uint32_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#ifndef HAL_STEP_TIMER_ISR() #ifndef HAL_STEP_TIMER_ISR
#define HAL_STEP_TIMER_ISR() void TC2_Handler() #define HAL_STEP_TIMER_ISR() void TC2_Handler()
#endif #endif
#define HAL_TEMP_TIMER_ISR() void TC4_Handler() #define HAL_TEMP_TIMER_ISR() void TC4_Handler()
#define HAL_TONE_TIMER_ISR() void TC6_Handler() #define HAL_TONE_TIMER_ISR() void TC6_Handler()

1
Marlin/src/lcd/ultralcd.cpp
View File

@ -1425,6 +1425,7 @@ void MarlinUI::update() {
#endif #endif
} }
#include "../Marlin.h"
#include "../module/printcounter.h" #include "../module/printcounter.h"
static const char print_paused[] PROGMEM = MSG_PRINT_PAUSED; static const char print_paused[] PROGMEM = MSG_PRINT_PAUSED;