From d6471f9e59837740c77dba43a425e877409d905a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2012 17:14:28 +0100 Subject: [PATCH] refresh --- meta | 7 ++-- patches/eeprom-provide-smaller-code-fo | 26 ++++++------- patches/refresh-temp | 52 -------------------------- 3 files changed, 16 insertions(+), 69 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f77f269..9210fd6 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 29d49093f2c8fba8182c1e851d6697ad7610c9fe -Head: 882a05af0635b50934662981f2f4a5a0d4306a82 +Previous: ce9b035155fc55f180687cc5f132d825b9bb8f40 +Head: 5306cbbcc64e380bbeca63b9de988f0566d714fa Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e @@ -8,8 +8,7 @@ Applied: makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1 - eeprom-provide-smaller-code-fo: ab2e48b9e85aa55da357bd6007a4a85dca0082f9 - refresh-temp: 882a05af0635b50934662981f2f4a5a0d4306a82 + eeprom-provide-smaller-code-fo: 5306cbbcc64e380bbeca63b9de988f0566d714fa Unapplied: homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493 diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 6ed9759..0a2827b 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ Bottom: d755416e1e02ccf9a60164760460cedc7a2fa44a -Top: 98e986968e4608c4841331fa155138cb63e883a6 +Top: 5bc7034af1ae6bd8e2890ab228986d8944807319 Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 @@ -19,7 +19,7 @@ Signed-off-by: Ian Jackson --- diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h -index b465d85..8e833d1 100644 +index b465d85..208ac33 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -84,7 +84,11 @@ const char echomagic[] PROGMEM ="echo:"; @@ -27,28 +27,28 @@ index b465d85..8e833d1 100644 #define SERIAL_ECHOLNPGM(x) SERIAL_PROTOCOLLNPGM(x) -#define SERIAL_ECHOPAIR(name,value) {SERIAL_ECHOPGM(name);SERIAL_ECHO(value);} -+#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 5b00f9c..5d11177 100644 +index 5b00f9c..a854714 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -203,6 +203,13 @@ 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; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 991f8ea..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,52 +0,0 @@ -Bottom: 98e986968e4608c4841331fa155138cb63e883a6 -Top: 5bc7034af1ae6bd8e2890ab228986d8944807319 -Author: Ian Jackson -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; -- 2.30.2