Skip to content

Commit

Permalink
Follow-up the PR MarlinFirmware#3631(Encapsulate Stepper, ...
Browse files Browse the repository at this point in the history
Follow-up the PR MarlinFirmware#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 MarlinFirmware#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
  • Loading branch information
esenapaj authored and CONSULitAS committed Aug 18, 2016
1 parent 9672bde commit f75a6ed
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6368,7 +6368,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;
Expand Down Expand Up @@ -7082,7 +7082,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;
Expand Down

0 comments on commit f75a6ed

Please sign in to comment.