Browse Source

Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203)

Roman Moravčík 6 years ago
parent
commit
e48cbff10d
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      Marlin/src/core/language.h
  2. 2
    2
      Marlin/src/feature/pause.cpp
  3. 1
    1
      Marlin/src/module/tool_change.cpp

+ 1
- 1
Marlin/src/core/language.h View File

@@ -200,7 +200,7 @@
200 200
 #define MSG_ENDSTOPS_HIT                    "endstops hit: "
201 201
 #define MSG_ERR_COLD_EXTRUDE_STOP           " cold extrusion prevented"
202 202
 #define MSG_ERR_LONG_EXTRUDE_STOP           " too long extrusion prevented"
203
-#define MSG_HOTEND_TOO_COLD                 "Hotend too cold"
203
+#define MSG_ERR_HOTEND_TOO_COLD             "Hotend too cold"
204 204
 
205 205
 #define MSG_FILAMENT_CHANGE_HEAT            "Press button (or M108) to heat nozzle"
206 206
 #define MSG_FILAMENT_CHANGE_INSERT          "Insert filament and press button (or M108)"

+ 2
- 2
Marlin/src/feature/pause.cpp View File

@@ -97,7 +97,7 @@ static bool ensure_safe_temperature(const AdvancedPauseMode mode=ADVANCED_PAUSE_
97 97
   #if ENABLED(PREVENT_COLD_EXTRUSION)
98 98
     if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) {
99 99
       SERIAL_ERROR_START();
100
-      SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD);
100
+      SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
101 101
       return false;
102 102
     }
103 103
   #endif
@@ -349,7 +349,7 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
349 349
 
350 350
   if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
351 351
     SERIAL_ERROR_START();
352
-    SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD);
352
+    SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
353 353
 
354 354
     #if ENABLED(ULTIPANEL)
355 355
       if (show_lcd) { // Show status screen

+ 1
- 1
Marlin/src/module/tool_change.cpp View File

@@ -642,7 +642,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
642 642
         #if ENABLED(PREVENT_COLD_EXTRUSION)
643 643
           if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && toolchange_settings.swap_length) {
644 644
             SERIAL_ERROR_START();
645
-            SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD);
645
+            SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
646 646
             active_extruder = tmp_extruder;
647 647
             return;
648 648
           }

Loading…
Cancel
Save