Browse Source

Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr

Use PSTR for MSG_HEATING
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
f9e4717f5b
  1. 4
      Marlin/Marlin_main.cpp
  2. 2
      Marlin/ultralcd.cpp

4
Marlin/Marlin_main.cpp

@ -5308,7 +5308,7 @@ inline void gcode_M104() {
}
#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)
@ -5506,7 +5506,7 @@ inline void gcode_M109() {
else print_job_timer.start();
#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)

2
Marlin/ultralcd.cpp

@ -3277,7 +3277,7 @@ void status_printf(uint8_t level, const char *status, ...) {
lcd_status_message_level = level;
va_list args;
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);
lcd_finishstatus(level > 0);
}

Loading…
Cancel
Save