SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0

Browse source 
Fix temperature checking conditions (backwards!)
This commit is contained in:
Scott Lahteine 2016-03-30 12:10:39 -07:00
commit 8def2c31db
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View file

@ -4265,7 +4265,7 @@ inline void gcode_M109() {
#define TEMP_CONDITIONS (residency_start_ms < 0 || now < residency_start_ms + (TEMP_RESIDENCY_TIME) * 1000UL)
#else
// Loop until the temperature is very close target
#define TEMP_CONDITIONS (fabs(degHotend(target_extruder) - degTargetHotend(target_extruder)) < 0.75f)
#define TEMP_CONDITIONS (isHeatingHotend(target_extruder))
#endif //TEMP_RESIDENCY_TIME
cancel_heatup = false;
@ -4325,7 +4325,7 @@ inline void gcode_M109() {
cancel_heatup = false;
millis_t now = millis(), next_temp_ms = now + 1000UL;
while (!cancel_heatup && fabs(degTargetBed() - degBed()) < 0.75f) {
while (!cancel_heatup && isHeatingBed()) {
millis_t now = millis();
if (now > next_temp_ms) { //Print Temp Reading every 1 second while heating up.
next_temp_ms = now + 1000UL;