MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix DUAL_X_CARRIAGE with UBL segmented

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-09 05:03:54 -06:00
parent 6e8da93c42
commit 4f042533a5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@ -12895,7 +12895,13 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
break;
}
}
return prepare_move_to_destination_cartesian();
return (
#if UBL_SEGMENTED
ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
#else
prepare_move_to_destination_cartesian()
#endif
);
}
#endif // DUAL_X_CARRIAGE
@ -12937,12 +12943,12 @@ void prepare_move_to_destination() {
#endif
if (
#if UBL_SEGMENTED // Also works for CARTESIAN (smaller segments follow mesh more closely)
#if ENABLED(DUAL_X_CARRIAGE)
prepare_move_to_destination_dualx()
#elif UBL_SEGMENTED
ubl.prepare_segmented_line_to(destination, MMS_SCALED(feedrate_mm_s))
#elif IS_KINEMATIC
prepare_kinematic_move_to(destination)
#elif ENABLED(DUAL_X_CARRIAGE)
prepare_move_to_destination_dualx()
#else
prepare_move_to_destination_cartesian()
#endif