From e48cbff10dcc469501c4530e4e4d1da4993e7f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= Date: Wed, 24 Oct 2018 22:00:07 +0200 Subject: [PATCH] Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203) --- Marlin/src/core/language.h | 2 +- Marlin/src/feature/pause.cpp | 4 ++-- Marlin/src/module/tool_change.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index a0ec39bbf..00f0ecc97 100644 --- a/Marlin/src/core/language.h +++ b/Marlin/src/core/language.h @@ -200,7 +200,7 @@ #define MSG_ENDSTOPS_HIT "endstops hit: " #define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" #define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" -#define MSG_HOTEND_TOO_COLD "Hotend too cold" +#define MSG_ERR_HOTEND_TOO_COLD "Hotend too cold" #define MSG_FILAMENT_CHANGE_HEAT "Press button (or M108) to heat nozzle" #define MSG_FILAMENT_CHANGE_INSERT "Insert filament and press button (or M108)" diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 58a9c9d64..6c232b5db 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -97,7 +97,7 @@ static bool ensure_safe_temperature(const AdvancedPauseMode mode=ADVANCED_PAUSE_ #if ENABLED(PREVENT_COLD_EXTRUSION) if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) { SERIAL_ERROR_START(); - SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); + SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD); return false; } #endif @@ -349,7 +349,7 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) { SERIAL_ERROR_START(); - SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); + SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD); #if ENABLED(ULTIPANEL) if (show_lcd) { // Show status screen diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index d7fffae07..68864cb2b 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -642,7 +642,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n #if ENABLED(PREVENT_COLD_EXTRUSION) if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && toolchange_settings.swap_length) { SERIAL_ERROR_START(); - SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); + SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD); active_extruder = tmp_extruder; return; }