Browse Source

Merge pull request #1250 from chertykov/Development

Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
Bo Herrmannsen 10 years ago
parent
commit
23e768dffa
2 changed files with 6 additions and 2 deletions
  1. 3
    2
      Marlin/Marlin.h
  2. 3
    0
      Marlin/Marlin_main.cpp

+ 3
- 2
Marlin/Marlin.h View File

66
 #define SERIAL_PROTOCOLLNPGM(x) (serialprintPGM(PSTR(x)),MYSERIAL.write('\n'))
66
 #define SERIAL_PROTOCOLLNPGM(x) (serialprintPGM(PSTR(x)),MYSERIAL.write('\n'))
67
 
67
 
68
 
68
 
69
-const char errormagic[] PROGMEM ="Error:";
70
-const char echomagic[] PROGMEM ="echo:";
69
+extern const char errormagic[] PROGMEM;
70
+extern const char echomagic[] PROGMEM;
71
+
71
 #define SERIAL_ERROR_START (serialprintPGM(errormagic))
72
 #define SERIAL_ERROR_START (serialprintPGM(errormagic))
72
 #define SERIAL_ERROR(x) SERIAL_PROTOCOL(x)
73
 #define SERIAL_ERROR(x) SERIAL_PROTOCOL(x)
73
 #define SERIAL_ERRORPGM(x) SERIAL_PROTOCOLPGM(x)
74
 #define SERIAL_ERRORPGM(x) SERIAL_PROTOCOLPGM(x)

+ 3
- 0
Marlin/Marlin_main.cpp View File

329
   int meas_delay_cm = MEASUREMENT_DELAY_CM;  //distance delay setting
329
   int meas_delay_cm = MEASUREMENT_DELAY_CM;  //distance delay setting
330
 #endif
330
 #endif
331
 
331
 
332
+const char errormagic[] PROGMEM = "Error:";
333
+const char echomagic[] PROGMEM = "echo:";
334
+
332
 //===========================================================================
335
 //===========================================================================
333
 //=============================Private Variables=============================
336
 //=============================Private Variables=============================
334
 //===========================================================================
337
 //===========================================================================

Loading…
Cancel
Save