Browse Source

Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr

Use PSTR for MSG_HEATING
Scott Lahteine 7 years ago
parent
commit
f9e4717f5b
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

@@ -5308,7 +5308,7 @@ inline void gcode_M104() {
5308 5308
       }
5309 5309
     #endif
5310 5310
 
5311
-    if (code_value_temp_abs() > thermalManager.degHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, MSG_HEATING);
5311
+    if (code_value_temp_abs() > thermalManager.degHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, PSTR(MSG_HEATING));
5312 5312
   }
5313 5313
 
5314 5314
   #if ENABLED(AUTOTEMP)
@@ -5506,7 +5506,7 @@ inline void gcode_M109() {
5506 5506
       else print_job_timer.start();
5507 5507
     #endif
5508 5508
 
5509
-    if (thermalManager.isHeatingHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, MSG_HEATING);
5509
+    if (thermalManager.isHeatingHotend(target_extruder)) status_printf(0, "E%i %s", target_extruder + 1, PSTR(MSG_HEATING));
5510 5510
   }
5511 5511
 
5512 5512
   #if ENABLED(AUTOTEMP)

+ 1
- 1
Marlin/ultralcd.cpp View File

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

Loading…
Cancel
Save