|
@@ -80,30 +80,31 @@ block_t Planner::block_buffer[BLOCK_BUFFER_SIZE];
|
80
|
80
|
volatile uint8_t Planner::block_buffer_head = 0; // Index of the next block to be pushed
|
81
|
81
|
volatile uint8_t Planner::block_buffer_tail = 0;
|
82
|
82
|
|
83
|
|
-float Planner::max_feedrate_mm_s[NUM_AXIS]; // Max speeds in mm per second
|
84
|
|
-float Planner::axis_steps_per_mm[NUM_AXIS];
|
85
|
|
-float Planner::steps_to_mm[NUM_AXIS];
|
86
|
|
-unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS];
|
87
|
|
-unsigned long Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
|
|
83
|
+float Planner::max_feedrate_mm_s[NUM_AXIS], // Max speeds in mm per second
|
|
84
|
+ Planner::axis_steps_per_mm[NUM_AXIS],
|
|
85
|
+ Planner::steps_to_mm[NUM_AXIS];
|
|
86
|
+
|
|
87
|
+unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS],
|
|
88
|
+ Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
|
88
|
89
|
|
89
|
90
|
millis_t Planner::min_segment_time;
|
90
|
|
-float Planner::min_feedrate_mm_s;
|
91
|
|
-float Planner::acceleration; // Normal acceleration mm/s^2 DEFAULT ACCELERATION for all printing moves. M204 SXXXX
|
92
|
|
-float Planner::retract_acceleration; // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
|
93
|
|
-float Planner::travel_acceleration; // Travel acceleration mm/s^2 DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
|
94
|
|
-float Planner::max_xy_jerk; // The largest speed change requiring no acceleration
|
95
|
|
-float Planner::max_z_jerk;
|
96
|
|
-float Planner::max_e_jerk;
|
97
|
|
-float Planner::min_travel_feedrate_mm_s;
|
|
91
|
+float Planner::min_feedrate_mm_s,
|
|
92
|
+ Planner::acceleration, // Normal acceleration mm/s^2 DEFAULT ACCELERATION for all printing moves. M204 SXXXX
|
|
93
|
+ Planner::retract_acceleration, // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
|
|
94
|
+ Planner::travel_acceleration, // Travel acceleration mm/s^2 DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
|
|
95
|
+ Planner::max_xy_jerk, // The largest speed change requiring no acceleration
|
|
96
|
+ Planner::max_z_jerk,
|
|
97
|
+ Planner::max_e_jerk,
|
|
98
|
+ Planner::min_travel_feedrate_mm_s;
|
98
|
99
|
|
99
|
100
|
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
|
100
|
101
|
matrix_3x3 Planner::bed_level_matrix; // Transform to compensate for bed level
|
101
|
102
|
#endif
|
102
|
103
|
|
103
|
104
|
#if ENABLED(AUTOTEMP)
|
104
|
|
- float Planner::autotemp_max = 250;
|
105
|
|
- float Planner::autotemp_min = 210;
|
106
|
|
- float Planner::autotemp_factor = 0.1;
|
|
105
|
+ float Planner::autotemp_max = 250,
|
|
106
|
+ Planner::autotemp_min = 210,
|
|
107
|
+ Planner::autotemp_factor = 0.1;
|
107
|
108
|
bool Planner::autotemp_enabled = false;
|
108
|
109
|
#endif
|
109
|
110
|
|
|
@@ -111,9 +112,8 @@ float Planner::min_travel_feedrate_mm_s;
|
111
|
112
|
|
112
|
113
|
long Planner::position[NUM_AXIS] = { 0 };
|
113
|
114
|
|
114
|
|
-float Planner::previous_speed[NUM_AXIS];
|
115
|
|
-
|
116
|
|
-float Planner::previous_nominal_speed;
|
|
115
|
+float Planner::previous_speed[NUM_AXIS],
|
|
116
|
+ Planner::previous_nominal_speed;
|
117
|
117
|
|
118
|
118
|
#if ENABLED(DISABLE_INACTIVE_EXTRUDER)
|
119
|
119
|
uint8_t Planner::g_uc_extruder_last_move[EXTRUDERS] = { 0 };
|