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

Allow override of CS pins generally

Scott Lahteine 7 years ago
parent
0891b58c30
commit
aecf0c9bb9
5 changed files with 83 additions and 32 deletions
Unified View Show Diff Stats
  1. 15
    5
      Marlin/src/pins/pins_ARCHIM2.h
  2. 24
    8
      Marlin/src/pins/pins_RADDS.h
  3. 18
    6
      Marlin/src/pins/pins_RAMPS_FD_V1.h
  4. 18
    6
      Marlin/src/pins/pins_RAMPS_RE_ARM.h
  5. 8
    7
      Marlin/src/pins/pins_RURAMPS4D.h

+ 15
- 5
Marlin/src/pins/pins_ARCHIM2.h View File

66 
 #define X_STEP_PIN         38   // PC6 X-STEP *
 66 
 #define X_STEP_PIN         38   // PC6 X-STEP *
67 
 #define X_DIR_PIN          37   // PC5 X-DIR *
 67 
 #define X_DIR_PIN          37   // PC5 X-DIR *
68 
 #define X_ENABLE_PIN       41   // PC9 EN1
 68 
 #define X_ENABLE_PIN       41   // PC9 EN1
69 
-#define X_CS_PIN           39   // PC7 X_nCS
69 
+#ifndef X_CS_PIN
70 
+  #define X_CS_PIN         39   // PC7 X_nCS
71 
+#endif
70 
 #define X_DIAG_PIN         59   // PA4 X_DIAG
 72 
 #define X_DIAG_PIN         59   // PA4 X_DIAG
71
73
72 
 #define Y_STEP_PIN         51   // PC12 Y-STEP *
 74 
 #define Y_STEP_PIN         51   // PC12 Y-STEP *
73 
 #define Y_DIR_PIN          92   // PC11 Y-DIR -AddOns *
 75 
 #define Y_DIR_PIN          92   // PC11 Y-DIR -AddOns *
74 
 #define Y_ENABLE_PIN       49   // PC14 Y-EN *
 76 
 #define Y_ENABLE_PIN       49   // PC14 Y-EN *
75 
-#define Y_CS_PIN           50   // PC13 Y_nCS
77 
+#ifndef Y_CS_PIN
78 
+  #define Y_CS_PIN         50   // PC13 Y_nCS
79 
+#endif
76 
 #define Y_DIAG_PIN         48   // PC15 Y_DIAG
 80 
 #define Y_DIAG_PIN         48   // PC15 Y_DIAG
77
81
78 
 #define Z_STEP_PIN         46   // PC17 Z-STEP *
 82 
 #define Z_STEP_PIN         46   // PC17 Z-STEP *
79 
 #define Z_DIR_PIN          47   // PC16 Z-DIR *
 83 
 #define Z_DIR_PIN          47   // PC16 Z-DIR *
80 
 #define Z_ENABLE_PIN       44   // PC19 Z-END *
 84 
 #define Z_ENABLE_PIN       44   // PC19 Z-END *
81 
-#define Z_CS_PIN           45   // PC18 Z_nCS
85 
+#ifndef Z_CS_PIN
86 
+  #define Z_CS_PIN         45   // PC18 Z_nCS
87 
+#endif
82 
 #define Z_DIAG_PIN         36   // PC4 Z_DIAG
 88 
 #define Z_DIAG_PIN         36   // PC4 Z_DIAG
83
89
84 
 #define E0_STEP_PIN       107   // PB10 E1-STEP -AddOns *
 90 
 #define E0_STEP_PIN       107   // PB10 E1-STEP -AddOns *
85 
 #define E0_DIR_PIN         96   // PC10 E1-DIR -AddOns *
 91 
 #define E0_DIR_PIN         96   // PC10 E1-DIR -AddOns *
86 
 #define E0_ENABLE_PIN     105   // PB22 E1-EN -AddOns *
 92 
 #define E0_ENABLE_PIN     105   // PB22 E1-EN -AddOns *
