chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd5296a
)
Added M88 command. (Request from Action68)
author
Erik van der Zalm
<erik@vdzalm.eu>
Mon, 28 Nov 2011 19:51:01 +0000
(20:51 +0100)
committer
Erik van der Zalm
<erik@vdzalm.eu>
Mon, 28 Nov 2011 19:51:01 +0000
(20:51 +0100)
Marlin/Marlin.pde
patch
|
blob
|
history
diff --git
a/Marlin/Marlin.pde
b/Marlin/Marlin.pde
index 4c1535bf587c84350784e6917711d30a4215d0f9..a803ba375d6f291ec4e1e0d0cd60496c02d5613d 100644
(file)
--- a/
Marlin/Marlin.pde
+++ b/
Marlin/Marlin.pde
@@
-866,6
+866,16
@@
inline void process_commands()
axis_steps_per_unit[i] = code_value();
}
break;
+ case 88: //M88
+ if(code_seen('S')) {
+ stepper_inactive_time = code_value() * 1000;
+ }
+ else {
+ st_synchronize()
+ LCD_MESSAGEPGM("Free Move");
+ disable_e();
+ }
+ break;
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");
break;