Browse Source

Patch compile glitches

pull/1/head
Scott Lahteine 5 years ago
parent
commit
c83c2a5022
  1. 4
      Marlin/src/HAL/HAL_DUE/timers.h
  2. 1
      Marlin/src/lcd/ultralcd.cpp

4
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()

1
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;

Loading…
Cancel
Save