From 050ca9ca138703b6d782429807d23796db5af507 Mon Sep 17 00:00:00 2001 From: Denis Chertykov Date: Sun, 28 Dec 2014 09:09:42 +0300 Subject: [PATCH] Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp --- Marlin/Marlin.h | 5 +++-- Marlin/Marlin_main.cpp | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index e271ddc8c..444c43f69 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -66,8 +66,9 @@ #define SERIAL_PROTOCOLLNPGM(x) (serialprintPGM(PSTR(x)),MYSERIAL.write('\n')) -const char errormagic[] PROGMEM ="Error:"; -const char echomagic[] PROGMEM ="echo:"; +extern const char errormagic[] PROGMEM; +extern const char echomagic[] PROGMEM; + #define SERIAL_ERROR_START (serialprintPGM(errormagic)) #define SERIAL_ERROR(x) SERIAL_PROTOCOL(x) #define SERIAL_ERRORPGM(x) SERIAL_PROTOCOLPGM(x) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6ea4ae321..809da798e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -329,6 +329,9 @@ bool cancel_heatup = false ; int meas_delay_cm = MEASUREMENT_DELAY_CM; //distance delay setting #endif +const char errormagic[] PROGMEM = "Error:"; +const char echomagic[] PROGMEM = "echo:"; + //=========================================================================== //=============================Private Variables============================= //===========================================================================