87 
-#define E0_CS_PIN         104   // PC20 E1_nCS -AddOns *
93 
+#ifndef E0_CS_PIN
94 
+  #define E0_CS_PIN       104   // PC20 E1_nCS -AddOns *
95 
+#endif
88 
 #define E0_DIAG_PIN        78   // PB23 E1_DIAG
 96 
 #define E0_DIAG_PIN        78   // PB23 E1_DIAG
89
97
90 
 #define E1_STEP_PIN        22   // PB26 E2_STEP *
 98 
 #define E1_STEP_PIN        22   // PB26 E2_STEP *
91 
 #define E1_DIR_PIN         97   // PB24 E2_DIR -AddOns *
 99 
 #define E1_DIR_PIN         97   // PB24 E2_DIR -AddOns *
92 
 #define E1_ENABLE_PIN      18   // PA11 E2-EN
 100 
 #define E1_ENABLE_PIN      18   // PA11 E2-EN
93 
-#define E1_CS_PIN          19   // PA10 E2_nCS
101 
+#ifndef E1_CS_PIN
102 
+  #define E1_CS_PIN        19   // PA10 E2_nCS
103 
+#endif
94 
 #define E1_DIAG_PIN        25   // PD0 E2_DIAG
 104 
 #define E1_DIAG_PIN        25   // PD0 E2_DIAG
95
105
96 
 //
 106 
 //

+ 24
- 8
Marlin/src/pins/pins_RADDS.h View File

54 
 #define X_STEP_PIN         24
 54 
 #define X_STEP_PIN         24
55 
 #define X_DIR_PIN          23
 55 
 #define X_DIR_PIN          23
56 
 #define X_ENABLE_PIN       26
 56 
 #define X_ENABLE_PIN       26
57 
-#define X_CS_PIN           25
57 
+#ifndef X_CS_PIN
58 
+  #define X_CS_PIN         25
59 
+#endif
58
60
59 
 #define Y_STEP_PIN         17
 61 
 #define Y_STEP_PIN         17
60 
 #define Y_DIR_PIN          16
 62 
 #define Y_DIR_PIN          16
61 
 #define Y_ENABLE_PIN       22
 63 
 #define Y_ENABLE_PIN       22
62 
-#define Y_CS_PIN           27
64 
+#ifndef Y_CS_PIN
65 
+  #define Y_CS_PIN         27
66 
+#endif
63
67
64 
 #define Z_STEP_PIN          2
 68 
 #define Z_STEP_PIN          2
65 
 #define Z_DIR_PIN           3
 69 
 #define Z_DIR_PIN           3
66 
 #define Z_ENABLE_PIN       15
 70 
 #define Z_ENABLE_PIN       15
67 
-#define Z_CS_PIN           29
71 
+#ifndef Z_CS_PIN
72 
+  #define Z_CS_PIN         29
73 
+#endif
68
74
69 
 #define E0_STEP_PIN        61
 75 
 #define E0_STEP_PIN        61
70 
 #define E0_DIR_PIN         60
 76 
 #define E0_DIR_PIN         60
71 
 #define E0_ENABLE_PIN      62
 77 
 #define E0_ENABLE_PIN      62
72 
-#define E0_CS_PIN          31
78 
+#ifndef E0_CS_PIN
79 
+  #define E0_CS_PIN        31
80 
+#endif
73
81
74 
 #define E1_STEP_PIN        64
 82 
 #define E1_STEP_PIN        64
75 
 #define E1_DIR_PIN         63
 83 
 #define E1_DIR_PIN         63
76 
 #define E1_ENABLE_PIN      65
 84 
 #define E1_ENABLE_PIN      65
77 
-#define E1_CS_PIN          33
85 
+#ifndef E1_CS_PIN
86 
+  #define E1_CS_PIN        33
87 
+#endif
78
88
79 
 #define E2_STEP_PIN        51
 89 
 #define E2_STEP_PIN        51
80 
 #define E2_DIR_PIN         53
 90 
 #define E2_DIR_PIN         53
81 
 #define E2_ENABLE_PIN      49
 91 
 #define E2_ENABLE_PIN      49
