浏览代码

Cleanup pins spacing

Scott Lahteine 7 年前
父节点
当前提交
c272f2c84e

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

@@ -45,7 +45,7 @@
45 45
   #define IS_RAMPS_EFF
46 46
 #elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF)
47 47
   #define IS_RAMPS_EEF
48
-#elif MB(RAMPS_13_SF)  || MB(RAMPS_14_SF)  || MB(RAMPS_14_RE_ARM_SF)  || MB(RAMPS_SMART_SF)  || MB(RAMPS_DUO_SF)  || MB(RAMPS4DUE_SF) 
48
+#elif MB(RAMPS_13_SF)  || MB(RAMPS_14_SF)  || MB(RAMPS_14_RE_ARM_SF)  || MB(RAMPS_SMART_SF)  || MB(RAMPS_DUO_SF)  || MB(RAMPS4DUE_SF)
49 49
   #define IS_RAMPS_SF
50 50
 #endif
51 51
 

+ 1
- 1
Marlin/src/pins/pinsDebug_list.h 查看文件

@@ -358,7 +358,7 @@
358 358
 #endif
359 359
 #if PIN_EXISTS(FAN)
360 360
   REPORT_NAME_DIGITAL(FAN_PIN, __LINE__ )
361
-#endif 
361
+#endif
362 362
 #if PIN_EXISTS(FAN1)
363 363
   REPORT_NAME_DIGITAL(FAN1_PIN, __LINE__ )
364 364
 #endif

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

@@ -123,7 +123,7 @@
123 123
 
124 124
     #define BTN_EN1         50
125 125
     #define BTN_EN2         52
126
-    #define BTN_ENC         48    
126
+    #define BTN_ENC         48
127 127
 
128 128
     #define SDSS             4
129 129
     #define SD_DETECT_PIN   14
@@ -135,9 +135,9 @@
135 135
     #define BTN_EN1         50
136 136
     #define BTN_EN2         52
137 137
     #define BTN_ENC         48
138
-      
138
+
139 139
     #define BTN_BACK        71
140
-    
140
+
141 141
     #undef SDSS
142 142
     #define SDSS             4
143 143
     #define SD_DETECT_PIN   14

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

@@ -115,7 +115,7 @@
115 115
 
116 116
     #define BTN_EN1         50
117 117
     #define BTN_EN2         52
118
-    #define BTN_ENC         48    
118
+    #define BTN_ENC         48
119 119
 
120 120
     #define SDSS             4
121 121
     #define SD_DETECT_PIN   14
@@ -127,9 +127,9 @@
127 127
     #define BTN_EN1         50
128 128
     #define BTN_EN2         52
129 129
     #define BTN_ENC         48
130
-      
130
+
131 131
     #define BTN_BACK        71
132
-    
132
+
133 133
     #undef SDSS
134 134
     #define SDSS             4
135 135
     #define SD_DETECT_PIN   14

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

@@ -46,8 +46,8 @@
46 46
 
47 47
 #if ENABLED(IS_REARM)
48 48
   #error "Oops!  use 'pins_RAMPS_RE_ARM.h' when Re-Arm is used."
49
-#endif 
50
- 
49
+#endif
50
+
51 51
 #if !ENABLED(IS_RAMPS_SMART) && !ENABLED(IS_RAMPS_DUO) && !ENABLED(IS_RAMPS4DUE) && !ENABLED(TARGET_LPC1768)
52 52
   #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
53 53
     #error "Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."

+ 10
- 10
Marlin/src/pins/pins_RAMPS_RE_ARM.h 查看文件

@@ -248,12 +248,12 @@
248 248
   #define DOGLCD_CS           63  // J5-3 & AUX-2
249 249
 
250 250
 #ifdef ULTIPANEL
251
-  
251
+
252 252
   #define LCD_PINS_D5         71  // ENET_MDIO
253 253
   #define LCD_PINS_D6         73  // ENET_RX_ER
254 254
   #define LCD_PINS_D7         75  // ENET_RXD1
255 255
 #endif
256
- 
256
+
257 257
   #if ENABLED(NEWPANEL)
258 258
     #if ENABLED(REPRAPWORLD_KEYPAD)
259 259
       #define SHIFT_OUT         51  // (MOSI) J3-10 & AUX-3
@@ -287,12 +287,12 @@
287 287
 
288 288
  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
289 289
 //    #define LCD_SCREEN_ROT_180
290
-    
290
+
291 291
     #define SOFTWARE_SPI  // temp to see if it fixes the  "not found" error
292
-    
292
+
293 293
     #undef  BEEPER_PIN
294 294
     #define BEEPER_PIN          37  // may change if cable changes
