Scott Lahteine
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
Marlin/src/gcode/calibrate/G28.cpp
-
Marlin/src/module/endstops.h
-
Marlin/src/module/motion.h
|
|
@ -96,7 +96,7 @@ |
|
|
}; |
|
|
}; |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * home_dir(Y_AXIS), fr_mm_s); |
|
|
do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * Y_HOME_DIR, fr_mm_s); |
|
|
|
|
|
|
|
|
endstops.validate_homing_move(); |
|
|
endstops.validate_homing_move(); |
|
|
|
|
|
|
|
|
|
|
|
@ -38,7 +38,7 @@ enum EndstopEnum : char { |
|
|
Z4_MIN, Z4_MAX |
|
|
Z4_MIN, Z4_MAX |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
#define X_ENDSTOP (X_HOME_DIR < 0 ? X_MIN : X_MAX) |
|
|
#define X_ENDSTOP (x_home_dir(active_extruder) < 0 ? X_MIN : X_MAX) |
|
|
#define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX) |
|
|
#define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX) |
|
|
#define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX) |
|
|
#define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX) |
|
|
|
|
|
|
|
|
|
|
|
@ -450,7 +450,7 @@ FORCE_INLINE void set_all_unhomed() { axis_homed = axis_tr |
|
|
FORCE_INLINE void set_duplication_enabled(const bool dupe) { extruder_duplication_enabled = dupe; } |
|
|
FORCE_INLINE void set_duplication_enabled(const bool dupe) { extruder_duplication_enabled = dupe; } |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
FORCE_INLINE int x_home_dir(const uint8_t) { return home_dir(X_AXIS); } |
|
|
FORCE_INLINE int x_home_dir(const uint8_t) { return X_HOME_DIR; } |
|
|
|
|
|
|
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
|
