Sfoglia il codice sorgente

Arrange needed includes in Marlin.h

Scott Lahteine 9 anni fa
parent
commit
df27d01cd9
1 ha cambiato i file con 9 aggiunte e 17 eliminazioni
  1. 9
    17
      Marlin/Marlin.h

+ 9
- 17
Marlin/Marlin.h Vedi File

41
 
41
 
42
 #include "fastio.h"
42
 #include "fastio.h"
43
 #include "Configuration.h"
43
 #include "Configuration.h"
44
-#include "pins.h"
45
-
46
-#include "utility.h"
47
 
44
 
48
 #ifndef SANITYCHECK_H
45
 #ifndef SANITYCHECK_H
49
   #error "Your Configuration.h and Configuration_adv.h files are outdated!"
46
   #error "Your Configuration.h and Configuration_adv.h files are outdated!"
50
 #endif
47
 #endif
51
 
48
 
52
-#include "Arduino.h"
53
-
54
 #include "enum.h"
49
 #include "enum.h"
50
+#include "utility.h"
55
 
51
 
56
 typedef unsigned long millis_t;
52
 typedef unsigned long millis_t;
57
 
53
 
58
 #ifdef USBCON
54
 #ifdef USBCON
59
   #include "HardwareSerial.h"
55
   #include "HardwareSerial.h"
56
+  #if ENABLED(BLUETOOTH)
57
+    #define MYSERIAL bluetoothSerial
58
+  #else
59
+    #define MYSERIAL Serial
60
+  #endif // BLUETOOTH
61
+#else
62
+  #include "MarlinSerial.h"
63
+  #define MYSERIAL customizedSerial
60
 #endif
64
 #endif
61
 
65
 
62
-#include "MarlinSerial.h"
63
-
64
 #include "WString.h"
66
 #include "WString.h"
65
 
67
 
66
 #if ENABLED(PRINTCOUNTER)
68
 #if ENABLED(PRINTCOUNTER)
69
   #include "stopwatch.h"
71
   #include "stopwatch.h"
70
 #endif
72
 #endif
71
 
73
 
72
-#ifdef USBCON
73
-  #if ENABLED(BLUETOOTH)
74
-    #define MYSERIAL bluetoothSerial
75
-  #else
76
-    #define MYSERIAL Serial
77
-  #endif // BLUETOOTH
78
-#else
79
-  #define MYSERIAL customizedSerial
80
-#endif
81
-
82
 #define SERIAL_CHAR(x) MYSERIAL.write(x)
74
 #define SERIAL_CHAR(x) MYSERIAL.write(x)
83
 #define SERIAL_EOL SERIAL_CHAR('\n')
75
 #define SERIAL_EOL SERIAL_CHAR('\n')
84
 
76
 

Loading…
Annulla
Salva