Browse Source

AT90USB is only defined after pins.h is included.

Johann Rocholl 12 years ago
parent
commit
621c24a10f
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/Marlin.h

+ 5
- 5
Marlin/Marlin.h View File

@@ -4,10 +4,6 @@
4 4
 #ifndef MARLIN_H
5 5
 #define MARLIN_H
6 6
 
7
-#ifndef AT90USB
8
-#define  HardwareSerial_h // trick to disable the standard HWserial
9
-#endif
10
-
11 7
 #define  FORCE_INLINE __attribute__((always_inline)) inline
12 8
 
13 9
 #include <math.h>
@@ -26,6 +22,10 @@
26 22
 #include "Configuration.h"
27 23
 #include "pins.h"
28 24
 
25
+#ifndef AT90USB
26
+#define  HardwareSerial_h // trick to disable the standard HWserial
27
+#endif
28
+
29 29
 #if ARDUINO >= 100 
30 30
   #if defined(__AVR_ATmega644P__)
31 31
     #include "WProgram.h"
@@ -181,7 +181,7 @@ void setPwmFrequency(uint8_t pin, int val);
181 181
 
182 182
 extern float homing_feedrate[];
183 183
 extern bool axis_relative_modes[];
184
-extern int feedmultiply;
184
+extern int feedmultiply;
185 185
 extern bool feedmultiplychanged;
186 186
 extern int extrudemultiply; // Sets extrude multiply factor (in percent)
187 187
 extern float current_position[NUM_AXIS] ;

Loading…
Cancel
Save