295
-    
295
+
296 296
     #define BTN_EN1             31  // J3-2 & AUX-4
297 297
     #define BTN_EN2             33  // J3-4 & AUX-4
298 298
     #define BTN_ENC             35  // J3-3 & AUX-4
@@ -301,7 +301,7 @@
301 301
     #define KILL_PIN            41  // J5-4 & AUX-4
302 302
 
303 303
     #undef  DOGLCD_CS
304
-    #define DOGLCD_CS           16 
304
+    #define DOGLCD_CS           16
305 305
     #undef  LCD_BACKLIGHT_PIN   //16  // J3-7 & AUX-4 - only used on DOGLCD controllers
306 306
     #undef  LCD_PINS_ENABLE     //51  // (MOSI) J3-10 & AUX-3
307 307
     #undef  LCD_PINS_D4         //52  // (SCK)  J3-9 & AUX-3
@@ -310,9 +310,9 @@
310 310
     #define DOGLCD_A0           59  // J3-8 & AUX-2
311 311
     #undef  LCD_PINS_D6         //63  // J5-3 & AUX-2
312 312
     #undef  LCD_PINS_D7          //6  // (SERVO1) J5-1 & SERVO connector
313
-    #define DOGLCD_SCK SCK_PIN 
313
+    #define DOGLCD_SCK SCK_PIN
314 314
     #define DOGLCD_MOSI MOSI_PIN
315
- 
315
+
316 316
     #define STAT_LED_BLUE_PIN   63  // may change if cable changes
317 317
     #define STAT_LED_RED_PIN     6  // may change if cable changes
318 318
   #endif
@@ -320,8 +320,8 @@
320 320
   //#define MOSI_PIN            51  // system defined J3-10 & AUX-3
321 321
   //#define SCK_PIN             52  // system defined J3-9 & AUX-3
322 322
   //#define SS_PIN              53  // system defined J3-5 & AUX-3 - sometimes called SDSS
323
-  
324
-  
323
+
324
+
325 325
   #if ENABLED(MINIPANEL)
326 326
     // GLCD features
327 327
     //#define LCD_CONTRAST   190

+ 12
- 12
Marlin/src/pins/pins_TEENSY35_36.h 查看文件

@@ -2,7 +2,7 @@
2 2
 * Teensy 3.5 (MK64FX512) and Teensy 3.6 (MK66FX1M0) Breadboard pin assignments
3 3
 * Requires the Teensyduino software with Teensy 3.5 or Teensy 3.6 selected in Arduino IDE!
4 4
 * http://www.pjrc.com/teensy/teensyduino.html
5
-* 
5
+*
6 6
 ****************************************************************************************/
7 7
 #if MOTHERBOARD == 841 // BOARD_TEENSY35_36
8 8
 #define KNOWN_BOARD 1
@@ -21,7 +21,7 @@
21 21
 #define LARGE_FLASH        true
22 22
 #define USBCON //1286  // Disable MarlinSerial etc.
23 23
 
24
-/* 
24
+/*
25 25
 teemuatlut plan for Teensy3.5 and Teensy3.6:
26 26
 
27 27
                                                      USB
@@ -109,22 +109,22 @@ D8    HEATER_BED_PIN      CS1     RX4  A12 31 |   46 * * 47   | 34 A15 PWM
109 109
 #define SOL1_PIN           28
110 110
 
111 111
 #ifndef SDSUPPORT
112
-// these pins are defined in the SD library if building with SD support
112
+  // these are defined in the SD library if building with SD support
113 113
   #define SCK_PIN          13
114 114
   #define MISO_PIN         12
115 115
   #define MOSI_PIN         11
116 116
 #endif
117 117
 
118 118
 #ifdef ULTRA_LCD
119
-  #define LCD_PINS_RS        40
120
-  #define LCD_PINS_ENABLE    41
121
-  #define LCD_PINS_D4        42
122
-  #define LCD_PINS_D5        43
123
-  #define LCD_PINS_D6        44
124
-  #define LCD_PINS_D7        45
125
-  #define BTN_EN1            46
126
-  #define BTN_EN2            47
127
-  #define BTN_ENC            48
119
+  #define LCD_PINS_RS      40
120
+  #define LCD_PINS_ENABLE  41
121
+  #define LCD_PINS_D4      42
122
+  #define LCD_PINS_D5      43
123
+  #define LCD_PINS_D6      44
124
+  #define LCD_PINS_D7      45
125
+  #define BTN_EN1          46
126
+  #define BTN_EN2          47
127
+  #define BTN_ENC          48
128 128
 #endif
129 129
 
130 130
 #endif  // MOTHERBOARD == 841 (Teensy3.5 and Teensy3.6)

正在加载...
取消
保存