From 882a05af0635b50934662981f2f4a5a0d4306a82 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2012 17:14:28 +0100 Subject: [PATCH] Refresh of eeprom-provide-smaller-code-fo --- Marlin/Marlin.h | 8 ++++---- Marlin/Marlin.pde | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) 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