MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure M109 calls autotemp

Browse Source
This commit is contained in:
Scott Lahteine 2018-09-29 02:15:16 -05:00
parent 501b8374fd
commit e6339a4aa6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -8416,8 +8416,9 @@ inline void gcode_M109() {
if (target_extruder != active_extruder) return; if (target_extruder != active_extruder) return;
#endif #endif
const bool no_wait_for_cooling = parser.seenval('S'); const bool no_wait_for_cooling = parser.seenval('S'),
if (no_wait_for_cooling || parser.seenval('R')) { set_temp = no_wait_for_cooling || parser.seenval('R')
if (set_temp) {
const int16_t temp = parser.value_celsius(); const int16_t temp = parser.value_celsius();
thermalManager.setTargetHotend(temp, target_extruder); thermalManager.setTargetHotend(temp, target_extruder);
@ -8450,12 +8451,13 @@ inline void gcode_M109() {
#endif #endif
#endif #endif
} }
else return;
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)
planner.autotemp_M104_M109(); planner.autotemp_M104_M109();
#endif #endif
if (!set_temp) return;
#if TEMP_RESIDENCY_TIME > 0 #if TEMP_RESIDENCY_TIME > 0
millis_t residency_start_ms = 0; millis_t residency_start_ms = 0;
// Loop until the temperature has stabilized // Loop until the temperature has stabilized