Browse Source

For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.

Johann Rocholl 12 years ago
parent
commit
b39f5d614a
1 changed files with 76 additions and 95 deletions
  1. 76
    95
      Marlin/pins.h

+ 76
- 95
Marlin/pins.h View File

@@ -19,20 +19,17 @@
19 19
 #define X_STEP_PIN          2
20 20
 #define X_DIR_PIN           3
21 21
 #define X_ENABLE_PIN        -1
22
-#define X_MIN_PIN           -1
23
-#define X_MAX_PIN           16
22
+#define X_STOP_PIN          16
24 23
 
25 24
 #define Y_STEP_PIN          5
26 25
 #define Y_DIR_PIN           6
27 26
 #define Y_ENABLE_PIN       -1
28
-#define Y_MIN_PIN           67
29
-#define Y_MAX_PIN          -1
27
+#define Y_STOP_PIN          67
30 28
 
31 29
 #define Z_STEP_PIN          62
32 30
 #define Z_DIR_PIN           63
33 31
 #define Z_ENABLE_PIN       -1
34
-#define Z_MIN_PIN           59
35
-#define Z_MAX_PIN          -1
32
+#define Z_STOP_PIN          59
36 33
 
37 34
 #define E0_STEP_PIN         65
38 35
 #define E0_DIR_PIN          66
@@ -83,15 +80,13 @@
83 80
 #define X_STEP_PIN 19
84 81
 #define X_DIR_PIN 18
85 82
 #define X_ENABLE_PIN 24
86
-#define X_MIN_PIN 7
87
-#define X_MAX_PIN -1
83
+#define X_STOP_PIN 7
88 84
 
89 85
 //y axis pins
90 86
 #define Y_STEP_PIN 23
91 87
 #define Y_DIR_PIN 22
92 88
 #define Y_ENABLE_PIN 24
93
-#define Y_MIN_PIN 5
94
-#define Y_MAX_PIN -1
89
+#define Y_STOP_PIN 5
95 90
 
96 91
 //z axis pins
97 92
 #define Z_STEP_PIN 26
@@ -167,22 +162,19 @@
167 162
 #define X_STEP_PIN 29
168 163
 #define X_DIR_PIN 28
169 164
 #define X_ENABLE_PIN 25
170
-#define X_MIN_PIN 0
171
-#define X_MAX_PIN -1
165
+#define X_STOP_PIN 0
172 166
 
173 167
 //y axis pins
174 168
 #define Y_STEP_PIN 27
175 169
 #define Y_DIR_PIN 26
176 170
 #define Y_ENABLE_PIN 25
177
-#define Y_MIN_PIN 1
178
-#define Y_MAX_PIN -1
171
+#define Y_STOP_PIN 1
179 172
 
180 173
 //z axis pins
181 174
 #define Z_STEP_PIN 23
182 175
 #define Z_DIR_PIN 22
183 176
 #define Z_ENABLE_PIN 25
184
-#define Z_MIN_PIN 2
185
-#define Z_MAX_PIN -1
177
+#define Z_STOP_PIN 2
186 178
 
187 179
 //extruder pins
188 180
 #define E0_STEP_PIN 19
@@ -238,22 +230,19 @@
238 230
     #define X_STEP_PIN      21                  //different from stanard GEN7
239 231
     #define X_DIR_PIN       20				    //different from stanard GEN7
240 232
     #define X_ENABLE_PIN    24
241
-    #define X_MIN_PIN       0
242
-    #define X_MAX_PIN       -1
233
+    #define X_STOP_PIN      0
243 234
 
244 235
     //y axis pins
245 236
     #define Y_STEP_PIN      23
246 237
     #define Y_DIR_PIN       22
247 238
     #define Y_ENABLE_PIN    24
248
-    #define Y_MIN_PIN       1
249
-    #define Y_MAX_PIN       -1
239
+    #define Y_STOP_PIN      1
250 240
 
251 241
     //z axis pins
252 242
     #define Z_STEP_PIN      26
253 243
     #define Z_DIR_PIN       25
254 244
     #define Z_ENABLE_PIN    24
255
-    #define Z_MIN_PIN       2
256
-    #define Z_MAX_PIN       -1
245
+    #define Z_STOP_PIN      2
257 246
 
258 247
     //extruder pins
259 248
     #define E0_STEP_PIN      28
@@ -336,13 +325,13 @@
336 325
 #define X_DIR_PIN          55
337 326
 #define X_ENABLE_PIN       38