82 
-#define E2_CS_PIN          35
92 
+#ifndef E2_CS_PIN
93 
+  #define E2_CS_PIN        35
94 
+#endif
83
95
84 
 // For Extension Board V2
 96 
 // For Extension Board V2
85 
 // http://doku.radds.org/dokumentation/extension-board
 97 
 // http://doku.radds.org/dokumentation/extension-board
86 
 //#define E3_STEP_PIN        35
 98 
 //#define E3_STEP_PIN        35
87 
 //#define E3_DIR_PIN         33
 99 
 //#define E3_DIR_PIN         33
88 
 //#define E3_ENABLE_PIN      37
 100 
 //#define E3_ENABLE_PIN      37
89 
-//#define E3_CS_PIN           6
101 
+//#ifndef E3_CS_PIN
102 
+//  #define E3_CS_PIN         6
103 
+//#endif
90
104
91 
 //#define Z2_STEP_PIN        29
 105 
 //#define Z2_STEP_PIN        29
92 
 //#define Z2_DIR_PIN         27
 106 
 //#define Z2_DIR_PIN         27
93 
 //#define Z2_ENABLE_PIN      31
 107 
 //#define Z2_ENABLE_PIN      31
94 
-//#define Z2_CS_PIN          39
108 
+//#ifndef Z2_CS_PIN
109 
+//  #define Z2_CS_PIN        39
110 
+//#endif
95
111
96 
 // Microstepping pins - Mapping not from fastio.h (?)
 112 
 // Microstepping pins - Mapping not from fastio.h (?)
97 
 //#define E3_MS1_PIN         67
 113 
 //#define E3_MS1_PIN         67

+ 18
- 6
Marlin/src/pins/pins_RAMPS_FD_V1.h View File

63 
 #define X_STEP_PIN         63
 63 
 #define X_STEP_PIN         63
64 
 #define X_DIR_PIN          62
 64 
 #define X_DIR_PIN          62
65 
 #define X_ENABLE_PIN       48
 65 
 #define X_ENABLE_PIN       48
66 
-#define X_CS_PIN           68
66 
+#ifdef X_CS_PIN
67 
+  #define X_CS_PIN         68
68 
+#endif
67
69
68 
 #define Y_STEP_PIN         65
 70 
 #define Y_STEP_PIN         65
69 
 #define Y_DIR_PIN          64
 71 
 #define Y_DIR_PIN          64
70 
 #define Y_ENABLE_PIN       46
 72 
 #define Y_ENABLE_PIN       46
71 
-#define Y_CS_PIN           60
73 
+#ifdef Y_CS_PIN
74 
+  #define Y_CS_PIN         60
75 
+#endif
72
76
73 
 #define Z_STEP_PIN         67
 77 
 #define Z_STEP_PIN         67
74 
 #define Z_DIR_PIN          66
 78 
 #define Z_DIR_PIN          66
75 
 #define Z_ENABLE_PIN       44
 79 
 #define Z_ENABLE_PIN       44
76 
-#define Z_CS_PIN           58
80 
+#ifdef Z_CS_PIN
81 
+  #define Z_CS_PIN         58
82 
+#endif
77
83
78 
 #define E0_STEP_PIN        36
 84 
 #define E0_STEP_PIN        36
79 
 #define E0_DIR_PIN         28
 85 
 #define E0_DIR_PIN         28
80 
 #define E0_ENABLE_PIN      42
 86 
 #define E0_ENABLE_PIN      42
81 
-#define E0_CS_PIN          67
87 
+#ifdef E0_CS_PIN
88 
+  #define E0_CS_PIN        67
89 
+#endif
82
90
83 
 #define E1_STEP_PIN        43
 91 
 #define E1_STEP_PIN        43
84 
 #define E1_DIR_PIN         41
 92 
 #define E1_DIR_PIN         41
85 
 #define E1_ENABLE_PIN      39
 93 
 #define E1_ENABLE_PIN      39
