浏览代码

Simpler prepare move conditions

Scott Lahteine 8 年前
父节点
当前提交
c10d763d98
共有 1 个文件被更改,包括 4 次插入8 次删除
  1. 4
    8
      Marlin/Marlin_main.cpp

+ 4
- 8
Marlin/Marlin_main.cpp 查看文件

11859
   #endif
11859
   #endif
11860
 
11860
 
11861
   if (
11861
   if (
11862
-    #if IS_KINEMATIC
11863
-      #if UBL_DELTA
11864
-        ubl.prepare_segmented_line_to(destination, feedrate_mm_s)
11865
-      #else
11866
-        prepare_kinematic_move_to(destination)
11867
-      #endif
11862
+    #if UBL_DELTA // Also works for CARTESIAN (smaller segments follow mesh more closely)
11863
+      ubl.prepare_segmented_line_to(destination, feedrate_mm_s)
11864
+    #elif IS_KINEMATIC
11865
+      prepare_kinematic_move_to(destination)
11868
     #elif ENABLED(DUAL_X_CARRIAGE)
11866
     #elif ENABLED(DUAL_X_CARRIAGE)
11869
       prepare_move_to_destination_dualx()
11867
       prepare_move_to_destination_dualx()
11870
-    #elif UBL_DELTA // will work for CARTESIAN too (smaller segments follow mesh more closely)
11871
-      ubl.prepare_segmented_line_to(destination, feedrate_mm_s)
11872
     #else
11868
     #else
11873
       prepare_move_to_destination_cartesian()
11869
       prepare_move_to_destination_cartesian()
11874
     #endif
11870
     #endif

正在加载...
取消
保存