浏览代码

Tweak some pins formatting

Scott Lahteine 6 年前
父节点
当前提交
ca1be02bf0
共有 3 个文件被更改,包括 73 次插入76 次删除
  1. 4
    6
      Marlin/src/pins/pins_3DRAG.h
  2. 3
    4
      Marlin/src/pins/pins_K8400.h
  3. 66
    66
      Marlin/src/pins/pins_RAMPS.h

+ 4
- 6
Marlin/src/pins/pins_3DRAG.h 查看文件

@@ -39,11 +39,11 @@
39 39
 //
40 40
 // Heaters / Fans
41 41
 //
42
-#define RAMPS_D8_PIN 9
43
-#define RAMPS_D9_PIN 8
44
-#define MOSFET_D_PIN 12
42
+#define RAMPS_D8_PIN        9
43
+#define RAMPS_D9_PIN        8
44
+#define MOSFET_D_PIN       12
45 45
 
46
-#define CASE_LIGHT_PIN -1     // MUST BE HARDWARE PWM but one is not available on expansion header
46
+#define CASE_LIGHT_PIN     -1   // MUST BE HARDWARE PWM but one is not available on expansion header
47 47
 
48 48
 #include "pins_RAMPS.h"
49 49
 
@@ -51,7 +51,6 @@
51 51
 // Limit Switches
52 52
 //
53 53
 #undef Z_MAX_PIN
54
-#define Z_MAX_PIN          -1
55 54
 
56 55
 //
57 56
 // Steppers
@@ -78,7 +77,6 @@
78 77
 //
79 78
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
80 79
   #undef BEEPER_PIN
81
-  #define BEEPER_PIN       -1
82 80
 
83 81
   #undef LCD_PINS_RS
84 82
   #undef LCD_PINS_ENABLE

+ 3
- 4
Marlin/src/pins/pins_K8400.h 查看文件

@@ -31,9 +31,8 @@
31 31
  *  - Second heater has moved pin
32 32
  */
33 33
 
34
-#define BOARD_NAME              "K8400"
35 34
 #define DEFAULT_MACHINE_NAME    "Vertex"
36
-#define DEFAULT_SOURCE_CODE_URL "https://github.com/birkett/Vertex-K8400-Firmware"
35
+#define BOARD_NAME              "K8400"
37 36
 
38 37
 #include "pins_3DRAG.h"
39 38
 
@@ -52,13 +51,13 @@
52 51
 // Steppers
53 52
 //
54 53
 #undef E1_STEP_PIN
55
-#define E1_STEP_PIN   32
54
+#define E1_STEP_PIN 32
56 55
 
57 56
 //
58 57
 // Heaters / Fans
59 58
 //
60 59
 #undef HEATER_1_PIN
61
-#define HEATER_1_PIN  11
60
+#define HEATER_1_PIN 11
62 61
 
63 62
 //
64 63
 // Misc. Functions

+ 66
- 66
Marlin/src/pins/pins_RAMPS.h 查看文件

@@ -131,71 +131,6 @@
131 131
   #define E1_CS_PIN        44
132 132
 #endif
133 133
 
134
-/**
135
- * Default pins for TMC software SPI
136
- */
137
-#if ENABLED(TMC_USE_SW_SPI)
138
-  #ifndef TMC_SW_MOSI
139
-    #define TMC_SW_MOSI    66
140
-  #endif
141
-  #ifndef TMC_SW_MISO
142
-    #define TMC_SW_MISO    44
143
-  #endif
144
-  #ifndef TMC_SW_SCK
145
-    #define TMC_SW_SCK     64
146
-  #endif
147
-#endif
148
-
149
-#if HAS_DRIVER(TMC2208)
150
-  /**
151
-   * TMC2208 stepper drivers
152
-   *
153
-   * Hardware serial communication ports.
154
-   * If undefined software serial is used according to the pins below
155
-   */
156
-  //#define X_HARDWARE_SERIAL  Serial1
157
-  //#define X2_HARDWARE_SERIAL Serial1
158
-  //#define Y_HARDWARE_SERIAL  Serial1
159
-  //#define Y2_HARDWARE_SERIAL Serial1
160
-  //#define Z_HARDWARE_SERIAL  Serial1
161
-  //#define Z2_HARDWARE_SERIAL Serial1
162
-  //#define E0_HARDWARE_SERIAL Serial1
163
-  //#define E1_HARDWARE_SERIAL Serial1
164
-  //#define E2_HARDWARE_SERIAL Serial1
165
-  //#define E3_HARDWARE_SERIAL Serial1
166
-  //#define E4_HARDWARE_SERIAL Serial1
167
-
168
-  /**
169
-   * Software serial
170
-   */
171
-
172
-  #define X_SERIAL_TX_PIN    40
173
-  #define X_SERIAL_RX_PIN    63
174
-  #define X2_SERIAL_TX_PIN   -1
175
-  #define X2_SERIAL_RX_PIN   -1
176
-
177
-  #define Y_SERIAL_TX_PIN    59
178
-  #define Y_SERIAL_RX_PIN    64
179
-  #define Y2_SERIAL_TX_PIN   -1
180
-  #define Y2_SERIAL_RX_PIN   -1
181
-
182
-  #define Z_SERIAL_TX_PIN    42
183
-  #define Z_SERIAL_RX_PIN    65
184
-  #define Z2_SERIAL_TX_PIN   -1
185
-  #define Z2_SERIAL_RX_PIN   -1
186
-
187
-  #define E0_SERIAL_TX_PIN   44
188
-  #define E0_SERIAL_RX_PIN   66
189
-  #define E1_SERIAL_TX_PIN   -1
190
-  #define E1_SERIAL_RX_PIN   -1
191
-  #define E2_SERIAL_TX_PIN   -1
192
-  #define E2_SERIAL_RX_PIN   -1
193
-  #define E3_SERIAL_TX_PIN   -1
194
-  #define E3_SERIAL_RX_PIN   -1
195
-  #define E4_SERIAL_TX_PIN   -1
196
-  #define E4_SERIAL_RX_PIN   -1
197
-#endif
198
-
199 134
 //
