|
@@ -2005,22 +2005,24 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
2005
|
2005
|
|
2006
|
2006
|
// Number of steps for each axis
|
2007
|
2007
|
// See https://www.corexy.com/theory.html
|
2008
|
|
- #if CORE_IS_XY
|
2009
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2010
|
|
- #elif CORE_IS_XZ
|
2011
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2012
|
|
- #elif CORE_IS_YZ
|
2013
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2014
|
|
- #elif ENABLED(MARKFORGED_XY)
|
2015
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2016
|
|
- #elif ENABLED(MARKFORGED_YX)
|
2017
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + da), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2018
|
|
- #elif IS_SCARA
|
2019
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2020
|
|
- #else
|
2021
|
|
- // default non-h-bot planning
|
2022
|
|
- block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
|
2023
|
|
- #endif
|
|
2008
|
+ block->steps.set(NUM_AXIS_LIST(
|
|
2009
|
+ #if CORE_IS_XY
|
|
2010
|
+ ABS(da + db), ABS(da - db), ABS(dc)
|
|
2011
|
+ #elif CORE_IS_XZ
|
|
2012
|
+ ABS(da + dc), ABS(db), ABS(da - dc)
|
|
2013
|
+ #elif CORE_IS_YZ
|
|
2014
|
+ ABS(da), ABS(db + dc), ABS(db - dc)
|
|
2015
|
+ #elif ENABLED(MARKFORGED_XY)
|
|
2016
|
+ ABS(da + db), ABS(db), ABS(dc)
|
|
2017
|
+ #elif ENABLED(MARKFORGED_YX)
|
|
2018
|
+ ABS(da), ABS(db + da), ABS(dc)
|
|
2019
|
+ #elif IS_SCARA
|
|
2020
|
+ ABS(da), ABS(db), ABS(dc)
|
|
2021
|
+ #else // default non-h-bot planning
|
|
2022
|
+ ABS(da), ABS(db), ABS(dc)
|
|
2023
|
+ #endif
|
|
2024
|
+ , ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)
|
|
2025
|
+ ));
|
2024
|
2026
|
|
2025
|
2027
|
/**
|
2026
|
2028
|
* This part of the code calculates the total length of the movement.
|