thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Use limit switch overrides

Scott Lahteine 5 years ago
parent
34d2801bbe
commit
9206c0e869
9 changed files with 90 additions and 90 deletions
Split View Show Diff Stats
  1. 2
    4
      Marlin/src/pins/pins_AZTEEG_X3.h
  2. 22
    34
      Marlin/src/pins/pins_AZTEEG_X3_PRO.h
  3. 5
    3
      Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
  4. 24
    6
      Marlin/src/pins/pins_GT2560_V3.h
  5. 2
    9
      Marlin/src/pins/pins_GT2560_V3_MC2.h
  6. 1
    2
      Marlin/src/pins/pins_MELZI_CREALITY.h
  7. 21
    15
      Marlin/src/pins/pins_RAMPS.h
  8. 8
    14
      Marlin/src/pins/pins_RAMPS_DAGOMA.h
  9. 5
    3
      Marlin/src/pins/pins_TRONXY_V3_1_0.h

+ 2
- 4
Marlin/src/pins/pins_AZTEEG_X3.h View File 

@@ -37,16 +37,14 @@
37 37 
 #endif
38 38 
 #define BOARD_NAME "Azteeg X3"
39 39
40 
-#include "pins_RAMPS_13.h"
41 
-
42 40 
 //
43 41 
 // Servos
44 42 
 //
45 
-#undef SERVO0_PIN
46 
-#undef SERVO1_PIN
47 43 
 #define SERVO0_PIN         44   // SERVO1 port
48 44 
 #define SERVO1_PIN         55   // SERVO2 port
49 45
46 
+#include "pins_RAMPS_13.h"
47 
+
50 48 
 //
51 49 
 // LCD / Controller
52 50 
 //

+ 22
- 34
Marlin/src/pins/pins_AZTEEG_X3_PRO.h View File 

@@ -37,14 +37,33 @@
37 37 
 //
38 38 
 // RAMPS pins overrides
39 39 
 //
40 
-#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
41 
-  #define CASE_LIGHT_PIN   44
42 
-#endif
40 
+
41 
+//
42 
+// Servos
43 
+//
44 
+// Tested this pin with bed leveling on a Delta with 1 servo.
45 
+// Physical wire attachment on EXT1: GND, 5V, D47.
46 
+//
47 
+#define SERVO0_PIN         47
48 
+
49 
+//
50 
+// Limit Switches
51 
+//
52 
+#define X_STOP_PIN          3
53 
+#define Y_STOP_PIN         14
54 
+#define Z_STOP_PIN         18
43 55
44 56 
 #ifndef FAN_PIN
45 57 
   #define FAN_PIN           6
46 58 
 #endif
47 59
60 
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
61 
+  #define CASE_LIGHT_PIN   44
62 
+#endif
63 
+
64 
+//
65 
+// Import RAMPS 1.4 pins
66 
+//
48 67 
 #include "pins_RAMPS.h"
49 68
50 69 
 // DIGIPOT slave addresses
 
@@ -56,37 +75,6 @@
56 75 
 #endif
57 76
58 77 
 //
59 
-// Servos
60 
-//
61 
-// Tested this pin with bed leveling on a Delta with 1 servo.
62 
-// Physical wire attachment on EXT1: GND, 5V, D47.
63 
-//
64 
-#undef SERVO0_PIN
65 
-#define SERVO0_PIN         47
66 
-
67 
-//
68 
-// Limit Switches
69 
-//
70 
-// Swap the MIN and MAX endstop pins because the X3 Pro comes with only
71 
-// MIN endstop pin headers soldered onto the board.
72 
-//
73 
-#if ENABLED(DELTA)
74 
-  #undef X_MIN_PIN
75 
-  #undef X_MAX_PIN
76 
-  #undef Y_MIN_PIN
77 
-  #undef Y_MAX_PIN
78 
-  #undef Z_MIN_PIN
79 
-  #undef Z_MAX_PIN
80 
-
81 
-  #define X_MIN_PIN         2
82 
-  #define X_MAX_PIN         3
83 
-  #define Y_MIN_PIN        15
84 
-  #define Y_MAX_PIN        14
85 
-  #define Z_MIN_PIN        19
86 
-  #define Z_MAX_PIN        18
87 
-#endif
88 
-
89 
-//
90 78 
 // Z Probe (when not Z_MIN_PIN)