200 135
 // Temperature Sensors
201 136
 //
@@ -285,7 +220,7 @@
285 220
   #define FILWIDTH_PIN      5   // Analog Input on AUX2
286 221
 #endif
287 222
 
288
-// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
223
+// RAMPS 1.4 DIO 4 on the servos connector
289 224
 #ifndef FIL_RUNOUT_PIN
290 225
   #define FIL_RUNOUT_PIN    4
291 226
 #endif
@@ -320,6 +255,71 @@
320 255
 #endif
321 256
 
322 257
 //
258
+// TMC software SPI
259
+//
260
+#if ENABLED(TMC_USE_SW_SPI)
261
+  #ifndef TMC_SW_MOSI
262
+    #define TMC_SW_MOSI    66
263
+  #endif
264
+  #ifndef TMC_SW_MISO
265
+    #define TMC_SW_MISO    44
266
+  #endif
267
+  #ifndef TMC_SW_SCK
268
+    #define TMC_SW_SCK     64
269
+  #endif
270
+#endif
271
+
272
+#if HAS_DRIVER(TMC2208)
273
+  /**
274
+   * TMC2208 stepper drivers
275
+   *
276
+   * Hardware serial communication ports.
277
+   * If undefined software serial is used according to the pins below
278
+   */
279
+  //#define X_HARDWARE_SERIAL  Serial1
280
+  //#define X2_HARDWARE_SERIAL Serial1
281
+  //#define Y_HARDWARE_SERIAL  Serial1
282
+  //#define Y2_HARDWARE_SERIAL Serial1
283
+  //#define Z_HARDWARE_SERIAL  Serial1
284
+  //#define Z2_HARDWARE_SERIAL Serial1
285
+  //#define E0_HARDWARE_SERIAL Serial1
286
+  //#define E1_HARDWARE_SERIAL Serial1
287
+  //#define E2_HARDWARE_SERIAL Serial1
288
+  //#define E3_HARDWARE_SERIAL Serial1
289
+  //#define E4_HARDWARE_SERIAL Serial1
290
+
291
+  //
292
+  // Software serial
293
+  //
294
+
295
+  #define X_SERIAL_TX_PIN    40
296
+  #define X_SERIAL_RX_PIN    63
297
+  #define X2_SERIAL_TX_PIN   -1
298
+  #define X2_SERIAL_RX_PIN   -1
299
+
300
+  #define Y_SERIAL_TX_PIN    59
301
+  #define Y_SERIAL_RX_PIN    64
302
+  #define Y2_SERIAL_TX_PIN   -1
303
+  #define Y2_SERIAL_RX_PIN   -1
304
+
305
+  #define Z_SERIAL_TX_PIN    42
306
+  #define Z_SERIAL_RX_PIN    65
307
+  #define Z2_SERIAL_TX_PIN   -1
308
+  #define Z2_SERIAL_RX_PIN   -1
309
+
310
+  #define E0_SERIAL_TX_PIN   44
311
+  #define E0_SERIAL_RX_PIN   66
312
+  #define E1_SERIAL_TX_PIN   -1
313
+  #define E1_SERIAL_RX_PIN   -1
314
+  #define E2_SERIAL_TX_PIN   -1
315
+  #define E2_SERIAL_RX_PIN   -1
316
+  #define E3_SERIAL_TX_PIN   -1
317
+  #define E3_SERIAL_RX_PIN   -1
318
+  #define E4_SERIAL_TX_PIN   -1
319
+  #define E4_SERIAL_RX_PIN   -1
320
+#endif
321
+
322
+//
323 323
 // Průša i3 MK2 Multiplexer Support
324 324
 //
325 325
 #ifndef E_MUX0_PIN

正在加载...
取消
保存