338 327
 #define X_MIN_PIN           3
339
-#define X_MAX_PIN           2   //2 //Max endstops default to disabled "-1", set to commented value to enable.
328
+#define X_MAX_PIN           2
340 329
 
341 330
 #define Y_STEP_PIN         60
342 331
 #define Y_DIR_PIN          61
343 332
 #define Y_ENABLE_PIN       56
344 333
 #define Y_MIN_PIN          14
345
-#define Y_MAX_PIN          15   //15
334
+#define Y_MAX_PIN          15
346 335
 
347 336
 #define Z_STEP_PIN         46
348 337
 #define Z_DIR_PIN          48
@@ -546,20 +535,17 @@
546 535
 #define X_STEP_PIN         19
547 536
 #define X_DIR_PIN          18
548 537
 #define X_ENABLE_PIN       -1
549
-#define X_MIN_PIN          17
550
-#define X_MAX_PIN          -1
538
+#define X_STOP_PIN         17
551 539
 
552 540
 #define Y_STEP_PIN         10
553 541
 #define Y_DIR_PIN           7
554 542
 #define Y_ENABLE_PIN       -1
555
-#define Y_MIN_PIN           8
556
-#define Y_MAX_PIN          -1
543
+#define Y_STOP_PIN          8
557 544
 
558 545
 #define Z_STEP_PIN         13
559 546
 #define Z_DIR_PIN           3
560 547
 #define Z_ENABLE_PIN        2
561
-#define Z_MIN_PIN           4
562
-#define Z_MAX_PIN          -1
548
+#define Z_STOP_PIN          4
563 549
 
564 550
 #define E0_STEP_PIN         11
565 551
 #define E0_DIR_PIN          12
@@ -600,23 +586,20 @@
600 586
     #define X_STEP_PIN      15
601 587
     #define X_DIR_PIN       18
602 588
     #define X_ENABLE_PIN    19
603
-    #define X_MIN_PIN       20
604
-    #define X_MAX_PIN       -1
605
-    
589
+    #define X_STOP_PIN      20
590
+
606 591
     //y axis pins
607 592
     #define Y_STEP_PIN      23
608 593
     #define Y_DIR_PIN       22
609 594
     #define Y_ENABLE_PIN    24
610
-    #define Y_MIN_PIN       25
611
-    #define Y_MAX_PIN       -1
612
-    
595
+    #define Y_STOP_PIN      25
596
+
613 597
     //z axis pins
614 598
     #define Z_STEP_PIN      27
615 599
     #define Z_DIR_PIN       28
616 600
     #define Z_ENABLE_PIN    29
617
-    #define Z_MIN_PIN       30
618
-    #define Z_MAX_PIN       -1
619
-    
601
+    #define Z_STOP_PIN      30
602
+
620 603
     //extruder pins
621 604
     #define E0_STEP_PIN      4    //Edited @ EJE Electronics 20100715
622 605
     #define E0_DIR_PIN       2    //Edited @ EJE Electronics 20100715
@@ -675,33 +658,15 @@
675 658
 
676 659
 #define X_STEP_PIN         15
677 660
 #define X_DIR_PIN          21
678
-#if X_HOME_DIR < 0
679
-# define X_MIN_PIN          18 
680
-# define X_MAX_PIN          -1
681
-#else
682
-# define X_MIN_PIN          -1
683
-# define X_MAX_PIN          18
684
-#endif
661
+#define X_STOP_PIN         18
685 662
 
686 663
 #define Y_STEP_PIN         22
687 664
 #define Y_DIR_PIN          23
688
-#if Y_HOME_DIR < 0
689
-# define Y_MIN_PIN          19 
690
-# define Y_MAX_PIN          -1
691
-#else
692
-# define Y_MIN_PIN          -1
693
-# define Y_MAX_PIN          19
694
-#endif
665
+#define Y_STOP_PIN         19
695 666
 
696 667
 #define Z_STEP_PIN         3
697 668
 #define Z_DIR_PIN          2
698
-#if Z_HOME_DIR < 0
699
-# define Z_MIN_PIN          20 
700
-# define Z_MAX_PIN          -1
701
-#else
702
-# define Z_MIN_PIN          -1
703
-# define Z_MAX_PIN          20
704
-#endif
669
+#define Z_STOP_PIN         20
705 670
 
706 671
 #define E0_STEP_PIN         1
707 672
 #define E0_DIR_PIN          0
@@ -973,17 +938,14 @@
973 938
 #define X_STEP_PIN          0
