ソースを参照

NOZZLE_CLEAN_NO_Y (#18870)

Mathew Winters 4年前
コミット
ca105493aa
コミッターのメールアドレスに関連付けられたアカウントが存在しません
2個のファイルの変更16行の追加4行の削除
  1. 4
    1
      Marlin/Configuration.h
  2. 12
    3
      Marlin/src/libs/nozzle.cpp

+ 4
- 1
Marlin/Configuration.h ファイルの表示

1604
   // Move the nozzle to the initial position after cleaning
1604
   // Move the nozzle to the initial position after cleaning
1605
   #define NOZZLE_CLEAN_GOBACK
1605
   #define NOZZLE_CLEAN_GOBACK
1606
 
1606
 
1607
-  // Enable for a purge/clean station that's always at the gantry height (thus no Z move)
1607
+  // For a purge/clean station that's always at the gantry height (thus no Z move)
1608
   //#define NOZZLE_CLEAN_NO_Z
1608
   //#define NOZZLE_CLEAN_NO_Z
1609
 
1609
 
1610
+  // For a purge/clean station mounted on the X axis
1611
+  //#define NOZZLE_CLEAN_NO_Y
1612
+
1610
   // Explicit wipe G-code script applies to a G12 with no arguments.
1613
   // Explicit wipe G-code script applies to a G12 with no arguments.
1611
   //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"
1614
   //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"
1612
 
1615
 

+ 12
- 3
Marlin/src/libs/nozzle.cpp ファイルの表示

46
 
46
 
47
     // Move to the starting point
47
     // Move to the starting point
48
     #if ENABLED(NOZZLE_CLEAN_NO_Z)
48
     #if ENABLED(NOZZLE_CLEAN_NO_Z)
49
-      do_blocking_move_to_xy(start);
49
+      #if ENABLED(NOZZLE_CLEAN_NO_Y)
50
+        do_blocking_move_to_x(start.x);
51
+      #else
52
+        do_blocking_move_to_xy(start);
53
+      #endif
50
     #else
54
     #else
51
       do_blocking_move_to(start);
55
       do_blocking_move_to(start);
52
     #endif
56
     #endif
53
 
57
 
54
     // Start the stroke pattern
58
     // Start the stroke pattern
55
     LOOP_L_N(i, strokes >> 1) {
59
     LOOP_L_N(i, strokes >> 1) {
56
-      do_blocking_move_to_xy(end);
57
-      do_blocking_move_to_xy(start);
60
+      #if ENABLED(NOZZLE_CLEAN_NO_Y)
61
+        do_blocking_move_to_x(end.x);
62
+        do_blocking_move_to_x(start.x);
63
+      #else
64
+        do_blocking_move_to_xy(end);
65
+        do_blocking_move_to_xy(start);
66
+      #endif
58
     }
67
     }
59
 
68
 
60
     TERN_(NOZZLE_CLEAN_GOBACK, do_blocking_move_to(oldpos));
69
     TERN_(NOZZLE_CLEAN_GOBACK, do_blocking_move_to(oldpos));

読み込み中…
キャンセル
保存