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

Merge branch 'smallopt' into Marlin_v1

Browse Source 
Conflicts:
	Marlin/temperature.h
This commit is contained in:
Bernhard
2011-11-28 21:36:01 +01:00
parent 85da81e673 2d9a715655
commit 311627141b
11 changed files with 246 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Marlin.h
View File

@ -10,6 +10,8 @@
#include "Configuration.h"
#include "MarlinSerial.h"
#define FORCE_INLINE __attribute__((always_inline)) inline
//#define SERIAL_ECHO(x) Serial << "echo: " << x;
//#define SERIAL_ECHOLN(x) Serial << "echo: "<<x<<endl;
//#define SERIAL_ERROR(x) Serial << "Error: " << x;
@ -43,7 +45,7 @@ const char echomagic[] PROGMEM ="echo:";
//things to write to serial from Programmemory. saves 400 to 2k of RAM.
#define SerialprintPGM(x) serialprintPGM(PSTR(x))
inline void serialprintPGM(const char *str)
FORCE_INLINE void serialprintPGM(const char *str)
{
char ch=pgm_read_byte(str);
while(ch)
@ -112,5 +114,6 @@ void prepare_arc_move(char isclockwise);
extern float homing_feedrate[];
extern bool axis_relative_modes[];
extern float current_position[NUM_AXIS] ;
extern float add_homeing[3];
#endif