MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

AT90USB is only defined after pins.h is included.

Browse Source
This commit is contained in:
Johann Rocholl 2012-12-09 01:40:33 -08:00
parent 6cba11f087
commit 621c24a10f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin.h
View File

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