|
@@ -26,9 +26,9 @@
|
26
|
26
|
|
27
|
27
|
#include "Marlin.h"
|
28
|
28
|
|
29
|
|
-#ifdef ENABLE_AUTO_BED_LEVELING
|
|
29
|
+#ifdef ENABLE_AUTO_BED_COMPENSATION
|
30
|
30
|
#include "vector_3.h"
|
31
|
|
-#endif // ENABLE_AUTO_BED_LEVELING
|
|
31
|
+#endif // ENABLE_AUTO_BED_COMPENSATION
|
32
|
32
|
|
33
|
33
|
// This struct is used when buffering the setup for each linear movement "nominal" values are as specified in
|
34
|
34
|
// the source g-code and may never actually be reached if acceleration management is active.
|
|
@@ -71,10 +71,10 @@ typedef struct {
|
71
|
71
|
volatile char busy;
|
72
|
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
|
79
|
// Initialize the motion plan subsystem
|
80
|
80
|
void plan_init();
|
|
@@ -82,21 +82,21 @@ void plan_init();
|
82
|
82
|
// Add a new linear movement to the buffer. x, y and z is the signed, absolute target position in
|
83
|
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
|
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
|
89
|
vector_3 plan_get_position();
|
90
|
90
|
#else
|
91
|
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
|
94
|
// Set position. Used for G92 instructions.
|
95
|
|
-#ifdef ENABLE_AUTO_BED_LEVELING
|
|
95
|
+#ifdef ENABLE_AUTO_BED_COMPENSATION
|
96
|
96
|
void plan_set_position(float x, float y, float z, const float &e);
|
97
|
97
|
#else
|
98
|
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
|
101
|
void plan_set_e_position(const float &e);
|
102
|
102
|
|