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

Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

Browse Source
This commit is contained in:
Erik van der Zalm
2011-11-19 21:33:15 +01:00
parent 915ef2d4a1 e87df99e22
commit 0e7fee9a9b
4 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/Marlin.pde
View File

@ -70,6 +70,8 @@
// M114 - Display current position
//Custom M Codes
// M17 - Enable/Power all stepper motors
// M18 - Disable all stepper motors; same as M84
// M20 - List SD card
// M21 - Init SD card
// M22 - Release SD card
@ -90,7 +92,9 @@
// or use S<seconds> to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout.
// M85 - Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
// M92 - Set axis_steps_per_unit - same syntax as G92
// M114 - Output current position to serial port
// M115 - Capabilities string
// M119 - Output Endstop status to serial port
// M140 - Set bed target temp
// M190 - Wait for bed current temp to reach target temp.
// M200 - Set filament diameter
@ -569,6 +573,13 @@ inline void process_commands()
switch( (int)code_value() )
{
case 17:
LCD_MESSAGEPGM("No move.");
enable_x();
enable_y();
enable_z();
enable_e();
break;
#ifdef SDSUPPORT
case 20: // M20 - list SD card