bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #1350 from odewdney/Development

Browse Source 
Reduce PROGMEM warnings
This commit is contained in:
Bo Herrmannsen
2015-01-13 11:26:50 +01:00
parent b6623a0d49 cd55a93a13
commit d4a665694a
8 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -338,8 +338,8 @@ 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:";
const prog_char errormagic[] MARLIN_PROGMEM = "Error:";
const prog_char echomagic[] MARLIN_PROGMEM = "echo:";
//===========================================================================
//=============================Private Variables=============================
@ -865,7 +865,7 @@ DEFINE_PGM_READ_ANY(float, float);
DEFINE_PGM_READ_ANY(signed char, byte);
#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
static const PROGMEM type array##_P[3] = \
static const type array##_P[3] MARLIN_PROGMEM = \
{ X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \
static inline type array(int axis) \
{ return pgm_read_any(&array##_P[axis]); }