Browse Source

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
esenapaj 8 years ago
parent
commit
a82cfcff2d
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

6359
             }
6359
             }
6360
           #endif
6360
           #endif
6361
 
6361
 
6362
-          offset_vec.apply_rotation(plan_bed_level_matrix.transpose(plan_bed_level_matrix));
6362
+          offset_vec.apply_rotation(planner.bed_level_matrix.transpose(planner.bed_level_matrix));
6363
 
6363
 
6364
           current_position[X_AXIS] += offset_vec.x;
6364
           current_position[X_AXIS] += offset_vec.x;
6365
           current_position[Y_AXIS] += offset_vec.y;
6365
           current_position[Y_AXIS] += offset_vec.y;
7069
       while (NUMERIC_SIGNED(*p))
7069
       while (NUMERIC_SIGNED(*p))
7070
         SERIAL_ECHO(*p++);
7070
         SERIAL_ECHO(*p++);
7071
     }
7071
     }
7072
-    SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1));
7072
+    SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - planner.movesplanned() - 1));
7073
     SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue);
7073
     SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue);
7074
   #endif
7074
   #endif
7075
   SERIAL_EOL;
7075
   SERIAL_EOL;

Loading…
Cancel
Save