91 79 
 //
92 80 
 #ifndef Z_MIN_PROBE_PIN

+ 5
- 3
Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h View File 

@@ -53,15 +53,17 @@
53 53 
 #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
54 54 
 #define SPINDLE_DIR_PIN          42
55 55
56 
-#include "pins_RAMPS_13.h"
57 
-
58 56 
 //
59 57 
 // Limit Switches
60 58 
 //
61 
-#undef X_MAX_PIN
62 59 
 #define X_MAX_PIN          79   // 2
63 60
64 61 
 //
62 
+// Import RAMPS 1.3 pins
63 
+//
64 
+#include "pins_RAMPS_13.h"
65 
+
66 
+//
65 67 
 // Z Probe (when not Z_MIN_PIN)
66 68 
 //
67 69 
 #undef Z_MIN_PROBE_PIN

+ 24
- 6
Marlin/src/pins/pins_GT2560_V3.h View File 

@@ -40,12 +40,30 @@
40 40 
 //
41 41 
 // Limit Switches
42 42 
 //
43 
-#define X_MIN_PIN          24
44 
-#define X_MAX_PIN          22
45 
-#define Y_MIN_PIN          28
46 
-#define Y_MAX_PIN          26
47 
-#define Z_MIN_PIN          30
48 
-#define Z_MAX_PIN          32
43 
+#ifndef X_STOP_PIN
44 
+  #ifndef X_MIN_PIN
45 
+    #define X_MIN_PIN      24
46 
+  #endif
47 
+  #ifndef X_MAX_PIN
48 
+    #define X_MAX_PIN      22
49 
+  #endif
50 
+#endif
51 
+#ifndef Y_STOP_PIN
52 
+  #ifndef Y_MIN_PIN
53 
+    #define Y_MIN_PIN      28
54 
+  #endif
55 
+  #ifndef Y_MAX_PIN
56 
+    #define Y_MAX_PIN      26
57 
+  #endif
58 
+#endif
59 
+#ifndef Z_STOP_PIN
60 
+  #ifndef Z_MIN_PIN
61 
+    #define Z_MIN_PIN      30
62 
+  #endif
63 
+  #ifndef Z_MAX_PIN
64 
+    #define Z_MAX_PIN      32
65 
+  #endif
66 
+#endif
49 67
50 68 
 //
51 69 
 // Z Probe (when not Z_MIN_PIN)

+ 2
- 9
Marlin/src/pins/pins_GT2560_V3_MC2.h View File 

@@ -26,16 +26,9 @@
26 26
27 27 
 #define BOARD_NAME "GT2560 V3.0 (MC2)"
28 28
29 
-#include "pins_GT2560_V3.h"
30 
-
31 
-#undef X_MIN_PIN
32 29 
 #define X_MIN_PIN          22
33 
-
34 
-#undef X_MAX_PIN
35 30 
 #define X_MAX_PIN          24
36 
-
37 
-#undef Y_MIN_PIN
38 31 
 #define Y_MIN_PIN          26
39 
-
40 
-#undef Y_MAX_PIN
41 32 
 #define Y_MAX_PIN          28
33 
+
34 
+#include "pins_GT2560_V3.h"

+ 1
- 2
Marlin/src/pins/pins_MELZI_CREALITY.h View File 

@@ -45,13 +45,12 @@
45 45 
 #undef LCD_PINS_D5
46 46 
 #undef LCD_PINS_D6
47 47 
 #undef LCD_PINS_D7
48 
-#undef FIL_RUNOUT_PIN
48 
+#undef FIL_RUNOUT_PIN           // Uses Beeper/LED Pin Pulled to GND
49 49
50 50 
 #define LCD_SDSS           31   // Smart Controller SD card reader (rather than the Melzi)
51 51 
 #define LCD_PINS_RS        28   // ST9720 CS
52 52 
 #define LCD_PINS_ENABLE    17   // ST9720 DAT
53 53 
 #define LCD_PINS_D4        30   // ST9720 CLK
