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

🐛 Fix 5-axis no extruder compile

Browse Source 
Fixes #22446
This commit is contained in:
Scott Lahteine 2021-07-29 19:55:04 -05:00
parent 12581bcc44
commit 74b0133bc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -1053,7 +1053,7 @@
#endif #endif
// E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA // E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
#if ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)) #if HAS_EXTRUDERS && (ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)))
#define HAS_CLASSIC_E_JERK 1 #define HAS_CLASSIC_E_JERK 1
#endif #endif

2
Marlin/src/module/planner.cpp
View File

@ -2684,7 +2684,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#ifndef TRAVEL_EXTRA_XYJERK #ifndef TRAVEL_EXTRA_XYJERK
#define TRAVEL_EXTRA_XYJERK 0 #define TRAVEL_EXTRA_XYJERK 0
#endif #endif
const float extra_xyjerk = (de <= 0) ? TRAVEL_EXTRA_XYJERK : 0; const float extra_xyjerk = TERN0(HAS_EXTRUDERS, de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
uint8_t limited = 0; uint8_t limited = 0;
TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(i) { TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(i) {