Refresh of eeprom-provide-smaller-code-fo

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 8e833d193c9d628be07a9d00674b4ddba2c05d27..208ac3303366a7486cb3aec9978116fcaabcd7cf 100644 (file)
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -84,11 +84,11 @@ const char echomagic[] PROGMEM ="echo:";
 #define SERIAL_ECHOLN(x) SERIAL_PROTOCOLLN(x)
 #define SERIAL_ECHOLNPGM(x) SERIAL_PROTOCOLLNPGM(x)
 
-#define SERIAL_ECHOPAIR(name,value) (serial_echopair(PSTR(name),(value)))
+#define SERIAL_ECHOPAIR(name,value) (serial_echopair_P(PSTR(name),(value)))
 
-void serial_echopair(const PROGMEM char *s, float v);
-void serial_echopair(const PROGMEM char *s, double v);
-void serial_echopair(const PROGMEM char *s, unsigned long v);
+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);
 
 
 //things to write to serial from Programmemory. saves 400 to 2k of RAM.

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 5d111778c81bdb79ab44de0ad03d2ffa58a2c3e0..a8547143a2ec0c388f48de34872a930bd86755a9 100644 (file)
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -203,12 +203,12 @@ bool Stopped=false;
 
 void get_arc_coordinates();
 
-void serial_echopair(const PROGMEM char *s, float v)
-    { serialprintPGM(s); SERIAL_ECHO(v); }
-void serial_echopair(const PROGMEM char *s, double v)
-    { serialprintPGM(s); SERIAL_ECHO(v); }
-void serial_echopair(const PROGMEM char *s, unsigned long v)
-    { serialprintPGM(s); SERIAL_ECHO(v); }
+void serial_echopair_P(const char *s_P, float v)
+    { serialprintPGM(s_P); SERIAL_ECHO(v); }
+void serial_echopair_P(const char *s_P, double v)
+    { serialprintPGM(s_P); SERIAL_ECHO(v); }
+void serial_echopair_P(const char *s_P, unsigned long v)
+    { serialprintPGM(s_P); SERIAL_ECHO(v); }
 
 extern "C"{
   extern unsigned int __bss_end;