54 
-#define FIL_RUNOUT_PIN     -1   // Uses Beeper/LED Pin Pulled to GND
55 54
56 55 
 #if DISABLED(SPEAKER) && ENABLED(BLTOUCH)
57 56 
   #define SERVO0_PIN 27

+ 21
- 15
Marlin/src/pins/pins_RAMPS.h View File 

@@ -83,23 +83,29 @@
83 83 
 //
84 84 
 // Limit Switches
85 85 
 //
86 
-#ifndef X_MIN_PIN
87 
-  #define X_MIN_PIN         3
88 
-#endif
89 
-#ifndef X_MAX_PIN
90 
-  #define X_MAX_PIN         2
91 
-#endif
92 
-#ifndef Y_MIN_PIN
93 
-  #define Y_MIN_PIN        14
94 
-#endif
95 
-#ifndef Y_MAX_PIN
96 
-  #define Y_MAX_PIN        15
86 
+#ifndef X_STOP_PIN
87 
+  #ifndef X_MIN_PIN
88 
+    #define X_MIN_PIN       3
89 
+  #endif
90 
+  #ifndef X_MAX_PIN
91 
+    #define X_MAX_PIN       2
92 
+  #endif
97 93 
 #endif
98 
-#ifndef Z_MIN_PIN
99 
-  #define Z_MIN_PIN        18
94 
+#ifndef Y_STOP_PIN
95 
+  #ifndef Y_MIN_PIN
96 
+    #define Y_MIN_PIN      14
97 
+  #endif
98 
+  #ifndef Y_MAX_PIN
99 
+    #define Y_MAX_PIN      15
100 
+  #endif
100 101 
 #endif
101 
-#ifndef Z_MAX_PIN
102 
-  #define Z_MAX_PIN          19
102 
+#ifndef Z_STOP_PIN
103 
+  #ifndef Z_MIN_PIN
104 
+    #define Z_MIN_PIN      18
105 
+  #endif
106 
+  #ifndef Z_MAX_PIN
107 
+    #define Z_MAX_PIN      19
108 
+  #endif
103 109 
 #endif
104 110
105 111 
 //

+ 8
- 14
Marlin/src/pins/pins_RAMPS_DAGOMA.h View File 

@@ -26,20 +26,14 @@
26 26
27 27 
 #define BOARD_NAME "Dagoma3D F5 RAMPS"
28 28
29 
-#ifdef E0_AUTO_FAN_PIN
30 
-  #undef E0_AUTO_FAN_PIN
31 
-#endif
32 
-
33 
-#define E0_AUTO_FAN_PIN 7
29 
+#define X_STOP_PIN          2
30 
+#define Y_STOP_PIN          3
31 
+#define Z_STOP_PIN         15
32 
+#define FIL_RUNOUT_PIN     39
34 33
35 
-#define X_MAX_PIN -1
36 
-#define X_MIN_PIN 2
37 
-#define Y_MAX_PIN 3
38 
-#define Y_MIN_MIN -1
39 
-#define Z_MAX_PIN -1
40 
-#define Z_MIN_PIN 15
41 
-#define FILRUNOUT_PIN 39
42 
-#define MOSFET_D_PIN -1
34 
+#define ORIG_E0_AUTO_FAN_PIN 7
43 35
36 
+//
37 
+// Import RAMPS 1.4 pins
38 
+//
44 39 
 #include "pins_RAMPS.h"
45 
-

+ 5
- 3
Marlin/src/pins/pins_TRONXY_V3_1_0.h View File 

@@ -34,14 +34,16 @@
34 34
35 35 
 #define BOARD_NAME "TRONXY-V3-1.0"
36 36
37 
-#include "pins_RAMPS.h"
38 
-
39 37 
 //
40 38 
 // Servos
41 39 
 //
42 
-#undef SERVO1_PIN
43 40 
 #define SERVO1_PIN         12   // 2560 PIN 25/PB6
44 41
42 
+//
43 
+// Import RAMPS 1.4 pins
44 
+//
45 
+#include "pins_RAMPS.h"
46 
+
45 47 
 /**
46 48 
  * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
47 49 
  *

Write Preview
Loading…
Cancel
Save