Browse Source

UBL + DUAL_X_CARRIAGE compatibility

Scott Lahteine 7 years ago
parent
commit
24f9bec6f4
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      Marlin/src/module/motion.cpp

+ 6
- 4
Marlin/src/module/motion.cpp View File

796
    *
796
    *
797
    * Return true if current_position[] was set to destination[]
797
    * Return true if current_position[] was set to destination[]
798
    */
798
    */
799
-  inline bool prepare_move_to_destination_dualx() {
799
+  inline bool dual_x_carriage_unpark() {
800
     if (active_extruder_parked) {
800
     if (active_extruder_parked) {
801
       switch (dual_x_carriage_mode) {
801
       switch (dual_x_carriage_mode) {
802
         case DXC_FULL_CONTROL_MODE:
802
         case DXC_FULL_CONTROL_MODE:
865
           break;
865
           break;
866
       }
866
       }
867
     }
867
     }
868
-    return prepare_move_to_destination_cartesian();
868
+    return false;
869
   }
869
   }
870
 
870
 
871
 #endif // DUAL_X_CARRIAGE
871
 #endif // DUAL_X_CARRIAGE
906
 
906
 
907
   #endif // PREVENT_COLD_EXTRUSION || PREVENT_LENGTHY_EXTRUDE
907
   #endif // PREVENT_COLD_EXTRUSION || PREVENT_LENGTHY_EXTRUDE
908
 
908
 
909
+  #if ENABLED(DUAL_X_CARRIAGE)
910
+    if (dual_x_carriage_unpark()) return;
911
+  #endif
912
+
909
   if (
913
   if (
910
     #if UBL_SEGMENTED
914
     #if UBL_SEGMENTED
911
       ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
915
       ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
912
     #elif IS_KINEMATIC
916
     #elif IS_KINEMATIC
913
       prepare_kinematic_move_to(destination)
917
       prepare_kinematic_move_to(destination)
914
-    #elif ENABLED(DUAL_X_CARRIAGE)
915
-      prepare_move_to_destination_dualx()
916
     #else
918
     #else
917
       prepare_move_to_destination_cartesian()
919
       prepare_move_to_destination_cartesian()
918
     #endif
920
     #endif

Loading…
Cancel
Save