From 621c24a10f4998c723a5f141ea123ea8fd1486ee Mon Sep 17 00:00:00 2001
From: Johann Rocholl <johann@rocholl.net>
Date: Sun, 9 Dec 2012 01:40:33 -0800
Subject: [PATCH] AT90USB is only defined after pins.h is included.
---
Marlin/Marlin.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index cae67ad5ea..a6aa43e00a 100644
--- a/Marlin/Marlin.h
+++ b/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] ;
--
GitLab