974 939
 #define X_DIR_PIN           1
975 940
 #define X_ENABLE_PIN       39
976
-#define X_MAX_PIN          -1
977 941
 
978 942
 #define Y_STEP_PIN          2
979 943
 #define Y_DIR_PIN           3
980 944
 #define Y_ENABLE_PIN       38
981
-#define Y_MAX_PIN          -1
982 945
 
983 946
 #define Z_STEP_PIN          4
984 947
 #define Z_DIR_PIN           5
985 948
 #define Z_ENABLE_PIN       23
986
-#define Z_MAX_PIN          -1
987 949
 
988 950
 #define E0_STEP_PIN         6
989 951
 #define E0_DIR_PIN          7
@@ -998,15 +960,15 @@
998 960
 // for the fan and Teensyduino uses a different pin mapping.
999 961
 
1000 962
 #if MOTHERBOARD == 8  // Teensylu
1001
-  #define X_MIN_PIN          13
1002
-  #define Y_MIN_PIN          14
1003
-  #define Z_MIN_PIN          15
963
+  #define X_STOP_PIN         13
964
+  #define Y_STOP_PIN         14
965
+  #define Z_STOP_PIN         15
1004 966
   #define TEMP_0_PIN          7  // Extruder / Analog pin numbering
1005 967
   #define TEMP_BED_PIN        6  // Bed / Analog pin numbering
1006 968
 #else  // Printrboard
1007
-  #define X_MIN_PIN          35
1008
-  #define Y_MIN_PIN           8
1009
-  #define Z_MIN_PIN          36
969
+  #define X_STOP_PIN         35
970
+  #define Y_STOP_PIN          8
971
+  #define Z_STOP_PIN         36
1010 972
   #define TEMP_0_PIN          1  // Extruder / Analog pin numbering
1011 973
   #define TEMP_BED_PIN        0  // Bed / Analog pin numbering
1012 974
 #endif
@@ -1046,22 +1008,20 @@
1046 1008
 #define X_STEP_PIN         27
1047 1009
 #define X_DIR_PIN          29
1048 1010
 #define X_ENABLE_PIN       28
1049
-#define X_MIN_PIN           7
1050
-#define X_MAX_PIN          -1
1011
+#define X_STOP_PIN          7
1051 1012
 #define X_ATT_PIN          26
1052 1013
 
1053 1014
 #define Y_STEP_PIN         31
1054 1015
 #define Y_DIR_PIN          33
1055 1016
 #define Y_ENABLE_PIN       32
1056
-#define Y_MIN_PIN           6
1057
-#define Y_MAX_PIN          -1
1017
+#define Y_STOP_PIN          6
1058 1018
 #define Y_ATT_PIN          30
1059 1019
 
1020
+
1060 1021
 #define Z_STEP_PIN         17
1061 1022
 #define Z_DIR_PIN          19
1062 1023
 #define Z_ENABLE_PIN       18
1063
-#define Z_MIN_PIN           5
1064
-#define Z_MAX_PIN          -1
1024
+#define Z_STOP_PIN          5
1065 1025
 #define Z_ATT_PIN          16
1066 1026
 
1067 1027
 #define E0_STEP_PIN        21
@@ -1111,18 +1071,15 @@
1111 1071
 
1112 1072
 #define X_STEP_PIN         15
1113 1073
 #define X_DIR_PIN          18
1114
-#define X_MIN_PIN          20
1115
-#define X_MAX_PIN           -1
1074
+#define X_STOP_PIN         20
1116 1075
 
1117 1076
 #define Y_STEP_PIN         23
1118 1077
 #define Y_DIR_PIN          22
1119
-#define Y_MIN_PIN          25
1120
-#define Y_MAX_PIN          -1
1078
+#define Y_STOP_PIN         25
1121 1079
 
1122 1080
 #define Z_STEP_PIN         27
1123 1081
 #define Z_DIR_PIN          28
1124
-#define Z_MIN_PIN          30
1125
-#define Z_MAX_PIN          -1
1082
+#define Z_STOP_PIN         30
1126 1083
 
1127 1084
 #define E_STEP_PIN         17
1128 1085
 #define E_DIR_PIN          21
@@ -1192,20 +1149,17 @@
1192 1149
 #define X_STEP_PIN         21
1193 1150
 #define X_DIR_PIN          20
1194 1151
 #define X_ENABLE_PIN       24
1195
-#define X_MIN_PIN          0
1196
-#define X_MAX_PIN          -1
1152
+#define X_STOP_PIN         0
1197 1153
 
