|
|
@ -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_blocks_queued = 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_blocks_queued = true;
|
|
|
|
manage_inactivity();
|
|
|
|
manage_inactivity();
|
|
|
|
|
|
|
|
ignore_blocks_queued = 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_blocks_queued != true) {
|
|
|
|
disable_x();
|
|
|
|
disable_x();
|
|
|
|
disable_y();
|
|
|
|
disable_y();
|
|
|
|
disable_z();
|
|
|
|
disable_z();
|
|
|
|