MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr

Browse Source 
Use PSTR for MSG_HEATING
This commit is contained in:
Scott Lahteine 2017-02-22 12:26:08 -06:00 committed by GitHub
commit f9e4717f5b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -5308,7 +5308,7 @@ inline void gcode_M104() {
} }
#endif #endif
if (code_value_temp_abs() > thermalManager.degHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, MSG_HEATING); if (code_value_temp_abs() > thermalManager.degHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, PSTR(MSG_HEATING));
} }
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)
@ -5506,7 +5506,7 @@ inline void gcode_M109() {
else print_job_timer.start(); else print_job_timer.start();
#endif #endif
if (thermalManager.isHeatingHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, MSG_HEATING); if (thermalManager.isHeatingHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, PSTR(MSG_HEATING));
} }
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)

2
Marlin/ultralcd.cpp
View File

@ -3277,7 +3277,7 @@ void status_printf(uint8_t level, const char *status, ...) {
lcd_status_message_level = level; lcd_status_message_level = level;
va_list args; va_list args;
va_start(args, status); va_start(args, status);
vsnprintf(lcd_status_message, 3 * (LCD_WIDTH), status, args); vsnprintf_P(lcd_status_message, 3 * (LCD_WIDTH), status, args);
va_end(args); va_end(args);
lcd_finishstatus(level > 0); lcd_finishstatus(level > 0);
} }