Merge pull request #4467 from jbrazio/safe_delay-millis_t

Makes safe_delay() to be fully compatible with delay()
2016-07-29 20:23:44 -07:00
parent 9e21b2e51d 226e74a438
commit 46c33f1cfa
4 changed files with 38 additions and 6 deletions
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -35,13 +35,11 @@

 #include "MarlinConfig.h"

-#include "fastio.h"
-
 #include "enum.h"
+#include "types.h"
+#include "fastio.h"
 #include "utility.h"

-typedef unsigned long millis_t;
-
 #ifdef USBCON
  #include "HardwareSerial.h"
  #if ENABLED(BLUETOOTH)