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

Follow-up the PR #3631(Encapsulate Stepper, ...

Browse Source 
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
This commit is contained in:
esenapaj 2016-05-02 22:04:26 +09:00
parent f7185fba08
commit a82cfcff2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -6359,7 +6359,7 @@ inline void gcode_T(uint8_t tmp_extruder) {
} }
#endif #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[X_AXIS] += offset_vec.x;
current_position[Y_AXIS] += offset_vec.y; current_position[Y_AXIS] += offset_vec.y;
@ -7069,7 +7069,7 @@ void ok_to_send() {
while (NUMERIC_SIGNED(*p)) while (NUMERIC_SIGNED(*p))
SERIAL_ECHO(*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); SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue);
#endif #endif
SERIAL_EOL; SERIAL_EOL;