From a82cfcff2d1e3cbbb91fe03cd7090e49525f8cad Mon Sep 17 00:00:00 2001 From: esenapaj Date: Mon, 2 May 2016 22:04:26 +0900 Subject: [PATCH] Follow-up the PR #3631(Encapsulate Stepper, ... Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes) plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp It probably fix the Issue #3658(plan_bed_level_matrix not declarate). movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp It fix compilation error when ADVANCED_OK is enabled --- Marlin/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 4100e629a52..1af47d50aa5 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6359,7 +6359,7 @@ inline void gcode_T(uint8_t tmp_extruder) { } #endif - offset_vec.apply_rotation(plan_bed_level_matrix.transpose(plan_bed_level_matrix)); + offset_vec.apply_rotation(planner.bed_level_matrix.transpose(planner.bed_level_matrix)); current_position[X_AXIS] += offset_vec.x; current_position[Y_AXIS] += offset_vec.y; @@ -7069,7 +7069,7 @@ void ok_to_send() { while (NUMERIC_SIGNED(*p)) SERIAL_ECHO(*p++); } - SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1)); + SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1)); SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue); #endif SERIAL_EOL;