bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Slight size reduction by adding idle()

Browse Source
This commit is contained in:
Scott Lahteine
2015-05-26 20:08:21 -07:00
parent 97a48e36e9
commit d76a01194d
4 changed files with 27 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Marlin/Marlin_main.cpp
View File

@ -726,11 +726,8 @@ void loop() {
commands_in_queue--;
cmd_queue_index_r = (cmd_queue_index_r + 1) % BUFSIZE;
}
// Check heater every n milliseconds
manage_heater();
manage_inactivity();
checkHitEndstops();
lcd_update();
idle();
}
void gcode_line_error(const char *err, bool doFlush=true) {
@ -1998,11 +1995,7 @@ inline void gcode_G4() {
if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
while (millis() < codenum) {
manage_heater();
manage_inactivity();
lcd_update();
}
while (millis() < codenum) idle();
}
#ifdef FWRETRACT
@ -2682,9 +2675,7 @@ inline void gcode_G28() {
probePointCounter++;
manage_heater();
manage_inactivity();
lcd_update();
idle();
} //xProbe
} //yProbe
@ -2885,21 +2876,13 @@ inline void gcode_G92() {
st_synchronize();
refresh_cmd_timeout();
if (codenum > 0) {
codenum += previous_cmd_ms; // keep track of when we started waiting
while(millis() < codenum && !lcd_clicked()) {
manage_heater();
manage_inactivity();
lcd_update();
}
codenum += previous_cmd_ms; // wait until this time for a click
while (millis() < codenum && !lcd_clicked()) idle();
lcd_ignore_click(false);
}
else {
if (!lcd_detected()) return;
while (!lcd_clicked()) {
manage_heater();
manage_inactivity();
lcd_update();
}
while (!lcd_clicked()) idle();
}
if (IS_SD_PRINTING)
LCD_MESSAGEPGM(MSG_RESUMING);
@ -3525,9 +3508,9 @@ inline void gcode_M109() {
#endif
temp_ms = millis();
}
manage_heater();
manage_inactivity();
lcd_update();
idle();
#ifdef TEMP_RESIDENCY_TIME
// start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
// or when current temp falls outside the hysteresis after target temp was reached
@ -3575,9 +3558,7 @@ inline void gcode_M109() {
SERIAL_PROTOCOL_F(degBed(), 1);
SERIAL_EOL;
}
manage_heater();
manage_inactivity();
lcd_update();
idle();
}
LCD_MESSAGEPGM(MSG_BED_DONE);
refresh_cmd_timeout();
@ -4262,11 +4243,7 @@ inline void gcode_M226() {
break;
}
while(digitalRead(pin_number) != target) {
manage_heater();
manage_inactivity();
lcd_update();
}
while (digitalRead(pin_number) != target) idle();
} // pin_number > -1
} // pin_state -1 0 1
@ -6253,6 +6230,15 @@ void disable_all_steppers() {
disable_e3();
}
/**
* Standard idle routine keeps the machine alive
*/
void idle() {
manage_heater();
manage_inactivity();
lcd_update();
}
/**
* Manage several activities:
* - Check for Filament Runout