Skip to content

Commit ce33a2c

Browse files
mak0t0santhinkyhead
authored andcommitted
Fix planner.cpp compile (#16996)
1 parent fd454e1 commit ce33a2c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Marlin/src/gcode/queue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void GCodeQueue::get_serial_commands() {
527527
while (length < BUFSIZE && !card_eof) {
528528
const int16_t n = card.get();
529529
card_eof = card.eof();
530-
if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(MSG_SD_ERR_READ); continue; }
530+
if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
531531
const char sd_char = (char)n;
532532
const bool is_eol = sd_char == '\n' || sd_char == '\r';
533533
if (is_eol || card_eof) {

Marlin/src/module/planner.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,10 +2403,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
24032403
LOOP_XYZE(i)
24042404
#endif
24052405
{
2406-
const float jerk = ABS(current_speed[i]); // cs : Starting from zero, change in speed for this axis
2407-
maxj = (max_jerk[axis] // mj : The max jerk setting for this axis
2406+
const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis
2407+
maxj = (max_jerk[i] // mj : The max jerk setting for this axis
24082408
#ifdef TRAVEL_EXTRA_XYJERK
2409-
+ (axis == X_AXIS || axis == Y_AXIS ? extra_xyjerk : 0)
2409+
+ (i == X_AXIS || i == Y_AXIS ? extra_xyjerk : 0)
24102410
#endif
24112411
);
24122412

0 commit comments

Comments
 (0)