|
@@ -58,9 +58,9 @@ typedef struct {
|
58
|
58
|
long steps[NUM_AXIS]; // Step count along each axis
|
59
|
59
|
unsigned long step_event_count; // The number of step events required to complete this block
|
60
|
60
|
|
61
|
|
- long accelerate_until; // The index of the step event on which to stop acceleration
|
62
|
|
- long decelerate_after; // The index of the step event on which to start decelerating
|
63
|
|
- long acceleration_rate; // The acceleration rate used for acceleration calculation
|
|
61
|
+ long accelerate_until, // The index of the step event on which to stop acceleration
|
|
62
|
+ decelerate_after, // The index of the step event on which to start decelerating
|
|
63
|
+ acceleration_rate; // The acceleration rate used for acceleration calculation
|
64
|
64
|
|
65
|
65
|
unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
|
66
|
66
|
|
|
@@ -72,27 +72,26 @@ typedef struct {
|
72
|
72
|
#endif
|
73
|
73
|
|
74
|
74
|
// Fields used by the motion planner to manage acceleration
|
75
|
|
- float nominal_speed; // The nominal speed for this block in mm/sec
|
76
|
|
- float entry_speed; // Entry speed at previous-current junction in mm/sec
|
77
|
|
- float max_entry_speed; // Maximum allowable junction entry speed in mm/sec
|
78
|
|
- float millimeters; // The total travel of this block in mm
|
79
|
|
- float acceleration; // acceleration mm/sec^2
|
80
|
|
- unsigned char recalculate_flag; // Planner flag to recalculate trapezoids on entry junction
|
81
|
|
- unsigned char nominal_length_flag; // Planner flag for nominal speed always reached
|
|
75
|
+ float nominal_speed, // The nominal speed for this block in mm/sec
|
|
76
|
+ entry_speed, // Entry speed at previous-current junction in mm/sec
|
|
77
|
+ max_entry_speed, // Maximum allowable junction entry speed in mm/sec
|
|
78
|
+ millimeters, // The total travel of this block in mm
|
|
79
|
+ acceleration; // acceleration mm/sec^2
|
|
80
|
+ unsigned char recalculate_flag, // Planner flag to recalculate trapezoids on entry junction
|
|
81
|
+ nominal_length_flag; // Planner flag for nominal speed always reached
|
82
|
82
|
|
83
|
83
|
// Settings for the trapezoid generator
|
84
|
|
- unsigned long nominal_rate; // The nominal step rate for this block in step_events/sec
|
85
|
|
- unsigned long initial_rate; // The jerk-adjusted step rate at start of block
|
86
|
|
- unsigned long final_rate; // The minimal rate at exit
|
87
|
|
- unsigned long acceleration_steps_per_s2; // acceleration steps/sec^2
|
|
84
|
+ unsigned long nominal_rate, // The nominal step rate for this block in step_events/sec
|
|
85
|
+ initial_rate, // The jerk-adjusted step rate at start of block
|
|
86
|
+ final_rate, // The minimal rate at exit
|
|
87
|
+ acceleration_steps_per_s2; // acceleration steps/sec^2
|
88
|
88
|
|
89
|
89
|
#if FAN_COUNT > 0
|
90
|
90
|
unsigned long fan_speed[FAN_COUNT];
|
91
|
91
|
#endif
|
92
|
92
|
|
93
|
93
|
#if ENABLED(BARICUDA)
|
94
|
|
- unsigned long valve_pressure;
|
95
|
|
- unsigned long e_to_p_pressure;
|
|
94
|
+ unsigned long valve_pressure, e_to_p_pressure;
|
96
|
95
|
#endif
|
97
|
96
|
|
98
|
97
|
volatile char busy;
|