Procházet zdrojové kódy

Cleanup pins spacing

Scott Lahteine před 7 roky
rodič
revize
c272f2c84e

+ 1
- 1
Marlin/src/pins/pins.h Zobrazit soubor

45
   #define IS_RAMPS_EFF
45
   #define IS_RAMPS_EFF
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)
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
   #define IS_RAMPS_EEF
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
   #define IS_RAMPS_SF
49
   #define IS_RAMPS_SF
50
 #endif
50
 #endif
51
 
51
 

+ 1
- 1
Marlin/src/pins/pinsDebug_list.h Zobrazit soubor

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

+ 3
- 3
Marlin/src/pins/pins_DUE3DOM.h Zobrazit soubor

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

+ 3
- 3
Marlin/src/pins/pins_DUE3DOM_MINI.h Zobrazit soubor

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

+ 2
- 2
Marlin/src/pins/pins_RAMPS.h Zobrazit soubor

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

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

+ 12
- 12
Marlin/src/pins/pins_TEENSY35_36.h Zobrazit soubor

2
 * Teensy 3.5 (MK64FX512) and Teensy 3.6 (MK66FX1M0) Breadboard pin assignments
2
 * Teensy 3.5 (MK64FX512) and Teensy 3.6 (MK66FX1M0) Breadboard pin assignments
3
 * Requires the Teensyduino software with Teensy 3.5 or Teensy 3.6 selected in Arduino IDE!
3
 * Requires the Teensyduino software with Teensy 3.5 or Teensy 3.6 selected in Arduino IDE!
4
 * http://www.pjrc.com/teensy/teensyduino.html
4
 * http://www.pjrc.com/teensy/teensyduino.html
5
-* 
5
+*
6
 ****************************************************************************************/
6
 ****************************************************************************************/
7
 #if MOTHERBOARD == 841 // BOARD_TEENSY35_36
7
 #if MOTHERBOARD == 841 // BOARD_TEENSY35_36
8
 #define KNOWN_BOARD 1
8
 #define KNOWN_BOARD 1
21
 #define LARGE_FLASH        true
21
 #define LARGE_FLASH        true
22
 #define USBCON //1286  // Disable MarlinSerial etc.
22
 #define USBCON //1286  // Disable MarlinSerial etc.
23
 
23
 
24
-/* 
24
+/*
25
 teemuatlut plan for Teensy3.5 and Teensy3.6:
25
 teemuatlut plan for Teensy3.5 and Teensy3.6:
26
 
26
 
27
                                                      USB
27
                                                      USB
109
 #define SOL1_PIN           28
109
 #define SOL1_PIN           28
110
 
110
 
111
 #ifndef SDSUPPORT
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
   #define SCK_PIN          13
113
   #define SCK_PIN          13
114
   #define MISO_PIN         12
114
   #define MISO_PIN         12
115
   #define MOSI_PIN         11
115
   #define MOSI_PIN         11
116
 #endif
116
 #endif
117
 
117
 
118
 #ifdef ULTRA_LCD
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
 #endif
128
 #endif
129
 
129
 
130
 #endif  // MOTHERBOARD == 841 (Teensy3.5 and Teensy3.6)
130
 #endif  // MOTHERBOARD == 841 (Teensy3.5 and Teensy3.6)

Loading…
Zrušit
Uložit