SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved M88 into M84. (M84 E)

Browse source
This commit is contained in:
Erik van der Zalm 2011-11-28 21:49:54 +01:00
parent 7216a12856
commit 6d95644c0d
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Marlin/Marlin.pde
View file

@ -852,7 +852,18 @@ inline void process_commands()
} }
else else
{ {
finishAndDisableSteppers(); #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
if(code_seen('E')) {
st_synchronize()
LCD_MESSAGEPGM("Free Move");
disable_e();
}
else {
finishAndDisableSteppers();
}
#else
finishAndDisableSteppers();
#endif
} }
break; break;
case 85: // M85 case 85: // M85
@ -866,21 +877,6 @@ inline void process_commands()
axis_steps_per_unit[i] = code_value(); axis_steps_per_unit[i] = code_value();
} }
break; break;
case 88: //M88
#if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
if(code_seen('S')) {
stepper_inactive_time = code_value() * 1000;
}
else {
st_synchronize()
LCD_MESSAGEPGM("Free Move");
disable_e();
}
#else
SERIAL_ECHO_START;
SERIAL_ECHOLN("M88 not supported");
#endif
break;
case 115: // M115 case 115: // M115
SerialprintPGM("FIRMWARE_NAME:Marlin; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1"); SerialprintPGM("FIRMWARE_NAME:Marlin; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1");
break; break;