Bladeren bron

📌 'STOP' auto-assign, some Chitu V9 pins (#22889)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
ellensp 3 jaren geleden
bovenliggende
commit
399faa91b9

+ 6
- 0
Marlin/src/core/macros.h Bestand weergeven

33
 
33
 
34
 #define _AXIS(A) (A##_AXIS)
34
 #define _AXIS(A) (A##_AXIS)
35
 
35
 
36
+#define _XSTOP_  0x01
37
+#define _YSTOP_  0x02
38
+#define _ZSTOP_  0x03
39
+#define _ISTOP_  0x04
40
+#define _JSTOP_  0x05
41
+#define _KSTOP_  0x06
36
 #define _XMIN_   0x11
42
 #define _XMIN_   0x11
37
 #define _YMIN_   0x12
43
 #define _YMIN_   0x12
38
 #define _ZMIN_   0x13
44
 #define _ZMIN_   0x13

+ 65
- 5
Marlin/src/inc/Conditionals_post.h Bestand weergeven

769
         #define X2_MAX_ENDSTOP_INVERTING false
769
         #define X2_MAX_ENDSTOP_INVERTING false
770
       #endif
770
       #endif
771
     #endif
771
     #endif
772
-    #ifndef X2_MAX_PIN
772
+    #if !defined(X2_MAX_PIN) && !defined(X2_STOP_PIN)
773
       #if X2_USE_ENDSTOP == _XMIN_
773
       #if X2_USE_ENDSTOP == _XMIN_
774
         #define X2_MAX_PIN X_MIN_PIN
774
         #define X2_MAX_PIN X_MIN_PIN
775
       #elif X2_USE_ENDSTOP == _XMAX_
775
       #elif X2_USE_ENDSTOP == _XMAX_
776
         #define X2_MAX_PIN X_MAX_PIN
776
         #define X2_MAX_PIN X_MAX_PIN
777
+      #elif X2_USE_ENDSTOP == _XSTOP_
778
+        #define X2_MAX_PIN X_STOP_PIN
777
       #elif X2_USE_ENDSTOP == _YMIN_
779
       #elif X2_USE_ENDSTOP == _YMIN_
778
         #define X2_MAX_PIN Y_MIN_PIN
780
         #define X2_MAX_PIN Y_MIN_PIN
779
       #elif X2_USE_ENDSTOP == _YMAX_
781
       #elif X2_USE_ENDSTOP == _YMAX_
780
         #define X2_MAX_PIN Y_MAX_PIN
782
         #define X2_MAX_PIN Y_MAX_PIN
783
+      #elif X2_USE_ENDSTOP == _YSTOP_
784
+        #define X2_MAX_PIN Y_STOP_PIN
781
       #elif X2_USE_ENDSTOP == _ZMIN_
785
       #elif X2_USE_ENDSTOP == _ZMIN_
782
         #define X2_MAX_PIN Z_MIN_PIN
786
         #define X2_MAX_PIN Z_MIN_PIN
783
       #elif X2_USE_ENDSTOP == _ZMAX_
787
       #elif X2_USE_ENDSTOP == _ZMAX_
784
         #define X2_MAX_PIN Z_MAX_PIN
788
         #define X2_MAX_PIN Z_MAX_PIN
789
+      #elif X2_USE_ENDSTOP == _ZSTOP_
790
+        #define X2_MAX_PIN Z_STOP_PIN
785
       #elif X2_USE_ENDSTOP == _XDIAG_
791
       #elif X2_USE_ENDSTOP == _XDIAG_
786
         #define X2_MAX_PIN X_DIAG_PIN
792
         #define X2_MAX_PIN X_DIAG_PIN
787
       #elif X2_USE_ENDSTOP == _YDIAG_
793
       #elif X2_USE_ENDSTOP == _YDIAG_
827
         #define X2_MIN_ENDSTOP_INVERTING false
833
         #define X2_MIN_ENDSTOP_INVERTING false
828
       #endif
834
       #endif
829
     #endif
835
     #endif
830
-    #ifndef X2_MIN_PIN
836
+    #if !defined(X2_MIN_PIN) && !defined(X2_STOP_PIN)
831
       #if X2_USE_ENDSTOP == _XMIN_
837
       #if X2_USE_ENDSTOP == _XMIN_
832
         #define X2_MIN_PIN X_MIN_PIN
838
         #define X2_MIN_PIN X_MIN_PIN
833
       #elif X2_USE_ENDSTOP == _XMAX_
839
       #elif X2_USE_ENDSTOP == _XMAX_
834
         #define X2_MIN_PIN X_MAX_PIN
840
         #define X2_MIN_PIN X_MAX_PIN
841
+      #elif X2_USE_ENDSTOP == _XSTOP_
842
+        #define X2_MIN_PIN X_STOP_PIN
835
       #elif X2_USE_ENDSTOP == _YMIN_
843
       #elif X2_USE_ENDSTOP == _YMIN_
836
         #define X2_MIN_PIN Y_MIN_PIN
844
         #define X2_MIN_PIN Y_MIN_PIN
837
       #elif X2_USE_ENDSTOP == _YMAX_
845
       #elif X2_USE_ENDSTOP == _YMAX_
838
         #define X2_MIN_PIN Y_MAX_PIN
846
         #define X2_MIN_PIN Y_MAX_PIN
847
+      #elif X2_USE_ENDSTOP == _YSTOP_
848
+        #define X2_MIN_PIN Y_STOP_PIN
839
       #elif X2_USE_ENDSTOP == _ZMIN_
849
       #elif X2_USE_ENDSTOP == _ZMIN_
840
         #define X2_MIN_PIN Z_MIN_PIN
850
         #define X2_MIN_PIN Z_MIN_PIN
841
       #elif X2_USE_ENDSTOP == _ZMAX_
851
       #elif X2_USE_ENDSTOP == _ZMAX_
842
         #define X2_MIN_PIN Z_MAX_PIN
852
         #define X2_MIN_PIN Z_MAX_PIN
853
+      #elif X2_USE_ENDSTOP == _ZSTOP_
854
+        #define X2_MIN_PIN Z_STOP_PIN
843
       #elif X2_USE_ENDSTOP == _XDIAG_
855
       #elif X2_USE_ENDSTOP == _XDIAG_
844
         #define X2_MIN_PIN X_DIAG_PIN
856
         #define X2_MIN_PIN X_DIAG_PIN
845
       #elif X2_USE_ENDSTOP == _YDIAG_
857
       #elif X2_USE_ENDSTOP == _YDIAG_
892
         #define Y2_MAX_ENDSTOP_INVERTING false
904
         #define Y2_MAX_ENDSTOP_INVERTING false
893
       #endif
905
       #endif
894
     #endif
906
     #endif
895
-    #ifndef Y2_MAX_PIN
907
+    #if !defined(Y2_MAX_PIN) && !defined(Y2_STOP_PIN)
896
       #if Y2_USE_ENDSTOP == _XMIN_
908
       #if Y2_USE_ENDSTOP == _XMIN_
897
         #define Y2_MAX_PIN X_MIN_PIN
909
         #define Y2_MAX_PIN X_MIN_PIN
898
       #elif Y2_USE_ENDSTOP == _XMAX_
910
       #elif Y2_USE_ENDSTOP == _XMAX_
899
         #define Y2_MAX_PIN X_MAX_PIN
911
         #define Y2_MAX_PIN X_MAX_PIN
912
+      #elif Y2_USE_ENDSTOP == _XSTOP_
913
+        #define Y2_MAX_PIN X_STOP_PIN
900
       #elif Y2_USE_ENDSTOP == _YMIN_
914
       #elif Y2_USE_ENDSTOP == _YMIN_
901
         #define Y2_MAX_PIN Y_MIN_PIN
915
         #define Y2_MAX_PIN Y_MIN_PIN
902
       #elif Y2_USE_ENDSTOP == _YMAX_
916
       #elif Y2_USE_ENDSTOP == _YMAX_
903
         #define Y2_MAX_PIN Y_MAX_PIN
917
         #define Y2_MAX_PIN Y_MAX_PIN
918
+      #elif Y2_USE_ENDSTOP == _YSTOP_
919
+        #define Y2_MAX_PIN Y_STOP_PIN
904
       #elif Y2_USE_ENDSTOP == _ZMIN_
920
       #elif Y2_USE_ENDSTOP == _ZMIN_
905
         #define Y2_MAX_PIN Z_MIN_PIN
921
         #define Y2_MAX_PIN Z_MIN_PIN
906
       #elif Y2_USE_ENDSTOP == _ZMAX_
922
       #elif Y2_USE_ENDSTOP == _ZMAX_
907
         #define Y2_MAX_PIN Z_MAX_PIN
923
         #define Y2_MAX_PIN Z_MAX_PIN
924
+      #elif Y2_USE_ENDSTOP == _ZSTOP_
925
+        #define Y2_MAX_PIN Z_STOP_PIN
908
       #elif Y2_USE_ENDSTOP == _XDIAG_
926
       #elif Y2_USE_ENDSTOP == _XDIAG_
909
         #define Y2_MAX_PIN X_DIAG_PIN
927
         #define Y2_MAX_PIN X_DIAG_PIN
910
       #elif Y2_USE_ENDSTOP == _YDIAG_
928
       #elif Y2_USE_ENDSTOP == _YDIAG_
950
         #define Y2_MIN_ENDSTOP_INVERTING false
968
         #define Y2_MIN_ENDSTOP_INVERTING false
951
       #endif
969
       #endif
952
     #endif
970
     #endif
953
-    #ifndef Y2_MIN_PIN
971
+    #if !defined(Y2_MIN_PIN) && !defined(Y2_STOP_PIN)
954
       #if Y2_USE_ENDSTOP == _XMIN_
972
       #if Y2_USE_ENDSTOP == _XMIN_
955
         #define Y2_MIN_PIN X_MIN_PIN
973
         #define Y2_MIN_PIN X_MIN_PIN
956
       #elif Y2_USE_ENDSTOP == _XMAX_
974
       #elif Y2_USE_ENDSTOP == _XMAX_
957
         #define Y2_MIN_PIN X_MAX_PIN
975
         #define Y2_MIN_PIN X_MAX_PIN
976
+      #elif Y2_USE_ENDSTOP == _XSTOP_
977
+        #define Y2_MIN_PIN X_STOP_PIN
958
       #elif Y2_USE_ENDSTOP == _YMIN_
978
       #elif Y2_USE_ENDSTOP == _YMIN_
959
         #define Y2_MIN_PIN Y_MIN_PIN
979
         #define Y2_MIN_PIN Y_MIN_PIN
960
       #elif Y2_USE_ENDSTOP == _YMAX_
980
       #elif Y2_USE_ENDSTOP == _YMAX_
961
         #define Y2_MIN_PIN Y_MAX_PIN
981
         #define Y2_MIN_PIN Y_MAX_PIN
982
+      #elif Y2_USE_ENDSTOP == _YSTOP_
983
+        #define Y2_MIN_PIN Y_STOP_PIN
962
       #elif Y2_USE_ENDSTOP == _ZMIN_
984
       #elif Y2_USE_ENDSTOP == _ZMIN_
963
         #define Y2_MIN_PIN Z_MIN_PIN
985
         #define Y2_MIN_PIN Z_MIN_PIN
964
       #elif Y2_USE_ENDSTOP == _ZMAX_
986
       #elif Y2_USE_ENDSTOP == _ZMAX_
965
         #define Y2_MIN_PIN Z_MAX_PIN
987
         #define Y2_MIN_PIN Z_MAX_PIN
988
+      #elif Y2_USE_ENDSTOP == _ZSTOP_
989
+        #define Y2_MIN_PIN Z_STOP_PIN
966
       #elif Y2_USE_ENDSTOP == _XDIAG_
990
       #elif Y2_USE_ENDSTOP == _XDIAG_
967
         #define Y2_MIN_PIN X_DIAG_PIN
991
         #define Y2_MIN_PIN X_DIAG_PIN
968
       #elif Y2_USE_ENDSTOP == _YDIAG_
992
       #elif Y2_USE_ENDSTOP == _YDIAG_
1016
         #define Z2_MAX_ENDSTOP_INVERTING false
1040
         #define Z2_MAX_ENDSTOP_INVERTING false
1017
       #endif
1041
       #endif
1018
     #endif
1042
     #endif
1019
-    #ifndef Z2_MAX_PIN
1043
+    #if !defined(Z2_MAX_PIN) && !defined(Z2_STOP_PIN)
1020
       #if Z2_USE_ENDSTOP == _XMIN_
1044
       #if Z2_USE_ENDSTOP == _XMIN_
1021
         #define Z2_MAX_PIN X_MIN_PIN
1045
         #define Z2_MAX_PIN X_MIN_PIN
1022
       #elif Z2_USE_ENDSTOP == _XMAX_
1046
       #elif Z2_USE_ENDSTOP == _XMAX_
1023
         #define Z2_MAX_PIN X_MAX_PIN
1047
         #define Z2_MAX_PIN X_MAX_PIN
1048
+      #elif Z2_USE_ENDSTOP == _XSTOP_
1049
+        #define Z2_MAX_PIN X_STOP_PIN
1024
       #elif Z2_USE_ENDSTOP == _YMIN_
1050
       #elif Z2_USE_ENDSTOP == _YMIN_
1025
         #define Z2_MAX_PIN Y_MIN_PIN
1051
         #define Z2_MAX_PIN Y_MIN_PIN
1026
       #elif Z2_USE_ENDSTOP == _YMAX_
1052
       #elif Z2_USE_ENDSTOP == _YMAX_
1027
         #define Z2_MAX_PIN Y_MAX_PIN
1053
         #define Z2_MAX_PIN Y_MAX_PIN
1054
+      #elif Z2_USE_ENDSTOP == _YSTOP_
1055
+        #define Z2_MAX_PIN Y_STOP_PIN
1028
       #elif Z2_USE_ENDSTOP == _ZMIN_
1056
       #elif Z2_USE_ENDSTOP == _ZMIN_
1029
         #define Z2_MAX_PIN Z_MIN_PIN
1057
         #define Z2_MAX_PIN Z_MIN_PIN
1030
       #elif Z2_USE_ENDSTOP == _ZMAX_
1058
       #elif Z2_USE_ENDSTOP == _ZMAX_
1031
         #define Z2_MAX_PIN Z_MAX_PIN
1059
         #define Z2_MAX_PIN Z_MAX_PIN
1060
+      #elif Z2_USE_ENDSTOP == _ZSTOP_
1061
+        #define Z2_MAX_PIN Z_STOP_PIN
1032
       #elif Z2_USE_ENDSTOP == _XDIAG_
1062
       #elif Z2_USE_ENDSTOP == _XDIAG_
1033
         #define Z2_MAX_PIN X_DIAG_PIN
1063
         #define Z2_MAX_PIN X_DIAG_PIN
1034
       #elif Z2_USE_ENDSTOP == _YDIAG_
1064
       #elif Z2_USE_ENDSTOP == _YDIAG_
1079
         #define Z2_MIN_PIN X_MIN_PIN
1109
         #define Z2_MIN_PIN X_MIN_PIN
1080
       #elif Z2_USE_ENDSTOP == _XMAX_
1110
       #elif Z2_USE_ENDSTOP == _XMAX_
1081
         #define Z2_MIN_PIN X_MAX_PIN
1111
         #define Z2_MIN_PIN X_MAX_PIN
1112
+      #elif Z2_USE_ENDSTOP == _XSTOP_
1113
+        #define Z2_MIN_PIN X_STOP_PIN
1082
       #elif Z2_USE_ENDSTOP == _YMIN_
1114
       #elif Z2_USE_ENDSTOP == _YMIN_
1083
         #define Z2_MIN_PIN Y_MIN_PIN
1115
         #define Z2_MIN_PIN Y_MIN_PIN
1084
       #elif Z2_USE_ENDSTOP == _YMAX_
1116
       #elif Z2_USE_ENDSTOP == _YMAX_
1085
         #define Z2_MIN_PIN Y_MAX_PIN
1117
         #define Z2_MIN_PIN Y_MAX_PIN
1118
+      #elif Z2_USE_ENDSTOP == _YSTOP_
1119
+        #define Z2_MIN_PIN Y_STOP_PIN
1086
       #elif Z2_USE_ENDSTOP == _ZMIN_
1120
       #elif Z2_USE_ENDSTOP == _ZMIN_
1087
         #define Z2_MIN_PIN Z_MIN_PIN
1121
         #define Z2_MIN_PIN Z_MIN_PIN
1088
       #elif Z2_USE_ENDSTOP == _ZMAX_
1122
       #elif Z2_USE_ENDSTOP == _ZMAX_
1089
         #define Z2_MIN_PIN Z_MAX_PIN
1123
         #define Z2_MIN_PIN Z_MAX_PIN
1124
+      #elif Z2_USE_ENDSTOP == _ZSTOP_
1125
+        #define Z2_MIN_PIN Z_STOP_PIN
1090
       #elif Z2_USE_ENDSTOP == _XDIAG_
1126
       #elif Z2_USE_ENDSTOP == _XDIAG_
1091
         #define Z2_MIN_PIN X_DIAG_PIN
1127
         #define Z2_MIN_PIN X_DIAG_PIN
1092
       #elif Z2_USE_ENDSTOP == _YDIAG_
1128
       #elif Z2_USE_ENDSTOP == _YDIAG_
1140
           #define Z3_MAX_PIN X_MIN_PIN
1176
           #define Z3_MAX_PIN X_MIN_PIN
1141
         #elif Z3_USE_ENDSTOP == _XMAX_
1177
         #elif Z3_USE_ENDSTOP == _XMAX_
1142
           #define Z3_MAX_PIN X_MAX_PIN
1178
           #define Z3_MAX_PIN X_MAX_PIN
1179
+        #elif Z3_USE_ENDSTOP == _XSTOP_
1180
+          #define Z3_MAX_PIN X_STOP_PIN
1143
         #elif Z3_USE_ENDSTOP == _YMIN_
1181
         #elif Z3_USE_ENDSTOP == _YMIN_
1144
           #define Z3_MAX_PIN Y_MIN_PIN
1182
           #define Z3_MAX_PIN Y_MIN_PIN
1145
         #elif Z3_USE_ENDSTOP == _YMAX_
1183
         #elif Z3_USE_ENDSTOP == _YMAX_
1146
           #define Z3_MAX_PIN Y_MAX_PIN
1184
           #define Z3_MAX_PIN Y_MAX_PIN
1185
+        #elif Z3_USE_ENDSTOP == _YSTOP_
1186
+          #define Z3_MAX_PIN Y_STOP_PIN
1147
         #elif Z3_USE_ENDSTOP == _ZMIN_
1187
         #elif Z3_USE_ENDSTOP == _ZMIN_
1148
           #define Z3_MAX_PIN Z_MIN_PIN
1188
           #define Z3_MAX_PIN Z_MIN_PIN
1149
         #elif Z3_USE_ENDSTOP == _ZMAX_
1189
         #elif Z3_USE_ENDSTOP == _ZMAX_
1150
           #define Z3_MAX_PIN Z_MAX_PIN
1190
           #define Z3_MAX_PIN Z_MAX_PIN
1191
+        #elif Z3_USE_ENDSTOP == _ZSTOP_
1192
+          #define Z3_MAX_PIN Z_STOP_PIN
1151
         #elif Z3_USE_ENDSTOP == _XDIAG_
1193
         #elif Z3_USE_ENDSTOP == _XDIAG_
1152
           #define Z3_MAX_PIN X_DIAG_PIN
1194
           #define Z3_MAX_PIN X_DIAG_PIN
1153
         #elif Z3_USE_ENDSTOP == _YDIAG_
1195
         #elif Z3_USE_ENDSTOP == _YDIAG_
1198
           #define Z3_MIN_PIN X_MIN_PIN
1240
           #define Z3_MIN_PIN X_MIN_PIN
1199
         #elif Z3_USE_ENDSTOP == _XMAX_
1241
         #elif Z3_USE_ENDSTOP == _XMAX_
1200
           #define Z3_MIN_PIN X_MAX_PIN
1242
           #define Z3_MIN_PIN X_MAX_PIN
1243
+        #elif Z3_USE_ENDSTOP == _XSTOP_
1244
+          #define Z3_MIN_PIN X_STOP_PIN
1201
         #elif Z3_USE_ENDSTOP == _YMIN_
1245
         #elif Z3_USE_ENDSTOP == _YMIN_
1202
           #define Z3_MIN_PIN Y_MIN_PIN
1246
           #define Z3_MIN_PIN Y_MIN_PIN
1203
         #elif Z3_USE_ENDSTOP == _YMAX_
1247
         #elif Z3_USE_ENDSTOP == _YMAX_
1204
           #define Z3_MIN_PIN Y_MAX_PIN
1248
           #define Z3_MIN_PIN Y_MAX_PIN
1249
+        #elif Z3_USE_ENDSTOP == _YSTOP_
1250
+          #define Z3_MIN_PIN Y_STOP_PIN
1205
         #elif Z3_USE_ENDSTOP == _ZMIN_
1251
         #elif Z3_USE_ENDSTOP == _ZMIN_
1206
           #define Z3_MIN_PIN Z_MIN_PIN
1252
           #define Z3_MIN_PIN Z_MIN_PIN
1207
         #elif Z3_USE_ENDSTOP == _ZMAX_
1253
         #elif Z3_USE_ENDSTOP == _ZMAX_
1208
           #define Z3_MIN_PIN Z_MAX_PIN
1254
           #define Z3_MIN_PIN Z_MAX_PIN
1255
+        #elif Z3_USE_ENDSTOP == _ZSTOP_
1256
+          #define Z3_MIN_PIN Z_STOP_PIN
1209
         #elif Z3_USE_ENDSTOP == _XDIAG_
1257
         #elif Z3_USE_ENDSTOP == _XDIAG_
1210
           #define Z3_MIN_PIN X_DIAG_PIN
1258
           #define Z3_MIN_PIN X_DIAG_PIN
1211
         #elif Z3_USE_ENDSTOP == _YDIAG_
1259
         #elif Z3_USE_ENDSTOP == _YDIAG_
1260
           #define Z4_MAX_PIN X_MIN_PIN
1308
           #define Z4_MAX_PIN X_MIN_PIN
1261
         #elif Z4_USE_ENDSTOP == _XMAX_
1309
         #elif Z4_USE_ENDSTOP == _XMAX_
1262
           #define Z4_MAX_PIN X_MAX_PIN
1310
           #define Z4_MAX_PIN X_MAX_PIN
1311
+        #elif Z4_USE_ENDSTOP == _XSTOP_
1312
+          #define Z4_MAX_PIN X_STOP_PIN
1263
         #elif Z4_USE_ENDSTOP == _YMIN_
1313
         #elif Z4_USE_ENDSTOP == _YMIN_
1264
           #define Z4_MAX_PIN Y_MIN_PIN
1314
           #define Z4_MAX_PIN Y_MIN_PIN
1265
         #elif Z4_USE_ENDSTOP == _YMAX_
1315
         #elif Z4_USE_ENDSTOP == _YMAX_
1266
           #define Z4_MAX_PIN Y_MAX_PIN
1316
           #define Z4_MAX_PIN Y_MAX_PIN
1317
+        #elif Z4_USE_ENDSTOP == _YSTOP_
1318
+          #define Z4_MAX_PIN Y_STOP_PIN
1267
         #elif Z4_USE_ENDSTOP == _ZMIN_
1319
         #elif Z4_USE_ENDSTOP == _ZMIN_
1268
           #define Z4_MAX_PIN Z_MIN_PIN
1320
           #define Z4_MAX_PIN Z_MIN_PIN
1269
         #elif Z4_USE_ENDSTOP == _ZMAX_
1321
         #elif Z4_USE_ENDSTOP == _ZMAX_
1270
           #define Z4_MAX_PIN Z_MAX_PIN
1322
           #define Z4_MAX_PIN Z_MAX_PIN
1323
+        #elif Z4_USE_ENDSTOP == _ZSTOP_
1324
+          #define Z4_MAX_PIN Z_STOP_PIN
1271
         #elif Z4_USE_ENDSTOP == _XDIAG_
1325
         #elif Z4_USE_ENDSTOP == _XDIAG_
1272
           #define Z4_MAX_PIN X_DIAG_PIN
1326
           #define Z4_MAX_PIN X_DIAG_PIN
1273
         #elif Z4_USE_ENDSTOP == _YDIAG_
1327
         #elif Z4_USE_ENDSTOP == _YDIAG_
1318
           #define Z4_MIN_PIN X_MIN_PIN
1372
           #define Z4_MIN_PIN X_MIN_PIN
1319
         #elif Z4_USE_ENDSTOP == _XMAX_
1373
         #elif Z4_USE_ENDSTOP == _XMAX_
1320
           #define Z4_MIN_PIN X_MAX_PIN
1374
           #define Z4_MIN_PIN X_MAX_PIN
1375
+        #elif Z4_USE_ENDSTOP == _XSTOP_
1376
+          #define Z4_MIN_PIN X_STOP_PIN
1321
         #elif Z4_USE_ENDSTOP == _YMIN_
1377
         #elif Z4_USE_ENDSTOP == _YMIN_
1322
           #define Z4_MIN_PIN Y_MIN_PIN
1378
           #define Z4_MIN_PIN Y_MIN_PIN
1323
         #elif Z4_USE_ENDSTOP == _YMAX_
1379
         #elif Z4_USE_ENDSTOP == _YMAX_
1324
           #define Z4_MIN_PIN Y_MAX_PIN
1380
           #define Z4_MIN_PIN Y_MAX_PIN
1381
+        #elif Z4_USE_ENDSTOP == _YSTOP_
1382
+          #define Z4_MIN_PIN Y_STOP_PIN
1325
         #elif Z4_USE_ENDSTOP == _ZMIN_
1383
         #elif Z4_USE_ENDSTOP == _ZMIN_
1326
           #define Z4_MIN_PIN Z_MIN_PIN
1384
           #define Z4_MIN_PIN Z_MIN_PIN
1327
         #elif Z4_USE_ENDSTOP == _ZMAX_
1385
         #elif Z4_USE_ENDSTOP == _ZMAX_
1328
           #define Z4_MIN_PIN Z_MAX_PIN
1386
           #define Z4_MIN_PIN Z_MAX_PIN
1387
+        #elif Z4_USE_ENDSTOP == _ZSTOP_
1388
+          #define Z4_MIN_PIN Z_STOP_PIN
1329
         #elif Z4_USE_ENDSTOP == _XDIAG_
1389
         #elif Z4_USE_ENDSTOP == _XDIAG_
1330
           #define Z4_MIN_PIN X_DIAG_PIN
1390
           #define Z4_MIN_PIN X_DIAG_PIN
1331
         #elif Z4_USE_ENDSTOP == _YDIAG_
1391
         #elif Z4_USE_ENDSTOP == _YDIAG_

+ 48
- 0
Marlin/src/inc/Warnings.cpp Bestand weergeven

79
     #warning "Auto-assigned X2_DIAG_PIN to X_MIN_PIN."
79
     #warning "Auto-assigned X2_DIAG_PIN to X_MIN_PIN."
80
   #elif X2_USE_ENDSTOP == _XMAX_
80
   #elif X2_USE_ENDSTOP == _XMAX_
81
     #warning "Auto-assigned X2_DIAG_PIN to X_MAX_PIN."
81
     #warning "Auto-assigned X2_DIAG_PIN to X_MAX_PIN."
82
+  #elif X2_USE_ENDSTOP == _XSTOP_
83
+    #warning "Auto-assigned X2_DIAG_PIN to X_STOP_PIN."
82
   #elif X2_USE_ENDSTOP == _YMIN_
84
   #elif X2_USE_ENDSTOP == _YMIN_
83
     #warning "Auto-assigned X2_DIAG_PIN to Y_MIN_PIN."
85
     #warning "Auto-assigned X2_DIAG_PIN to Y_MIN_PIN."
84
   #elif X2_USE_ENDSTOP == _YMAX_
86
   #elif X2_USE_ENDSTOP == _YMAX_
85
     #warning "Auto-assigned X2_DIAG_PIN to Y_MAX_PIN."
87
     #warning "Auto-assigned X2_DIAG_PIN to Y_MAX_PIN."
88
+  #elif X2_USE_ENDSTOP == _YSTOP_
89
+    #warning "Auto-assigned X2_DIAG_PIN to Y_STOP_PIN."
86
   #elif X2_USE_ENDSTOP == _ZMIN_
90
   #elif X2_USE_ENDSTOP == _ZMIN_
87
     #warning "Auto-assigned X2_DIAG_PIN to Z_MIN_PIN."
91
     #warning "Auto-assigned X2_DIAG_PIN to Z_MIN_PIN."
88
   #elif X2_USE_ENDSTOP == _ZMAX_
92
   #elif X2_USE_ENDSTOP == _ZMAX_
89
     #warning "Auto-assigned X2_DIAG_PIN to Z_MAX_PIN."
93
     #warning "Auto-assigned X2_DIAG_PIN to Z_MAX_PIN."
94
+  #elif X2_USE_ENDSTOP == _ZSTOP_
95
+    #warning "Auto-assigned X2_DIAG_PIN to Z_STOP_PIN."
90
   #elif X2_USE_ENDSTOP == _XDIAG_
96
   #elif X2_USE_ENDSTOP == _XDIAG_
91
     #warning "Auto-assigned X2_DIAG_PIN to X_DIAG_PIN."
97
     #warning "Auto-assigned X2_DIAG_PIN to X_DIAG_PIN."
92
   #elif X2_USE_ENDSTOP == _YDIAG_
98
   #elif X2_USE_ENDSTOP == _YDIAG_
131
     #warning "Auto-assigned Y2_DIAG_PIN to X_MIN_PIN."
137
     #warning "Auto-assigned Y2_DIAG_PIN to X_MIN_PIN."
132
   #elif Y2_USE_ENDSTOP == _XMAX_
138
   #elif Y2_USE_ENDSTOP == _XMAX_
133
     #warning "Auto-assigned Y2_DIAG_PIN to X_MAX_PIN."
139
     #warning "Auto-assigned Y2_DIAG_PIN to X_MAX_PIN."
140
+  #elif Y2_USE_ENDSTOP == _XSTOP_
141
+    #warning "Auto-assigned Y2_DIAG_PIN to X_STOP_PIN."
134
   #elif Y2_USE_ENDSTOP == _YMIN_
142
   #elif Y2_USE_ENDSTOP == _YMIN_
135
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN."
143
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN."
136
   #elif Y2_USE_ENDSTOP == _YMAX_
144
   #elif Y2_USE_ENDSTOP == _YMAX_
137
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN."
145
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN."
146
+  #elif Y2_USE_ENDSTOP == _YSTOP_
147
+    #warning "Auto-assigned Y2_DIAG_PIN to Y_STOP_PIN."
138
   #elif Y2_USE_ENDSTOP == _ZMIN_
148
   #elif Y2_USE_ENDSTOP == _ZMIN_
139
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN."
149
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN."
140
   #elif Y2_USE_ENDSTOP == _ZMAX_
150
   #elif Y2_USE_ENDSTOP == _ZMAX_
141
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN."
151
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN."
152
+  #elif Y2_USE_ENDSTOP == _ZSTOP_
153
+    #warning "Auto-assigned Y2_DIAG_PIN to Z_STOP_PIN."
142
   #elif Y2_USE_ENDSTOP == _XDIAG_
154
   #elif Y2_USE_ENDSTOP == _XDIAG_
143
     #warning "Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN."
155
     #warning "Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN."
144
   #elif Y2_USE_ENDSTOP == _YDIAG_
156
   #elif Y2_USE_ENDSTOP == _YDIAG_
183
     #warning "Auto-assigned Z2_DIAG_PIN to X_MIN_PIN."
195
     #warning "Auto-assigned Z2_DIAG_PIN to X_MIN_PIN."
184
   #elif Z2_USE_ENDSTOP == _XMAX_
196
   #elif Z2_USE_ENDSTOP == _XMAX_
185
     #warning "Auto-assigned Z2_DIAG_PIN to X_MAX_PIN."
197
     #warning "Auto-assigned Z2_DIAG_PIN to X_MAX_PIN."
198
+  #elif Z2_USE_ENDSTOP == _XSTOP_
199
+    #warning "Auto-assigned Z2_DIAG_PIN to X_STOP_PIN."
186
   #elif Z2_USE_ENDSTOP == _YMIN_
200
   #elif Z2_USE_ENDSTOP == _YMIN_
187
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN."
201
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN."
188
   #elif Z2_USE_ENDSTOP == _YMAX_
202
   #elif Z2_USE_ENDSTOP == _YMAX_
189
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN."
203
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN."
204
+  #elif Z2_USE_ENDSTOP == _YSTOP_
205
+    #warning "Auto-assigned Z2_DIAG_PIN to Y_STOP_PIN."
190
   #elif Z2_USE_ENDSTOP == _ZMIN_
206
   #elif Z2_USE_ENDSTOP == _ZMIN_
191
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN."
207
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN."
192
   #elif Z2_USE_ENDSTOP == _ZMAX_
208
   #elif Z2_USE_ENDSTOP == _ZMAX_
193
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN."
209
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN."
210
+  #elif Z2_USE_ENDSTOP == _ZSTOP_
211
+    #warning "Auto-assigned Z2_DIAG_PIN to Z_STOP_PIN."
194
   #elif Z2_USE_ENDSTOP == _XDIAG_
212
   #elif Z2_USE_ENDSTOP == _XDIAG_
195
     #warning "Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN."
213
     #warning "Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN."
196
   #elif Z2_USE_ENDSTOP == _YDIAG_
214
   #elif Z2_USE_ENDSTOP == _YDIAG_
235
     #warning "Auto-assigned Z3_DIAG_PIN to X_MIN_PIN."
253
     #warning "Auto-assigned Z3_DIAG_PIN to X_MIN_PIN."
236
   #elif Z3_USE_ENDSTOP == _XMAX_
254
   #elif Z3_USE_ENDSTOP == _XMAX_
237
     #warning "Auto-assigned Z3_DIAG_PIN to X_MAX_PIN."
255
     #warning "Auto-assigned Z3_DIAG_PIN to X_MAX_PIN."
256
+  #elif Z3_USE_ENDSTOP == _XSTOP_
257
+    #warning "Auto-assigned Z3_DIAG_PIN to X_STOP_PIN."
238
   #elif Z3_USE_ENDSTOP == _YMIN_
258
   #elif Z3_USE_ENDSTOP == _YMIN_
239
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN."
259
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN."
240
   #elif Z3_USE_ENDSTOP == _YMAX_
260
   #elif Z3_USE_ENDSTOP == _YMAX_
241
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN."
261
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN."
262
+  #elif Z3_USE_ENDSTOP == _YSTOP_
263
+    #warning "Auto-assigned Z3_DIAG_PIN to Y_STOP_PIN."
242
   #elif Z3_USE_ENDSTOP == _ZMIN_
264
   #elif Z3_USE_ENDSTOP == _ZMIN_
243
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN."
265
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN."
244
   #elif Z3_USE_ENDSTOP == _ZMAX_
266
   #elif Z3_USE_ENDSTOP == _ZMAX_
245
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN."
267
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN."
268
+  #elif Z3_USE_ENDSTOP == _ZSTOP_
269
+    #warning "Auto-assigned Z3_DIAG_PIN to Z_STOP_PIN."
246
   #elif Z3_USE_ENDSTOP == _XDIAG_
270
   #elif Z3_USE_ENDSTOP == _XDIAG_
247
     #warning "Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN."
271
     #warning "Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN."
248
   #elif Z3_USE_ENDSTOP == _YDIAG_
272
   #elif Z3_USE_ENDSTOP == _YDIAG_
287
     #warning "Auto-assigned Z4_DIAG_PIN to X_MIN_PIN."
311
     #warning "Auto-assigned Z4_DIAG_PIN to X_MIN_PIN."
288
   #elif Z4_USE_ENDSTOP == _XMAX_
312
   #elif Z4_USE_ENDSTOP == _XMAX_
289
     #warning "Auto-assigned Z4_DIAG_PIN to X_MAX_PIN."
313
     #warning "Auto-assigned Z4_DIAG_PIN to X_MAX_PIN."
314
+  #elif Z4_USE_ENDSTOP == _XSTOP_
315
+    #warning "Auto-assigned Z4_DIAG_PIN to X_STOP_PIN."
290
   #elif Z4_USE_ENDSTOP == _YMIN_
316
   #elif Z4_USE_ENDSTOP == _YMIN_
291
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN."
317
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN."
292
   #elif Z4_USE_ENDSTOP == _YMAX_
318
   #elif Z4_USE_ENDSTOP == _YMAX_
293
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN."
319
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN."
320
+  #elif Z4_USE_ENDSTOP == _YSTOP_
321
+    #warning "Auto-assigned Z4_DIAG_PIN to Y_STOP_PIN."
294
   #elif Z4_USE_ENDSTOP == _ZMIN_
322
   #elif Z4_USE_ENDSTOP == _ZMIN_
295
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN."
323
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN."
296
   #elif Z4_USE_ENDSTOP == _ZMAX_
324
   #elif Z4_USE_ENDSTOP == _ZMAX_
297
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN."
325
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN."
326
+  #elif Z4_USE_ENDSTOP == _ZSTOP_
327
+    #warning "Auto-assigned Z4_DIAG_PIN to Z_STOP_PIN."
298
   #elif Z4_USE_ENDSTOP == _XDIAG_
328
   #elif Z4_USE_ENDSTOP == _XDIAG_
299
     #warning "Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN."
329
     #warning "Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN."
300
   #elif Z4_USE_ENDSTOP == _YDIAG_
330
   #elif Z4_USE_ENDSTOP == _YDIAG_
339
     #warning "Auto-assigned I_DIAG_PIN to X_MIN_PIN."
369
     #warning "Auto-assigned I_DIAG_PIN to X_MIN_PIN."
340
   #elif I_USE_ENDSTOP == _XMAX_
370
   #elif I_USE_ENDSTOP == _XMAX_
341
     #warning "Auto-assigned I_DIAG_PIN to X_MAX_PIN."
371
     #warning "Auto-assigned I_DIAG_PIN to X_MAX_PIN."
372
+  #elif I_USE_ENDSTOP == _XSTOP_
373
+    #warning "Auto-assigned I_DIAG_PIN to X_STOP_PIN."
342
   #elif I_USE_ENDSTOP == _YMIN_
374
   #elif I_USE_ENDSTOP == _YMIN_
343
     #warning "Auto-assigned I_DIAG_PIN to Y_MIN_PIN."
375
     #warning "Auto-assigned I_DIAG_PIN to Y_MIN_PIN."
344
   #elif I_USE_ENDSTOP == _YMAX_
376
   #elif I_USE_ENDSTOP == _YMAX_
345
     #warning "Auto-assigned I_DIAG_PIN to Y_MAX_PIN."
377
     #warning "Auto-assigned I_DIAG_PIN to Y_MAX_PIN."
378
+  #elif I_USE_ENDSTOP == _YSTOP_
379
+    #warning "Auto-assigned I_DIAG_PIN to Y_STOP_PIN."
346
   #elif I_USE_ENDSTOP == _ZMIN_
380
   #elif I_USE_ENDSTOP == _ZMIN_
347
     #warning "Auto-assigned I_DIAG_PIN to Z_MIN_PIN."
381
     #warning "Auto-assigned I_DIAG_PIN to Z_MIN_PIN."
348
   #elif I_USE_ENDSTOP == _ZMAX_
382
   #elif I_USE_ENDSTOP == _ZMAX_
349
     #warning "Auto-assigned I_DIAG_PIN to Z_MAX_PIN."
383
     #warning "Auto-assigned I_DIAG_PIN to Z_MAX_PIN."
384
+  #elif I_USE_ENDSTOP == _ZSTOP_
385
+    #warning "Auto-assigned I_DIAG_PIN to Z_STOP_PIN."
350
   #elif I_USE_ENDSTOP == _XDIAG_
386
   #elif I_USE_ENDSTOP == _XDIAG_
351
     #warning "Auto-assigned I_DIAG_PIN to X_DIAG_PIN."
387
     #warning "Auto-assigned I_DIAG_PIN to X_DIAG_PIN."
352
   #elif I_USE_ENDSTOP == _YDIAG_
388
   #elif I_USE_ENDSTOP == _YDIAG_
391
     #warning "Auto-assigned J_DIAG_PIN to X_MIN_PIN."
427
     #warning "Auto-assigned J_DIAG_PIN to X_MIN_PIN."
392
   #elif J_USE_ENDSTOP == _XMAX_
428
   #elif J_USE_ENDSTOP == _XMAX_
393
     #warning "Auto-assigned J_DIAG_PIN to X_MAX_PIN."
429
     #warning "Auto-assigned J_DIAG_PIN to X_MAX_PIN."
430
+  #elif J_USE_ENDSTOP == _XSTOP_
431
+    #warning "Auto-assigned J_DIAG_PIN to X_STOP_PIN."
394
   #elif J_USE_ENDSTOP == _YMIN_
432
   #elif J_USE_ENDSTOP == _YMIN_
395
     #warning "Auto-assigned J_DIAG_PIN to Y_MIN_PIN."
433
     #warning "Auto-assigned J_DIAG_PIN to Y_MIN_PIN."
396
   #elif J_USE_ENDSTOP == _YMAX_
434
   #elif J_USE_ENDSTOP == _YMAX_
397
     #warning "Auto-assigned J_DIAG_PIN to Y_MAX_PIN."
435
     #warning "Auto-assigned J_DIAG_PIN to Y_MAX_PIN."
436
+  #elif J_USE_ENDSTOP == _YSTOP_
437
+    #warning "Auto-assigned J_DIAG_PIN to Y_STOP_PIN."
398
   #elif J_USE_ENDSTOP == _ZMIN_
438
   #elif J_USE_ENDSTOP == _ZMIN_
399
     #warning "Auto-assigned J_DIAG_PIN to Z_MIN_PIN."
439
     #warning "Auto-assigned J_DIAG_PIN to Z_MIN_PIN."
400
   #elif J_USE_ENDSTOP == _ZMAX_
440
   #elif J_USE_ENDSTOP == _ZMAX_
401
     #warning "Auto-assigned J_DIAG_PIN to Z_MAX_PIN."
441
     #warning "Auto-assigned J_DIAG_PIN to Z_MAX_PIN."
442
+  #elif J_USE_ENDSTOP == _ZSTOP_
443
+    #warning "Auto-assigned J_DIAG_PIN to Z_STOP_PIN."
402
   #elif J_USE_ENDSTOP == _XDIAG_
444
   #elif J_USE_ENDSTOP == _XDIAG_
403
     #warning "Auto-assigned J_DIAG_PIN to X_DIAG_PIN."
445
     #warning "Auto-assigned J_DIAG_PIN to X_DIAG_PIN."
404
   #elif J_USE_ENDSTOP == _YDIAG_
446
   #elif J_USE_ENDSTOP == _YDIAG_
443
     #warning "Auto-assigned K_DIAG_PIN to X_MIN_PIN."
485
     #warning "Auto-assigned K_DIAG_PIN to X_MIN_PIN."
444
   #elif K_USE_ENDSTOP == _XMAX_
486
   #elif K_USE_ENDSTOP == _XMAX_
445
     #warning "Auto-assigned K_DIAG_PIN to X_MAX_PIN."
487
     #warning "Auto-assigned K_DIAG_PIN to X_MAX_PIN."
488
+  #elif K_USE_ENDSTOP == _XSTOP_
489
+    #warning "Auto-assigned K_DIAG_PIN to X_STOP_PIN."
446
   #elif K_USE_ENDSTOP == _YMIN_
490
   #elif K_USE_ENDSTOP == _YMIN_
447
     #warning "Auto-assigned K_DIAG_PIN to Y_MIN_PIN."
491
     #warning "Auto-assigned K_DIAG_PIN to Y_MIN_PIN."
448
   #elif K_USE_ENDSTOP == _YMAX_
492
   #elif K_USE_ENDSTOP == _YMAX_
449
     #warning "Auto-assigned K_DIAG_PIN to Y_MAX_PIN."
493
     #warning "Auto-assigned K_DIAG_PIN to Y_MAX_PIN."
494
+  #elif K_USE_ENDSTOP == _YSTOP_
495
+    #warning "Auto-assigned K_DIAG_PIN to Y_STOP_PIN."
450
   #elif K_USE_ENDSTOP == _ZMIN_
496
   #elif K_USE_ENDSTOP == _ZMIN_
451
     #warning "Auto-assigned K_DIAG_PIN to Z_MIN_PIN."
497
     #warning "Auto-assigned K_DIAG_PIN to Z_MIN_PIN."
452
   #elif K_USE_ENDSTOP == _ZMAX_
498
   #elif K_USE_ENDSTOP == _ZMAX_
453
     #warning "Auto-assigned K_DIAG_PIN to Z_MAX_PIN."
499
     #warning "Auto-assigned K_DIAG_PIN to Z_MAX_PIN."
500
+  #elif K_USE_ENDSTOP == _ZSTOP_
501
+    #warning "Auto-assigned K_DIAG_PIN to Z_STOP_PIN."
454
   #elif K_USE_ENDSTOP == _XDIAG_
502
   #elif K_USE_ENDSTOP == _XDIAG_
455
     #warning "Auto-assigned K_DIAG_PIN to X_DIAG_PIN."
503
     #warning "Auto-assigned K_DIAG_PIN to X_DIAG_PIN."
456
   #elif K_USE_ENDSTOP == _YDIAG_
504
   #elif K_USE_ENDSTOP == _YDIAG_

+ 20
- 3
Marlin/src/pins/pins_postprocess.h Bestand weergeven

419
 #else
419
 #else
420
   #define X_STOP_PIN X_MAX_PIN
420
   #define X_STOP_PIN X_MAX_PIN
421
 #endif
421
 #endif
422
+#if !defined(X2_USE_ENDSTOP) && ENABLED(X_DUAL_ENDSTOPS) && PIN_EXISTS(X_STOP)
423
+  #define X2_USE_ENDSTOP _XSTOP_
424
+#endif
422
 
425
 
423
 #if HAS_Y_AXIS
426
 #if HAS_Y_AXIS
424
   #ifdef Y_STOP_PIN
427
   #ifdef Y_STOP_PIN
438
   #else
441
   #else
439
     #define Y_STOP_PIN Y_MAX_PIN
442
     #define Y_STOP_PIN Y_MAX_PIN
440
   #endif
443
   #endif
444
+  #if !defined(Y2_USE_ENDSTOP) && ENABLED(Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y_STOP)
445
+    #define Y2_USE_ENDSTOP _YSTOP_
446
+  #endif
441
 #endif
447
 #endif
442
 
448
 
443
 #if HAS_Z_AXIS
449
 #if HAS_Z_AXIS
458
   #else
464
   #else
459
     #define Z_STOP_PIN Z_MAX_PIN
465
     #define Z_STOP_PIN Z_MAX_PIN
460
   #endif
466
   #endif
467
+  #if ENABLED(Z_MULTI_ENDSTOPS) && PIN_EXISTS(Z_STOP)
468
+    #ifndef Z2_USE_ENDSTOP
469
+      #define Z2_USE_ENDSTOP _ZSTOP_
470
+    #endif
471
+    #if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_USE_ENDSTOP)
472
+      #define Z3_USE_ENDSTOP _ZSTOP_
473
+    #endif
474
+    #if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_USE_ENDSTOP)
475
+      #define Z4_USE_ENDSTOP _ZSTOP_
476
+    #endif
477
+  #endif
461
 #endif
478
 #endif
462
 
479
 
463
 #if LINEAR_AXES >= 4
480
 #if LINEAR_AXES >= 4
801
     #endif
818
     #endif
802
   #endif
819
   #endif
803
   // Auto-assign pins for stallGuard sensorless homing
820
   // Auto-assign pins for stallGuard sensorless homing
804
-  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
821
+  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _PEXI(Z2_E_INDEX, DIAG)
805
     #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
822
     #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
806
     #if   DIAG_REMAPPED(Z2, X_MIN)
823
     #if   DIAG_REMAPPED(Z2, X_MIN)
807
       #define Z2_USE_ENDSTOP _XMIN_
824
       #define Z2_USE_ENDSTOP _XMIN_
886
     #endif
903
     #endif
887
   #endif
904
   #endif
888
   // Auto-assign pins for stallGuard sensorless homing
905
   // Auto-assign pins for stallGuard sensorless homing
889
-  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
906
+  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _PEXI(Z3_E_INDEX, DIAG)
890
     #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
907
     #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
891
     #if   DIAG_REMAPPED(Z3, X_MIN)
908
     #if   DIAG_REMAPPED(Z3, X_MIN)
892
       #define Z3_USE_ENDSTOP _XMIN_
909
       #define Z3_USE_ENDSTOP _XMIN_
971
     #endif
988
     #endif
972
   #endif
989
   #endif
973
   // Auto-assign pins for stallGuard sensorless homing
990
   // Auto-assign pins for stallGuard sensorless homing
974
-  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
991
+  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _PEXI(Z4_E_INDEX, DIAG)
975
     #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
992
     #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
976
     #if   DIAG_REMAPPED(Z4, X_MIN)
993
     #if   DIAG_REMAPPED(Z4, X_MIN)
977
       #define Z4_USE_ENDSTOP _XMIN_
994
       #define Z4_USE_ENDSTOP _XMIN_

+ 4
- 0
Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h Bestand weergeven

28
 #define Z2_ENABLE_PIN                       PF3
28
 #define Z2_ENABLE_PIN                       PF3
29
 #define Z2_STEP_PIN                         PF5
29
 #define Z2_STEP_PIN                         PF5
30
 #define Z2_DIR_PIN                          PF1
30
 #define Z2_DIR_PIN                          PF1
31
+#define Z2_STOP_PIN                         PA13
31
 
32
 
33
+#ifndef Z_MIN_PROBE_PIN
34
+  #define Z_MIN_PROBE_PIN                   PG9
35
+#endif
32
 #ifndef FIL_RUNOUT2_PIN
36
 #ifndef FIL_RUNOUT2_PIN
33
   #define FIL_RUNOUT2_PIN                   PF13
37
   #define FIL_RUNOUT2_PIN                   PF13
34
 #endif
38
 #endif

Laden…
Annuleren
Opslaan