zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1264 from Wurstnase/Development

Browse source 
change filament issue
This commit is contained in:
Bernhard Kubicek 2014-12-29 16:48:18 +01:00
parent c1df713e4d d1995aec7a
commit 78167ce439
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Marlin_main.cpp
View file

@ -204,6 +204,7 @@ 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
@ -3616,7 +3617,9 @@ 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(); manage_inactivity();
ignore_stepper_inactivity_queue_check = false;
lcd_update(); lcd_update();
if(cnt==0) if(cnt==0)
{ {
@ -4335,7 +4338,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) { if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) {
disable_x(); disable_x();
disable_y(); disable_y();
disable_z(); disable_z();