瀏覽代碼

Moved M88 into M84. (M84 E)

Erik van der Zalm 13 年之前
父節點
當前提交
6d95644c0d
共有 1 個檔案被更改,包括 12 行新增16 行删除
  1. 12
    16
      Marlin/Marlin.pde

+ 12
- 16
Marlin/Marlin.pde 查看文件

@@ -852,7 +852,18 @@ inline void process_commands()
852 852
       }
853 853
       else
854 854
       { 
855
-        finishAndDisableSteppers();
855
+        #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
856
+        if(code_seen('E')) {
857
+          st_synchronize()
858
+          LCD_MESSAGEPGM("Free Move");
859
+          disable_e();
860
+        }
861
+        else {
862
+          finishAndDisableSteppers();
863
+        }
864
+        #else
865
+          finishAndDisableSteppers();
866
+        #endif
856 867
       }
857 868
       break;
858 869
     case 85: // M85
@@ -866,21 +877,6 @@ inline void process_commands()
866 877
           axis_steps_per_unit[i] = code_value();
867 878
       }
868 879
       break;
869
-    case 88: //M88
870
-      #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
871
-        if(code_seen('S')) {
872
-          stepper_inactive_time = code_value() * 1000;
873
-        }
874
-        else {
875
-          st_synchronize()
876
-          LCD_MESSAGEPGM("Free Move");
877
-          disable_e();
878
-        }
879
-      #else
880
-        SERIAL_ECHO_START;
881
-        SERIAL_ECHOLN("M88 not supported");
882
-      #endif
883
-      break;
884 880
     case 115: // M115
885 881
       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");
886 882
       break;

Loading…
取消
儲存