zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203)

Browse source
This commit is contained in:
Roman Moravčík 2018-10-24 22:00:07 +02:00 committed by Scott Lahteine
parent 7a04eb3a8b
commit e48cbff10d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/core/language.h
View file

@ -200,7 +200,7 @@
#define MSG_ENDSTOPS_HIT "endstops hit: " #define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" #define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_ERR_LONG_EXTRUDE_STOP " too long 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_HEAT "Press button (or M108) to heat nozzle"
#define MSG_FILAMENT_CHANGE_INSERT "Insert filament and press button (or M108)" #define MSG_FILAMENT_CHANGE_INSERT "Insert filament and press button (or M108)"

4
Marlin/src/feature/pause.cpp
View file

@ -97,7 +97,7 @@ static bool ensure_safe_temperature(const AdvancedPauseMode mode=ADVANCED_PAUSE_
#if ENABLED(PREVENT_COLD_EXTRUSION) #if ENABLED(PREVENT_COLD_EXTRUSION)
if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) { if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder)) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
return false; return false;
} }
#endif #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)) { if (!DEBUGGING(DRYRUN) && unload_length && thermalManager.targetTooColdToExtrude(active_extruder)) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
if (show_lcd) { // Show status screen if (show_lcd) { // Show status screen

2
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
#if ENABLED(PREVENT_COLD_EXTRUSION) #if ENABLED(PREVENT_COLD_EXTRUSION)
if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && toolchange_settings.swap_length) { if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder) && toolchange_settings.swap_length) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_HOTEND_TOO_COLD); SERIAL_ERRORLNPGM(MSG_ERR_HOTEND_TOO_COLD);
active_extruder = tmp_extruder; active_extruder = tmp_extruder;
return; return;
} }