|
@@ -41,26 +41,28 @@
|
41
|
41
|
|
42
|
42
|
#include "fastio.h"
|
43
|
43
|
#include "Configuration.h"
|
44
|
|
-#include "pins.h"
|
45
|
|
-
|
46
|
|
-#include "utility.h"
|
47
|
44
|
|
48
|
45
|
#ifndef SANITYCHECK_H
|
49
|
46
|
#error "Your Configuration.h and Configuration_adv.h files are outdated!"
|
50
|
47
|
#endif
|
51
|
48
|
|
52
|
|
-#include "Arduino.h"
|
53
|
|
-
|
54
|
49
|
#include "enum.h"
|
|
50
|
+#include "utility.h"
|
55
|
51
|
|
56
|
52
|
typedef unsigned long millis_t;
|
57
|
53
|
|
58
|
54
|
#ifdef USBCON
|
59
|
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
|
64
|
#endif
|
61
|
65
|
|
62
|
|
-#include "MarlinSerial.h"
|
63
|
|
-
|
64
|
66
|
#include "WString.h"
|
65
|
67
|
|
66
|
68
|
#if ENABLED(PRINTCOUNTER)
|
|
@@ -69,16 +71,6 @@ typedef unsigned long millis_t;
|
69
|
71
|
#include "stopwatch.h"
|
70
|
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
|
74
|
#define SERIAL_CHAR(x) MYSERIAL.write(x)
|
83
|
75
|
#define SERIAL_EOL SERIAL_CHAR('\n')
|
84
|
76
|
|