Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.

Firmware/Marlin.h

@@ -16,24 +16,7 @@
 #include <avr/pgmspace.h>
 #include <avr/eeprom.h>
 #include <avr/interrupt.h>
-
-
-#define SYSTEM_TIMER_2
-
-#ifdef SYSTEM_TIMER_2
-#include "timer02.h"
-#define _millis millis2
-#define _micros micros2
-#define _delay delay2
-#else //SYSTEM_TIMER_2
-#define _millis millis
-#define _micros micros
-#define _delay delay
-#define timer02_set_pwm0(pwm0)
-#endif //SYSTEM_TIMER_2
-
-
-
+#include "system_timer.h"
 #include "fastio.h"
 #include "Configuration.h"
 #include "pins.h"

Firmware/Timer.cpp

@@ -4,7 +4,7 @@
  */
 
 #include "Timer.h"
-#include "Marlin.h"
+#include "system_timer.h"
 
 /**
  * @brief construct Timer

Firmware/TimerRemaining.h

@@ -7,7 +7,8 @@
 #define TIMERREMAINING_H
 
 #include "Timer.h"
-#include "Marlin.h"
+#include "Arduino.h"
+#include "system_timer.h"
 #include <limits.h>
 
 class TimerRemaining : public LongTimer

Firmware/system_timer.h

@@ -0,0 +1,21 @@
+//! @file
+
+#ifndef FIRMWARE_SYSTEM_TIMER_H_
+#define FIRMWARE_SYSTEM_TIMER_H_
+
+#include "Arduino.h"
+#define SYSTEM_TIMER_2
+
+#ifdef SYSTEM_TIMER_2
+#include "timer02.h"
+#define _millis millis2
+#define _micros micros2
+#define _delay delay2
+#else //SYSTEM_TIMER_2
+#define _millis millis
+#define _micros micros
+#define _delay delay
+#define timer02_set_pwm0(pwm0)
+#endif //SYSTEM_TIMER_2
+
+#endif /* FIRMWARE_SYSTEM_TIMER_H_ */

Tests/Timer_test.cpp

@@ -15,6 +15,11 @@ unsigned long millis()
     return now;
 }
 
+unsigned long millis2()
+{
+    return now;
+}
+
 static void basicTimer()
 {
     LongTimer timer;