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

Merge remote-tracking branch 'upstream/Development' into Development

Browse Source 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
This commit is contained in:
Jérémie FRANCOIS
2015-02-11 06:38:36 +01:00
parent 85e5aa4011 d75cd69de4
commit 9d75a56b56
95 changed files with 8144 additions and 4772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin.h
View File

@ -34,7 +34,7 @@
// Arduino < 1.0.0 does not define this, so we need to do it ourselves
#ifndef analogInputToDigitalPin
# define analogInputToDigitalPin(p) ((p) + A0)
# define analogInputToDigitalPin(p) ((p) + 0xA0)
#endif
#ifdef AT90USB
@ -86,6 +86,8 @@ extern const char echomagic[] PROGMEM;
#define SERIAL_ECHOPAIR(name,value) (serial_echopair_P(PSTR(name),(value)))
#define SERIAL_EOL SERIAL_ECHOLN("")
void serial_echopair_P(const char *s_P, float v);
void serial_echopair_P(const char *s_P, double v);
void serial_echopair_P(const char *s_P, unsigned long v);