From 1b4e49b5ac9e7f865be042274575dd6ee02597da Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 28 Jan 2019 12:57:33 +0100 Subject: [PATCH] Fixed fancheck and include in TimerRemaining.h this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented) fancheck fix verified with selftest --- Firmware/Marlin.h | 16 ++++++++++++++-- Firmware/TimerRemaining.h | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 22267423..29b1ae5a 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -18,7 +18,7 @@ #include -//#define SYSTEM_TIMER_2 +#define SYSTEM_TIMER_2 #ifdef SYSTEM_TIMER_2 #include "timer02.h" @@ -275,10 +275,22 @@ void refresh_cmd_timeout(void); // The standard Arduino timer() function returns this value atomically // by disabling / enabling interrupts. This is costly, if the interrupts are known // to be disabled. +#ifdef SYSTEM_TIMER_2 +extern volatile unsigned long timer2_millis; +#else //SYSTEM_TIMER_2 extern volatile unsigned long timer0_millis; +#endif //SYSTEM_TIMER_2 + // An unsynchronized equivalent to a standard Arduino _millis() function. // To be used inside an interrupt routine. -FORCE_INLINE unsigned long millis_nc() { return timer0_millis; } + +FORCE_INLINE unsigned long millis_nc() { +#ifdef SYSTEM_TIMER_2 + return timer2_millis; +#else //SYSTEM_TIMER_2 + return timer0_millis; +#endif //SYSTEM_TIMER_2 +} #ifdef FAST_PWM_FAN void setPwmFrequency(uint8_t pin, int val); diff --git a/Firmware/TimerRemaining.h b/Firmware/TimerRemaining.h index 472c01be..46cea825 100644 --- a/Firmware/TimerRemaining.h +++ b/Firmware/TimerRemaining.h @@ -7,7 +7,7 @@ #define TIMERREMAINING_H #include "Timer.h" -#include "Arduino.h" +#include "Marlin.h" #include class TimerRemaining : public LongTimer