86 
-#define E1_CS_PIN          61
94 
+#ifdef E1_CS_PIN
95 
+  #define E1_CS_PIN        61
96 
+#endif
87
97
88 
 #define E2_STEP_PIN        32
 98 
 #define E2_STEP_PIN        32
89 
 #define E2_DIR_PIN         47
 99 
 #define E2_DIR_PIN         47
90 
 #define E2_ENABLE_PIN      45
 100 
 #define E2_ENABLE_PIN      45
91 
-#define E2_CS_PIN          59
101 
+#ifdef E2_CS_PIN
102 
+  #define E2_CS_PIN        59
103 
+#endif
92
104
93 
 //
 105 
 //
94 
 // Temperature Sensors
 106 
 // Temperature Sensors

+ 18
- 6
Marlin/src/pins/pins_RAMPS_RE_ARM.h View File

68 
 #define X_STEP_PIN         P2_01  // (54)
 68 
 #define X_STEP_PIN         P2_01  // (54)
69 
 #define X_DIR_PIN          P0_11  // (55)
 69 
 #define X_DIR_PIN          P0_11  // (55)
70 
 #define X_ENABLE_PIN       P0_10  // (38)
 70 
 #define X_ENABLE_PIN       P0_10  // (38)
71 
-#define X_CS_PIN           P1_01  // ETH
71 
+#ifndef X_CS_PIN
72 
+  #define X_CS_PIN         P1_01  // ETH
73 
+#endif
72
74
73 
 #define Y_STEP_PIN         P2_02  // (60)
 75 
 #define Y_STEP_PIN         P2_02  // (60)
74 
 #define Y_DIR_PIN          P0_20  // (61)
 76 
 #define Y_DIR_PIN          P0_20  // (61)
75 
 #define Y_ENABLE_PIN       P0_19  // (56)
 77 
 #define Y_ENABLE_PIN       P0_19  // (56)
76 
-#define Y_CS_PIN           P1_04  // ETH
78 
+#ifndef Y_CS_PIN
79 
+  #define Y_CS_PIN         P1_04  // ETH
80 
+#endif
77
81
78 
 #define Z_STEP_PIN         P2_03  // (46)
 82 
 #define Z_STEP_PIN         P2_03  // (46)
79 
 #define Z_DIR_PIN          P0_22  // (48)
 83 
 #define Z_DIR_PIN          P0_22  // (48)
80 
 #define Z_ENABLE_PIN       P0_21  // (62)
 84 
 #define Z_ENABLE_PIN       P0_21  // (62)
81 
-#define Z_CS_PIN           P1_10  // ETH
85 
+#ifndef Z_CS_PIN
86 
+  #define Z_CS_PIN         P1_10  // ETH
87 
+#endif
82
88
83 
 #define E0_STEP_PIN        P2_00  // (26)
 89 
 #define E0_STEP_PIN        P2_00  // (26)
84 
 #define E0_DIR_PIN         P0_05  // (28)
 90 
 #define E0_DIR_PIN         P0_05  // (28)
85 
 #define E0_ENABLE_PIN      P0_04  // (24)
 91 
 #define E0_ENABLE_PIN      P0_04  // (24)
86 
-#define E0_CS_PIN          P1_14  // ETH
92 
+#ifndef E0_CS_PIN
93 
+  #define E0_CS_PIN        P1_14  // ETH
94 
+#endif
87
95
88 
 #define E1_STEP_PIN        P2_08  // (36)
 96 
 #define E1_STEP_PIN        P2_08  // (36)
89 
 #define E1_DIR_PIN         P2_13  // (34)
 97 
 #define E1_DIR_PIN         P2_13  // (34)
90 
 #define E1_ENABLE_PIN      P4_29  // (30)
 98 
 #define E1_ENABLE_PIN      P4_29  // (30)
91 
-#define E1_CS_PIN          -1
99 
+#ifndef E1_CS_PIN
100 
+  #define E1_CS_PIN        -1
101 
+#endif
92
102
93 
 #define E2_STEP_PIN        P2_08  // (36)
 103 
 #define E2_STEP_PIN        P2_08  // (36)
