Browse Source

Fix IDEX broken endstop test (#21110)

Scott Lahteine 4 years ago
parent
commit
7e172bf456
No account linked to committer's email address

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp View File

96
       };
96
       };
97
     #endif
97
     #endif
98
 
98
 
99
-    do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * home_dir(Y_AXIS), fr_mm_s);
99
+    do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * Y_HOME_DIR, fr_mm_s);
100
 
100
 
101
     endstops.validate_homing_move();
101
     endstops.validate_homing_move();
102
 
102
 

+ 1
- 1
Marlin/src/module/endstops.h View File

38
   Z4_MIN, Z4_MAX
38
   Z4_MIN, Z4_MAX
39
 };
39
 };
40
 
40
 
41
-#define X_ENDSTOP (X_HOME_DIR < 0 ? X_MIN : X_MAX)
41
+#define X_ENDSTOP (x_home_dir(active_extruder) < 0 ? X_MIN : X_MAX)
42
 #define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX)
42
 #define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX)
43
 #define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX)
43
 #define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX)
44
 
44
 

+ 1
- 1
Marlin/src/module/motion.h View File

450
     FORCE_INLINE void set_duplication_enabled(const bool dupe) { extruder_duplication_enabled = dupe; }
450
     FORCE_INLINE void set_duplication_enabled(const bool dupe) { extruder_duplication_enabled = dupe; }
451
   #endif
451
   #endif
452
 
452
 
453
-  FORCE_INLINE int x_home_dir(const uint8_t) { return home_dir(X_AXIS); }
453
+  FORCE_INLINE int x_home_dir(const uint8_t) { return X_HOME_DIR; }
454
 
454
 
455
 #endif
455
 #endif
456
 
456
 

Loading…
Cancel
Save