Browse Source

Update planner.h

Changed level and leveling to compensation.
John Davis 10 years ago
parent
commit
e99f24ff2f
1 changed files with 11 additions and 11 deletions
  1. 11
    11
      Marlin/planner.h

+ 11
- 11
Marlin/planner.h View File

26
 
26
 
27
 #include "Marlin.h"
27
 #include "Marlin.h"
28
 
28
 
29
-#ifdef ENABLE_AUTO_BED_LEVELING
29
+#ifdef ENABLE_AUTO_BED_COMPENSATION
30
 #include "vector_3.h"
30
 #include "vector_3.h"
31
-#endif // ENABLE_AUTO_BED_LEVELING
31
+#endif // ENABLE_AUTO_BED_COMPENSATION
32
 
32
 
33
 // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in 
33
 // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in 
34
 // the source g-code and may never actually be reached if acceleration management is active.
34
 // the source g-code and may never actually be reached if acceleration management is active.
71
   volatile char busy;
71
   volatile char busy;
72
 } block_t;
72
 } block_t;
73
 
73
 
74
-#ifdef ENABLE_AUTO_BED_LEVELING
75
-// this holds the required transform to compensate for bed level
76
-extern matrix_3x3 plan_bed_level_matrix;
77
-#endif // #ifdef ENABLE_AUTO_BED_LEVELING
74
+#ifdef ENABLE_AUTO_BED_COMPENSATION
75
+// this holds the required transform to compensate for bed compensation
76
+extern matrix_3x3 plan_bed_compensation_matrix;
77
+#endif // #ifdef ENABLE_AUTO_BED_COMPENSATION
78
 
78
 
79
 // Initialize the motion plan subsystem      
79
 // Initialize the motion plan subsystem      
80
 void plan_init();
80
 void plan_init();
82
 // Add a new linear movement to the buffer. x, y and z is the signed, absolute target position in 
82
 // Add a new linear movement to the buffer. x, y and z is the signed, absolute target position in 
83
 // millimaters. Feed rate specifies the speed of the motion.
83
 // millimaters. Feed rate specifies the speed of the motion.
84
 
84
 
85
-#ifdef ENABLE_AUTO_BED_LEVELING
85
+#ifdef ENABLE_AUTO_BED_COMPENSATION
86
 void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder);
86
 void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder);
87
 
87
 
88
-// Get the position applying the bed level matrix if enabled
88
+// Get the position applying the bed compensation matrix if enabled
89
 vector_3 plan_get_position();
89
 vector_3 plan_get_position();
90
 #else
90
 #else
91
 void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder);
91
 void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder);
92
-#endif // ENABLE_AUTO_BED_LEVELING
92
+#endif // ENABLE_AUTO_BED_COMPENSATION
93
 
93
 
94
 // Set position. Used for G92 instructions.
94
 // Set position. Used for G92 instructions.
95
-#ifdef ENABLE_AUTO_BED_LEVELING
95
+#ifdef ENABLE_AUTO_BED_COMPENSATION
96
 void plan_set_position(float x, float y, float z, const float &e);
96
 void plan_set_position(float x, float y, float z, const float &e);
97
 #else
97
 #else
98
 void plan_set_position(const float &x, const float &y, const float &z, const float &e);
98
 void plan_set_position(const float &x, const float &y, const float &z, const float &e);
99
-#endif // ENABLE_AUTO_BED_LEVELING
99
+#endif // ENABLE_AUTO_BED_COMPENSATION
100
 
100
 
101
 void plan_set_e_position(const float &e);
101
 void plan_set_e_position(const float &e);
102
 
102
 

Loading…
Cancel
Save