1198 1154
 #define Y_STEP_PIN         23
1199 1155
 #define Y_DIR_PIN          22
1200 1156
 #define Y_ENABLE_PIN       24
1201
-#define Y_MIN_PIN          1
1202
-#define Y_MAX_PIN          -1
1157
+#define Y_STOP_PIN         1
1203 1158
 
1204 1159
 #define Z_STEP_PIN         26
1205 1160
 #define Z_DIR_PIN          25
1206 1161
 #define Z_ENABLE_PIN       24
1207
-#define Z_MIN_PIN          2
1208
-#define Z_MAX_PIN          -1
1162
+#define Z_STOP_PIN         2
1209 1163
 
1210 1164
 #define E0_STEP_PIN         28
1211 1165
 #define E0_DIR_PIN          27
@@ -1249,20 +1203,17 @@
1249 1203
 #define X_STEP_PIN         26
1250 1204
 #define X_DIR_PIN          25
1251 1205
 #define X_ENABLE_PIN       10
1252
-#define X_MIN_PIN          0
1253
-#define X_MAX_PIN          -1
1206
+#define X_STOP_PIN         0
1254 1207
 
1255 1208
 #define Y_STEP_PIN         28
1256 1209
 #define Y_DIR_PIN          27
1257 1210
 #define Y_ENABLE_PIN       10
1258
-#define Y_MIN_PIN          1
1259
-#define Y_MAX_PIN          -1
1211
+#define Y_STOP_PIN         1
1260 1212
 
1261 1213
 #define Z_STEP_PIN         23
1262 1214
 #define Z_DIR_PIN          22
1263 1215
 #define Z_ENABLE_PIN       10
1264
-#define Z_MIN_PIN          2
1265
-#define Z_MAX_PIN          -1
1216
+#define Z_STOP_PIN         2
1266 1217
 
1267 1218
 #define E0_STEP_PIN         24
1268 1219
 #define E0_DIR_PIN          21
@@ -1399,13 +1350,13 @@
1399 1350
 #define X_DIR_PIN          28
1400 1351
 #define X_ENABLE_PIN       24
1401 1352
 #define X_MIN_PIN          41
1402
-#define X_MAX_PIN          37   //2 //Max endstops default to disabled "-1", set to commented value to enable.
1353
+#define X_MAX_PIN          37
1403 1354
 
1404 1355
 #define Y_STEP_PIN         60 // A6
1405 1356
 #define Y_DIR_PIN          61 // A7
1406 1357
 #define Y_ENABLE_PIN       22
1407 1358
 #define Y_MIN_PIN          14
1408
-#define Y_MAX_PIN          15   //15
1359
+#define Y_MAX_PIN          15
1409 1360
 
1410 1361
 #define Z_STEP_PIN         54 // A0
1411 1362
 #define Z_DIR_PIN          55 // A1
@@ -1499,6 +1450,36 @@
1499 1450
   #define _E2_PINS
1500 1451
 #endif
1501 1452
 
1453
+#ifdef X_STOP_PIN
1454
+  #if X_HOME_DIR < 0
1455
+    #define X_MIN_PIN X_STOP_PIN
1456
+    #define X_MAX_PIN -1
1457
+  #else
1458
+    #define X_MIN_PIN -1
1459
+    #define X_MAX_PIN X_STOP_PIN
1460
+  #endif
1461
+#endif
1462
+
1463
+#ifdef Y_STOP_PIN
1464
+  #if Y_HOME_DIR < 0
1465
+    #define Y_MIN_PIN Y_STOP_PIN
1466
+    #define Y_MAX_PIN -1
1467
+  #else
1468
+    #define Y_MIN_PIN -1
1469
+    #define Y_MAX_PIN Y_STOP_PIN
1470
+  #endif
1471
+#endif
1472
+
1473
+#ifdef Z_STOP_PIN
1474
+  #if Z_HOME_DIR < 0
1475
+    #define Z_MIN_PIN Z_STOP_PIN
1476
+    #define Z_MAX_PIN -1
1477
+  #else
1478
+    #define Z_MIN_PIN -1
1479
+    #define Z_MAX_PIN Z_STOP_PIN
1480
+  #endif
1481
+#endif
1482
+
1502 1483
 #ifdef DISABLE_MAX_ENDSTOPS
1503 1484
 #define X_MAX_PIN          -1
1504 1485
 #define Y_MAX_PIN          -1

Loading…
Cancel
Save