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

Merge pull request #1265 from Wurstnase/Development

Browse Source 
Expand manage_inactivity #1264
This commit is contained in:
Bernhard Kubicek 2014-12-29 17:14:35 +01:00
commit 053b541de8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View File

@ -204,7 +204,6 @@ CardReader card;
#endif #endif
float homing_feedrate[] = HOMING_FEEDRATE; float homing_feedrate[] = HOMING_FEEDRATE;
bool axis_relative_modes[] = AXIS_RELATIVE_MODES; bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
bool ignore_stepper_inactivity_queue_check = false;
int feedmultiply=100; //100->1 200->2 int feedmultiply=100; //100->1 200->2
int saved_feedmultiply; int saved_feedmultiply;
int extrudemultiply=100; //100->1 200->2 int extrudemultiply=100; //100->1 200->2
@ -3617,9 +3616,7 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
while(!lcd_clicked()){ while(!lcd_clicked()){
cnt++; cnt++;
manage_heater(); manage_heater();
ignore_stepper_inactivity_queue_check = true; manage_inactivity(false);
manage_inactivity();
ignore_stepper_inactivity_queue_check = false;
lcd_update(); lcd_update();
if(cnt==0) if(cnt==0)
{ {
@ -4315,7 +4312,7 @@ void handle_status_leds(void) {
} }
#endif #endif
void manage_inactivity() void manage_inactivity(bool ignore_stepper_queue=false)
{ {
#if defined(KILL_PIN) && KILL_PIN > -1 #if defined(KILL_PIN) && KILL_PIN > -1
@ -4338,7 +4335,7 @@ void manage_inactivity()
if(stepper_inactive_time) { if(stepper_inactive_time) {
if( (millis() - previous_millis_cmd) > stepper_inactive_time ) if( (millis() - previous_millis_cmd) > stepper_inactive_time )
{ {
if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) { if(blocks_queued() == false && ignore_stepper_queue != true) {
disable_x(); disable_x();
disable_y(); disable_y();
disable_z(); disable_z();