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

Patch idle forevermore

Browse Source
This commit is contained in:
Scott Lahteine
2016-03-18 22:22:40 -07:00
parent 7ec7bb31c4
commit 963a92ceda
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin.h
View File

@@ -103,7 +103,11 @@ FORCE_INLINE void serialprintPGM(const char* str) {
void get_command(); void get_command();
void idle(); // the standard idle routine calls manage_inactivity(false) void idle(
#if ENABLED(FILAMENTCHANGEENABLE)
bool no_stepper_sleep=false // pass true to keep steppers from disabling on timeout
#endif
);
void manage_inactivity(bool ignore_stepper_queue = false); void manage_inactivity(bool ignore_stepper_queue = false);

21
Marlin/Marlin_main.cpp
View File

@@ -5391,13 +5391,6 @@ inline void gcode_M503() {
#if ENABLED(FILAMENTCHANGEENABLE) #if ENABLED(FILAMENTCHANGEENABLE)
inline void idle2() {
manage_heater();
manage_inactivity(true);
host_keepalive();
lcd_update();
}
/** /**
* M600: Pause for filament change * M600: Pause for filament change
* *
@@ -5484,7 +5477,7 @@ inline void gcode_M503() {
lcd_quick_feedback(); lcd_quick_feedback();
next_tick = ms + 2500; // feedback every 2.5s while waiting next_tick = ms + 2500; // feedback every 2.5s while waiting
} }
idle2(); idle(true);
#else #else
current_position[E_AXIS] += AUTO_FILAMENT_CHANGE_LENGTH; current_position[E_AXIS] += AUTO_FILAMENT_CHANGE_LENGTH;
destination[E_AXIS] = current_position[E_AXIS]; destination[E_AXIS] = current_position[E_AXIS];
@@ -7040,9 +7033,17 @@ void disable_all_steppers() {
/** /**
* Standard idle routine keeps the machine alive * Standard idle routine keeps the machine alive
*/ */
void idle() { void idle(
#if ENABLED(FILAMENTCHANGEENABLE)
bool no_stepper_sleep/*=false*/
#endif
) {
manage_heater(); manage_heater();
manage_inactivity(); manage_inactivity(
#if ENABLED(FILAMENTCHANGEENABLE)
no_stepper_sleep
#endif
);
host_keepalive(); host_keepalive();
lcd_update(); lcd_update();
} }