Browse Source

Fix DUAL_X_CARRIAGE with UBL segmented

Scott Lahteine 7 years ago
parent
commit
4f042533a5
1 changed files with 10 additions and 4 deletions
  1. 10
    4
      Marlin/Marlin_main.cpp

+ 10
- 4
Marlin/Marlin_main.cpp View File

@@ -12895,7 +12895,13 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
12895 12895
           break;
12896 12896
       }
12897 12897
     }
12898
-    return prepare_move_to_destination_cartesian();
12898
+    return (
12899
+      #if UBL_SEGMENTED
12900
+        ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
12901
+      #else
12902
+        prepare_move_to_destination_cartesian()
12903
+      #endif
12904
+    );
12899 12905
   }
12900 12906
 
12901 12907
 #endif // DUAL_X_CARRIAGE
@@ -12937,12 +12943,12 @@ void prepare_move_to_destination() {
12937 12943
   #endif
12938 12944
 
12939 12945
   if (
12940
-    #if UBL_SEGMENTED // Also works for CARTESIAN (smaller segments follow mesh more closely)
12946
+    #if ENABLED(DUAL_X_CARRIAGE)
12947
+      prepare_move_to_destination_dualx()
12948
+    #elif UBL_SEGMENTED
12941 12949
       ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
12942 12950
     #elif IS_KINEMATIC
12943 12951
       prepare_kinematic_move_to(destination)
12944
-    #elif ENABLED(DUAL_X_CARRIAGE)
12945
-      prepare_move_to_destination_dualx()
12946 12952
     #else
12947 12953
       prepare_move_to_destination_cartesian()
12948 12954
     #endif

Loading…
Cancel
Save