bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merged updates from Marlin_v1.

Browse Source
This commit is contained in:
Johann Rocholl
2012-12-16 12:19:24 -08:00
parent 931a0052ea b39f5d614a
commit 3b2e5027e5
84 changed files with 2037 additions and 3806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/Marlin.h
View File

@@ -26,14 +26,12 @@
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#if ARDUINO >= 100
#if defined(__AVR_ATmega644P__)
#include "WProgram.h"
#else
#include "Arduino.h"
#endif
#if (ARDUINO >= 100) && !defined(__AVR_ATmega644P__)
# include "Arduino.h"
#else
#include "WProgram.h"
# include "WProgram.h"
//Arduino < 1.0.0 does not define this, so we need to do it ourselfs
# define analogInputToDigitalPin(p) ((p) + A0)
#endif
#include "MarlinSerial.h"
@@ -183,7 +181,6 @@ void setPwmFrequency(uint8_t pin, int val);
extern float homing_feedrate[];
extern bool axis_relative_modes[];
extern int feedmultiply;
extern bool feedmultiplychanged;
extern int extrudemultiply; // Sets extrude multiply factor (in percent)
extern float current_position[NUM_AXIS] ;
extern float add_homeing[3];