refresh (create temporary patch)

diff --git a/meta b/meta
index ba612fcc688a6488736f2d240669ab1da3ff7bb5..f77f2690642551db4bc90b5100910ccaf39c366f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a51b45e83cb99c8d166838543fd755756d7e25f1
-Head: ab2e48b9e85aa55da357bd6007a4a85dca0082f9
+Previous: 29d49093f2c8fba8182c1e851d6697ad7610c9fe
+Head: 882a05af0635b50934662981f2f4a5a0d4306a82
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -9,6 +9,7 @@ Applied:
   motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f
   m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1
   eeprom-provide-smaller-code-fo: ab2e48b9e85aa55da357bd6007a4a85dca0082f9
+  refresh-temp: 882a05af0635b50934662981f2f4a5a0d4306a82
 Unapplied:
   homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..991f8ea
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,52 @@
+Bottom: 98e986968e4608c4841331fa155138cb63e883a6
+Top:    5bc7034af1ae6bd8e2890ab228986d8944807319
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-10 17:14:28 +0100
+
+Refresh of eeprom-provide-smaller-code-fo
+
+---
+
+diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
+index 8e833d1..208ac33 100644
+--- 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 5d11177..a854714 100644
+--- 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;