|
@@ -448,7 +448,7 @@ volatile bool wait_for_heatup = true;
|
448
|
448
|
|
449
|
449
|
const char errormagic[] PROGMEM = "Error:";
|
450
|
450
|
const char echomagic[] PROGMEM = "echo:";
|
451
|
|
-const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
|
|
451
|
+const char axis_codes[XYZE] = {'X', 'Y', 'Z', 'E'};
|
452
|
452
|
|
453
|
453
|
// Number of characters read in the current line of serial input
|
454
|
454
|
static int serial_count = 0;
|
|
@@ -690,7 +690,7 @@ void get_cartesian_from_steppers();
|
690
|
690
|
void set_current_from_steppers_for_axis(const AxisEnum axis);
|
691
|
691
|
|
692
|
692
|
#if ENABLED(ARC_SUPPORT)
|
693
|
|
- void plan_arc(float target[NUM_AXIS], float* offset, uint8_t clockwise);
|
|
693
|
+ void plan_arc(float target[XYZE], float* offset, uint8_t clockwise);
|
694
|
694
|
#endif
|
695
|
695
|
|
696
|
696
|
#if ENABLED(BEZIER_CURVE_SUPPORT)
|
|
@@ -1333,7 +1333,7 @@ bool get_target_extruder_from_command(int code) {
|
1333
|
1333
|
|
1334
|
1334
|
static float inactive_extruder_x_pos = X2_MAX_POS; // used in mode 0 & 1
|
1335
|
1335
|
static bool active_extruder_parked = false; // used in mode 1 & 2
|
1336
|
|
- static float raised_parked_position[NUM_AXIS]; // used in mode 1
|
|
1336
|
+ static float raised_parked_position[XYZE]; // used in mode 1
|
1337
|
1337
|
static millis_t delayed_move_time = 0; // used in mode 1
|
1338
|
1338
|
static float duplicate_extruder_x_offset = DEFAULT_DUPLICATION_X_OFFSET; // used in mode 2
|
1339
|
1339
|
static float duplicate_extruder_temp_offset = 0; // used in mode 2
|
|
@@ -7581,7 +7581,7 @@ inline void gcode_M503() {
|
7581
|
7581
|
* Report driver currents when no axis specified
|
7582
|
7582
|
*/
|
7583
|
7583
|
inline void gcode_M906() {
|
7584
|
|
- uint16_t values[NUM_AXIS];
|
|
7584
|
+ uint16_t values[XYZE];
|
7585
|
7585
|
LOOP_XYZE(i)
|
7586
|
7586
|
values[i] = code_seen(axis_codes[i]) ? code_value_int() : 0;
|
7587
|
7587
|
|
|
@@ -9499,7 +9499,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
|
9499
|
9499
|
* This calls planner.buffer_line several times, adding
|
9500
|
9500
|
* small incremental moves for DELTA or SCARA.
|
9501
|
9501
|
*/
|
9502
|
|
- inline bool prepare_kinematic_move_to(float ltarget[NUM_AXIS]) {
|
|
9502
|
+ inline bool prepare_kinematic_move_to(float ltarget[XYZE]) {
|
9503
|
9503
|
|
9504
|
9504
|
// Get the top feedrate of the move in the XY plane
|
9505
|
9505
|
float _feedrate_mm_s = MMS_SCALED(feedrate_mm_s);
|
|
@@ -9511,7 +9511,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
|
9511
|
9511
|
}
|
9512
|
9512
|
|
9513
|
9513
|
// Get the cartesian distances moved in XYZE
|
9514
|
|
- float difference[NUM_AXIS];
|
|
9514
|
+ float difference[XYZE];
|
9515
|
9515
|
LOOP_XYZE(i) difference[i] = ltarget[i] - current_position[i];
|
9516
|
9516
|
|
9517
|
9517
|
// Get the linear distance in XYZ
|
|
@@ -9736,7 +9736,7 @@ void prepare_move_to_destination() {
|
9736
|
9736
|
* options for G2/G3 arc generation. In future these options may be GCode tunable.
|
9737
|
9737
|
*/
|
9738
|
9738
|
void plan_arc(
|
9739
|
|
- float logical[NUM_AXIS], // Destination position
|
|
9739
|
+ float logical[XYZE], // Destination position
|
9740
|
9740
|
float* offset, // Center of rotation relative to current_position
|
9741
|
9741
|
uint8_t clockwise // Clockwise?
|
9742
|
9742
|
) {
|