Browse Source

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

Bernhard 12 years ago
parent
commit
044886b4a0
1 changed files with 12 additions and 1 deletions
  1. 12
    1
      Marlin/Marlin.pde

+ 12
- 1
Marlin/Marlin.pde View File

@@ -858,7 +858,18 @@ inline void process_commands()
858 858
       }
859 859
       else
860 860
       { 
861
-        finishAndDisableSteppers();
861
+        #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
862
+        if(code_seen('E')) {
863
+          st_synchronize()
864
+          LCD_MESSAGEPGM("Free Move");
865
+          disable_e();
866
+        }
867
+        else {
868
+          finishAndDisableSteppers();
869
+        }
870
+        #else
871
+          finishAndDisableSteppers();
872
+        #endif
862 873
       }
863 874
       break;
864 875
     case 85: // M85

Loading…
Cancel
Save