94 
 #define E2_DIR_PIN         P2_13  // (34)
 104 
 #define E2_DIR_PIN         P2_13  // (34)
95 
 #define E2_ENABLE_PIN      P4_29  // (30)
 105 
 #define E2_ENABLE_PIN      P4_29  // (30)
96 
-#define E2_CS_PIN          -1
106 
+#ifndef E2_CS_PIN
107 
+  #define E2_CS_PIN        -1
108 
+#endif
97
109
98 
 //
 110 
 //
99 
 // Software SPI pins for TMC2130 stepper drivers
 111 
 // Software SPI pins for TMC2130 stepper drivers

+ 8
- 7
Marlin/src/pins/pins_RURAMPS4D.h View File

63 
 #define X_STEP_PIN         37 // Support Extension Board
 63 
 #define X_STEP_PIN         37 // Support Extension Board
64 
 #define X_DIR_PIN          36
 64 
 #define X_DIR_PIN          36
65 
 #define X_ENABLE_PIN       38
 65 
 #define X_ENABLE_PIN       38
66 
-#define X_CS_PIN           -1
67
66
68 
 #define Y_STEP_PIN         32 // Support Extension Board
 67 
 #define Y_STEP_PIN         32 // Support Extension Board
69 
 #define Y_DIR_PIN          35
 68 
 #define Y_DIR_PIN          35
70 
 #define Y_ENABLE_PIN       34
 69 
 #define Y_ENABLE_PIN       34
71 
-#define Y_CS_PIN           -1
72
70
73 
 #define Z_STEP_PIN         30 // Support Extension Board
 71 
 #define Z_STEP_PIN         30 // Support Extension Board
74 
 #define Z_DIR_PIN           2
 72 
 #define Z_DIR_PIN           2
75 
 #define Z_ENABLE_PIN       33
 73 
 #define Z_ENABLE_PIN       33
76 
-#define Z_CS_PIN           -1
77
74
78 
 #define E0_STEP_PIN        29
 75 
 #define E0_STEP_PIN        29
79 
 #define E0_DIR_PIN         28
 76 
 #define E0_DIR_PIN         28
80 
 #define E0_ENABLE_PIN      31
 77 
 #define E0_ENABLE_PIN      31
81 
-#define E0_CS_PIN          -1
82
78
83 
 #define E1_STEP_PIN        22
 79 
 #define E1_STEP_PIN        22
84 
 #define E1_DIR_PIN         24
 80 
 #define E1_DIR_PIN         24
85 
 #define E1_ENABLE_PIN      26
 81 
 #define E1_ENABLE_PIN      26
86 
-#define E1_CS_PIN          -1
87
82
88 
 #define E2_STEP_PIN        25
 83 
 #define E2_STEP_PIN        25
89 
 #define E2_DIR_PIN         23
 84 
 #define E2_DIR_PIN         23
90 
 #define E2_ENABLE_PIN      27
 85 
 #define E2_ENABLE_PIN      27
91 
-#define E2_CS_PIN          -1
92
86
93 
 #define E3_STEP_PIN        15 // Only For Extension Board
 87 
 #define E3_STEP_PIN        15 // Only For Extension Board
94 
 #define E3_DIR_PIN         14
 88 
 #define E3_DIR_PIN         14
95 
 #define E3_ENABLE_PIN      61
 89 
 #define E3_ENABLE_PIN      61
96 
-#define E3_CS_PIN          -1
90 
+
91 
+//#define X_CS_PIN           -1
92 
+//#define Y_CS_PIN           -1
93 
+//#define Z_CS_PIN           -1
94 
+//#define E0_CS_PIN          -1
95 
+//#define E1_CS_PIN          -1
96 
+//#define E2_CS_PIN          -1
97 
+//#define E3_CS_PIN          -1
97
98
98 
 // For Future: Microstepping pins - Mapping not from fastio.h (?)
 99 
 // For Future: Microstepping pins - Mapping not from fastio.h (?)
99 
 //#define E3_MS1_PIN         ?
 100 
 //#define E3_MS1_PIN         ?

Write Preview
Loading…
Cancel
Save