Browse Source

AT90USB is only defined after pins.h is included.

pull/1/head
Johann Rocholl 12 years ago
parent
commit
621c24a10f
  1. 10
      Marlin/Marlin.h

10
Marlin/Marlin.h

@ -4,10 +4,6 @@
#ifndef MARLIN_H
#define MARLIN_H
#ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#define FORCE_INLINE __attribute__((always_inline)) inline
#include <math.h>
@ -26,6 +22,10 @@
#include "Configuration.h"
#include "pins.h"
#ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#if ARDUINO >= 100
#if defined(__AVR_ATmega644P__)
#include "WProgram.h"
@ -181,7 +181,7 @@ void setPwmFrequency(uint8_t pin, int val);
extern float homing_feedrate[];
extern bool axis_relative_modes[];
extern int feedmultiply;
extern int feedmultiply;
extern bool feedmultiplychanged;
extern int extrudemultiply; // Sets extrude multiply factor (in percent)
extern float current_position[NUM_AXIS] ;

Loading…
Cancel
Save