Browse files

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into M…

…arlin_v1
  • Loading branch information...
2 parents b19c8b7 + 6d95644 commit 044886b4a0d546cfe3bae2bf66424d127db7bd33 Bernhard committed Nov 28, 2011
Showing with 12 additions and 1 deletion.
  1. +12 −1 Marlin/Marlin.pde
View
13 Marlin/Marlin.pde
@@ -858,7 +858,18 @@ inline void process_commands()
}
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;
case 85: // M85

0 comments on commit 044886b

Please sign in to comment.