SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Arrange needed includes in Marlin.h

Browse source
This commit is contained in:
Scott Lahteine 2016-07-25 20:53:36 -07:00
parent 93ea281061
commit df27d01cd9
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Marlin/Marlin.h
View file

@ -41,26 +41,28 @@
#include "fastio.h" #include "fastio.h"
#include "Configuration.h" #include "Configuration.h"
#include "pins.h"
#include "utility.h"
#ifndef SANITYCHECK_H #ifndef SANITYCHECK_H
#error "Your Configuration.h and Configuration_adv.h files are outdated!" #error "Your Configuration.h and Configuration_adv.h files are outdated!"
#endif #endif
#include "Arduino.h"
#include "enum.h" #include "enum.h"
#include "utility.h"
typedef unsigned long millis_t; typedef unsigned long millis_t;
#ifdef USBCON #ifdef USBCON
#include "HardwareSerial.h" #include "HardwareSerial.h"
#if ENABLED(BLUETOOTH)
#define MYSERIAL bluetoothSerial
#else
#define MYSERIAL Serial
#endif // BLUETOOTH
#else
#include "MarlinSerial.h"
#define MYSERIAL customizedSerial
#endif #endif
#include "MarlinSerial.h"
#include "WString.h" #include "WString.h"
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
@ -69,16 +71,6 @@ typedef unsigned long millis_t;
#include "stopwatch.h" #include "stopwatch.h"
#endif #endif
#ifdef USBCON
#if ENABLED(BLUETOOTH)
#define MYSERIAL bluetoothSerial
#else
#define MYSERIAL Serial
#endif // BLUETOOTH
#else
#define MYSERIAL customizedSerial
#endif
#define SERIAL_CHAR(x) MYSERIAL.write(x) #define SERIAL_CHAR(x) MYSERIAL.write(x)
#define SERIAL_EOL SERIAL_CHAR('\n') #define SERIAL_EOL SERIAL_CHAR('\n')