Skip to content

Commit e7e3b51

Browse files
desciphermh-dm
authored andcommitted
🐛 Define required endstop enums (MarlinFirmware#23425)
1 parent 6e78fad commit e7e3b51

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

Marlin/src/module/endstops.h

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,26 @@ enum EndstopEnum : char {
4747
_ES_ITEM(HAS_K_MAX, K_MAX)
4848

4949
// Extra Endstops for XYZ
50-
_ES_ITEM(HAS_X2_MIN, X2_MIN)
51-
_ES_ITEM(HAS_X2_MAX, X2_MAX)
52-
_ES_ITEM(HAS_Y2_MIN, Y2_MIN)
53-
_ES_ITEM(HAS_Y2_MAX, Y2_MAX)
54-
_ES_ITEM(HAS_Z2_MIN, Z2_MIN)
55-
_ES_ITEM(HAS_Z2_MAX, Z2_MAX)
56-
_ES_ITEM(HAS_Z3_MIN, Z3_MIN)
57-
_ES_ITEM(HAS_Z3_MAX, Z3_MAX)
58-
_ES_ITEM(HAS_Z4_MIN, Z4_MIN)
59-
_ES_ITEM(HAS_Z4_MAX, Z4_MAX)
50+
#if ENABLED(X_DUAL_ENDSTOPS)
51+
_ES_ITEM(HAS_X_MIN, X2_MIN)
52+
_ES_ITEM(HAS_X_MAX, X2_MAX)
53+
#endif
54+
#if ENABLED(Y_DUAL_ENDSTOPS)
55+
_ES_ITEM(HAS_Y_MIN, Y2_MIN)
56+
_ES_ITEM(HAS_Y_MAX, Y2_MAX)
57+
#endif
58+
#if ENABLED(Z_MULTI_ENDSTOPS)
59+
_ES_ITEM(HAS_Z_MIN, Z2_MIN)
60+
_ES_ITEM(HAS_Z_MAX, Z2_MAX)
61+
#if NUM_Z_STEPPER_DRIVERS >= 3
62+
_ES_ITEM(HAS_Z_MIN, Z3_MIN)
63+
_ES_ITEM(HAS_Z_MAX, Z3_MAX)
64+
#endif
65+
#if NUM_Z_STEPPER_DRIVERS >= 4
66+
_ES_ITEM(HAS_Z_MIN, Z4_MIN)
67+
_ES_ITEM(HAS_Z_MAX, Z4_MAX)
68+
#endif
69+
#endif
6070

6171
// Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
6272
#if !HAS_DELTA_SENSORLESS_PROBING

0 commit comments

Comments
 (0)