Browse Source

Space out some pins lines

Scott Lahteine 7 years ago
parent
commit
da7c51d820

+ 1
- 1
Marlin/src/pins/pins_ANET_10.h View File

148
  *  ZONESTAR_LCD
148
  *  ZONESTAR_LCD
149
  *  ANET_FULL_GRAPHICS_LCD
149
  *  ANET_FULL_GRAPHICS_LCD
150
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
150
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
151
-*/
151
+ */
152
 
152
 
153
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
153
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
154
   #define LCD_SDSS           28
154
   #define LCD_SDSS           28

+ 1
- 1
Marlin/src/pins/pins_AZTEEG_X3_PRO.h View File

41
   #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
41
   #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
42
 #endif
42
 #endif
43
 
43
 
44
-//DIGIPOT slave addresses
44
+// DIGIPOT slave addresses
45
 #define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
45
 #define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
46
 #define DIGIPOT_I2C_ADDRESS_B 0x2E  // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
46
 #define DIGIPOT_I2C_ADDRESS_B 0x2E  // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
47
 
47
 

+ 3
- 0
Marlin/src/pins/pins_BEAST.h View File

213
       #define STAT_LED_BLUE_PIN 35
213
       #define STAT_LED_BLUE_PIN 35
214
 
214
 
215
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
215
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
216
+
216
       #define BTN_EN1           35
217
       #define BTN_EN1           35
217
       #define BTN_EN2           37
218
       #define BTN_EN2           37
218
       #define BTN_ENC           31
219
       #define BTN_ENC           31
223
       #define DOGLCD_CS         29
224
       #define DOGLCD_CS         29
224
       #define DOGLCD_A0         27
225
       #define DOGLCD_A0         27
225
       #define LCD_BACKLIGHT_PIN 33
226
       #define LCD_BACKLIGHT_PIN 33
227
+
226
     #elif ENABLED(MINIPANEL)
228
     #elif ENABLED(MINIPANEL)
229
+
227
       #define BEEPER_PIN        42
230
       #define BEEPER_PIN        42
228
       // Pins for DOGM SPI LCD Support
231
       // Pins for DOGM SPI LCD Support
229
       #define DOGLCD_A0         44
232
       #define DOGLCD_A0         44

+ 2
- 0
Marlin/src/pins/pins_CHITU3D.h View File

222
       #define DOGLCD_CS         29
222
       #define DOGLCD_CS         29
223
       #define DOGLCD_A0         27
223
       #define DOGLCD_A0         27
224
       #define LCD_BACKLIGHT_PIN 33
224
       #define LCD_BACKLIGHT_PIN 33
225
+
225
     #elif ENABLED(MINIPANEL)
226
     #elif ENABLED(MINIPANEL)
227
+
226
       #define BEEPER_PIN        42
228
       #define BEEPER_PIN        42
227
       // Pins for DOGM SPI LCD Support
229
       // Pins for DOGM SPI LCD Support
228
       #define DOGLCD_A0         44
230
       #define DOGLCD_A0         44

+ 5
- 1
Marlin/src/pins/pins_DUE3DOM.h View File

111
 // LCD / Controller
111
 // LCD / Controller
112
 //
112
 //
113
 #if ENABLED(ULTRA_LCD)
113
 #if ENABLED(ULTRA_LCD)
114
+
114
   #define LCD_PINS_RS       42
115
   #define LCD_PINS_RS       42
115
   #define LCD_PINS_ENABLE   43
116
   #define LCD_PINS_ENABLE   43
116
   #define LCD_PINS_D4       44
117
   #define LCD_PINS_D4       44
119
   #define LCD_PINS_D7       47
120
   #define LCD_PINS_D7       47
120
 
121
 
121
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
122
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
123
+
122
     #define BEEPER_PIN      41
124
     #define BEEPER_PIN      41
123
 
125
 
124
     #define BTN_EN1         50
126
     #define BTN_EN1         50
128
     #define SDSS             4
130
     #define SDSS             4
129
     #define SD_DETECT_PIN   14
131
     #define SD_DETECT_PIN   14
130
 
132
 
131
-  // RADDS LCD panel
132
   #elif ENABLED(RADDS_DISPLAY)
133
   #elif ENABLED(RADDS_DISPLAY)
134
+
133
     #define BEEPER_PIN      41
135
     #define BEEPER_PIN      41
134
 
136
 
135
     #define BTN_EN1         50
137
     #define BTN_EN1         50
143
     #define SD_DETECT_PIN   14
145
     #define SD_DETECT_PIN   14
144
 
146
 
145
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
147
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
148
+
146
     #define BTN_EN1         50
149
     #define BTN_EN1         50
147
     #define BTN_EN2         52
150
     #define BTN_EN2         52
148
     #define BTN_ENC         48
151
     #define BTN_ENC         48
151
     #define SD_DETECT_PIN   14
154
     #define SD_DETECT_PIN   14
152
 
155
 
153
   #elif ENABLED(SPARK_FULL_GRAPHICS)
156
   #elif ENABLED(SPARK_FULL_GRAPHICS)
157
+
154
     #define LCD_PINS_D4     29
158
     #define LCD_PINS_D4     29
155
     #define LCD_PINS_ENABLE 27
159
     #define LCD_PINS_ENABLE 27
156
     #define LCD_PINS_RS     25
160
     #define LCD_PINS_RS     25

+ 7
- 3
Marlin/src/pins/pins_DUE3DOM_MINI.h View File

77
 
77
 
78
 // SPI for Max6675 or Max31855 Thermocouple
78
 // SPI for Max6675 or Max31855 Thermocouple
79
 #if DISABLED(SDSUPPORT)
79
 #if DISABLED(SDSUPPORT)
80
-  #define MAX6675_SS        53
80
+  #define MAX6675_SS       53
81
 #else
81
 #else
82
-  #define MAX6675_SS        53
82
+  #define MAX6675_SS       53
83
 #endif
83
 #endif
84
 
84
 
85
 //
85
 //
103
 // LCD / Controller
103
 // LCD / Controller
104
 //
104
 //
105
 #if ENABLED(ULTRA_LCD)
105
 #if ENABLED(ULTRA_LCD)
106
+
106
   #define LCD_PINS_RS       42
107
   #define LCD_PINS_RS       42
107
   #define LCD_PINS_ENABLE   43
108
   #define LCD_PINS_ENABLE   43
108
   #define LCD_PINS_D4       44
109
   #define LCD_PINS_D4       44
111
   #define LCD_PINS_D7       47
112
   #define LCD_PINS_D7       47
112
 
113
 
113
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
114
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
115
+
114
     #define BEEPER_PIN      41
116
     #define BEEPER_PIN      41
115
 
117
 
116
     #define BTN_EN1         50
118
     #define BTN_EN1         50
120
     #define SDSS             4
122
     #define SDSS             4
121
     #define SD_DETECT_PIN   14
123
     #define SD_DETECT_PIN   14
122
 
124
 
123
-  // RADDS LCD panel
124
   #elif ENABLED(RADDS_DISPLAY)
125
   #elif ENABLED(RADDS_DISPLAY)
126
+
125
     #define BEEPER_PIN      41
127
     #define BEEPER_PIN      41
126
 
128
 
127
     #define BTN_EN1         50
129
     #define BTN_EN1         50
135
     #define SD_DETECT_PIN   14
137
     #define SD_DETECT_PIN   14
136
 
138
 
137
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
139
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
140
+
138
     #define BTN_EN1         50
141
     #define BTN_EN1         50
139
     #define BTN_EN2         52
142
     #define BTN_EN2         52
140
     #define BTN_ENC         48
143
     #define BTN_ENC         48
143
     #define SD_DETECT_PIN   14
146
     #define SD_DETECT_PIN   14
144
 
147
 
145
   #elif ENABLED(SPARK_FULL_GRAPHICS)
148
   #elif ENABLED(SPARK_FULL_GRAPHICS)
149
+
146
     #define LCD_PINS_D4     29
150
     #define LCD_PINS_D4     29
147
     #define LCD_PINS_ENABLE 27
151
     #define LCD_PINS_ENABLE 27
148
     #define LCD_PINS_RS     25
152
     #define LCD_PINS_RS     25

+ 1
- 1
Marlin/src/pins/pins_MAKEBOARD_MINI.h View File

36
 #undef Z_MAX_PIN
36
 #undef Z_MAX_PIN
37
 #define X_STOP_PIN          2
37
 #define X_STOP_PIN          2
38
 #define Y_STOP_PIN         15
38
 #define Y_STOP_PIN         15
39
-#define Z_STOP_PIN         19
39
+#define Z_STOP_PIN         19

+ 2
- 0
Marlin/src/pins/pins_MEGACONTROLLER.h View File

133
 // LCD / Controller
133
 // LCD / Controller
134
 //
134
 //
135
 #if ENABLED(MINIPANEL)
135
 #if ENABLED(MINIPANEL)
136
+
136
   #define BEEPER_PIN       46
137
   #define BEEPER_PIN       46
137
   // Pins for DOGM SPI LCD Support
138
   // Pins for DOGM SPI LCD Support
138
   #define DOGLCD_A0        47
139
   #define DOGLCD_A0        47
152
   #define BTN_ENC          10
153
   #define BTN_ENC          10
153
 
154
 
154
   #define SD_DETECT_PIN    49
155
   #define SD_DETECT_PIN    49
156
+
155
 #endif // MINIPANEL
157
 #endif // MINIPANEL
156
 
158
 
157
 //
159
 //

+ 6
- 1
Marlin/src/pins/pins_RADDS.h View File

157
 // LCD / Controller
157
 // LCD / Controller
158
 //
158
 //
159
 #if ENABLED(ULTRA_LCD)
159
 #if ENABLED(ULTRA_LCD)
160
-  // RADDS LCD panel
160
+
161
   #if ENABLED(RADDS_DISPLAY)
161
   #if ENABLED(RADDS_DISPLAY)
162
+
162
     #define LCD_PINS_RS     42
163
     #define LCD_PINS_RS     42
163
     #define LCD_PINS_ENABLE 43
164
     #define LCD_PINS_ENABLE 43
164
     #define LCD_PINS_D4     44
165
     #define LCD_PINS_D4     44
179
     #define SD_DETECT_PIN   14
180
     #define SD_DETECT_PIN   14
180
 
181
 
181
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
182
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
183
+
182
     #define LCD_PINS_RS     46
184
     #define LCD_PINS_RS     46
183
     #define LCD_PINS_ENABLE 47
185
     #define LCD_PINS_ENABLE 47
184
     #define LCD_PINS_D4     44
186
     #define LCD_PINS_D4     44
190
     #define BTN_ENC         48
192
     #define BTN_ENC         48
191
 
193
 
192
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
194
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
195
+
193
     #define BTN_EN1         50
196
     #define BTN_EN1         50
194
     #define BTN_EN2         52
197
     #define BTN_EN2         52
195
     #define BTN_ENC         48
198
     #define BTN_ENC         48
198
     #define SD_DETECT_PIN   14
201
     #define SD_DETECT_PIN   14
199
 
202
 
200
   #elif ENABLED(SPARK_FULL_GRAPHICS)
203
   #elif ENABLED(SPARK_FULL_GRAPHICS)
204
+
201
     #define LCD_PINS_D4     29
205
     #define LCD_PINS_D4     29
202
     #define LCD_PINS_ENABLE 27
206
     #define LCD_PINS_ENABLE 27
203
     #define LCD_PINS_RS     25
207
     #define LCD_PINS_RS     25
207
     #define BTN_ENC         37
211
     #define BTN_ENC         37
208
 
212
 
209
   #endif // SPARK_FULL_GRAPHICS
213
   #endif // SPARK_FULL_GRAPHICS
214
+
210
 #endif // ULTRA_LCD
215
 #endif // ULTRA_LCD

+ 1
- 1
Marlin/src/pins/pins_RAMPS.h View File

155
   //#define X2_HARDWARE_SERIAL Serial1
155
   //#define X2_HARDWARE_SERIAL Serial1
156
   //#define Y_HARDWARE_SERIAL  Serial1
156
   //#define Y_HARDWARE_SERIAL  Serial1
157
   //#define Y2_HARDWARE_SERIAL Serial1
157
   //#define Y2_HARDWARE_SERIAL Serial1
158
-  //#define Z_HARDWARE_SERIAL  Serial3
158
+  //#define Z_HARDWARE_SERIAL  Serial1
159
   //#define Z2_HARDWARE_SERIAL Serial1
159
   //#define Z2_HARDWARE_SERIAL Serial1
160
   //#define E0_HARDWARE_SERIAL Serial1
160
   //#define E0_HARDWARE_SERIAL Serial1
161
   //#define E1_HARDWARE_SERIAL Serial1
161
   //#define E1_HARDWARE_SERIAL Serial1

+ 9
- 0
Marlin/src/pins/pins_RAMPS_DUO.h View File

77
 // LCD / Controller
77
 // LCD / Controller
78
 //
78
 //
79
 #if ENABLED(ULTRA_LCD)
79
 #if ENABLED(ULTRA_LCD)
80
+
80
   #if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
81
   #if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
81
     #undef LCD_PINS_D4
82
     #undef LCD_PINS_D4
82
     #define LCD_PINS_D4  68
83
     #define LCD_PINS_D4  68
89
   #endif
90
   #endif
90
 
91
 
91
   #if ENABLED(NEWPANEL)
92
   #if ENABLED(NEWPANEL)
93
+
92
     #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
94
     #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
95
+
93
       #undef BTN_EN1
96
       #undef BTN_EN1
94
       #define BTN_EN1 67
97
       #define BTN_EN1 67
95
 
98
 
96
       #undef BTN_ENC
99
       #undef BTN_ENC
97
       #define BTN_ENC 66
100
       #define BTN_ENC 66
101
+
98
     #elif ENABLED(MINIPANEL)
102
     #elif ENABLED(MINIPANEL)
103
+
99
       #undef DOGLCD_CS
104
       #undef DOGLCD_CS
100
       #define DOGLCD_CS    69
105
       #define DOGLCD_CS    69
101
 
106
 
107
 
112
 
108
       #undef BTN_EN2
113
       #undef BTN_EN2
109
       #define BTN_EN2      66
114
       #define BTN_EN2      66
115
+
110
     #else
116
     #else
117
+
111
       #if ENABLED(REPRAPWORLD_KEYPAD)
118
       #if ENABLED(REPRAPWORLD_KEYPAD)
112
         #undef BTN_EN1
119
         #undef BTN_EN1
113
         #define BTN_EN1    67 // encoder
120
         #define BTN_EN1    67 // encoder
119
         #define BTN_EN2    66 // AUX2 PIN 4
126
         #define BTN_EN2    66 // AUX2 PIN 4
120
       #endif
127
       #endif
121
     #endif
128
     #endif
129
+
122
   #endif // NEWPANEL
130
   #endif // NEWPANEL
131
+
123
 #endif // ULTRA_LCD
132
 #endif // ULTRA_LCD

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

190
 // LCD / Controller
190
 // LCD / Controller
191
 //
191
 //
192
 #if ENABLED(ULTRA_LCD)
192
 #if ENABLED(ULTRA_LCD)
193
-  // RADDS LCD panel
193
+
194
   #if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
194
   #if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
195
+
195
     #define LCD_PINS_RS     63
196
     #define LCD_PINS_RS     63
196
     #define LCD_PINS_ENABLE 64
197
     #define LCD_PINS_ENABLE 64
197
     #define LCD_PINS_D4     48
198
     #define LCD_PINS_D4     48
208
     #define SD_DETECT_PIN   51
209
     #define SD_DETECT_PIN   51
209
 
210
 
210
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
211
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
212
+
211
     #define LCD_PINS_RS     52
213
     #define LCD_PINS_RS     52
212
     #define LCD_PINS_ENABLE 53
214
     #define LCD_PINS_ENABLE 53
213
     #define LCD_PINS_D4     48
215
     #define LCD_PINS_D4     48
225
     #endif
227
     #endif
226
 
228
 
227
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
229
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
230
+
228
     #define BTN_EN1         44
231
     #define BTN_EN1         44
229
     #define BTN_EN2         42
232
     #define BTN_EN2         42
230
     #define BTN_ENC         40
233
     #define BTN_ENC         40
233
     #define SD_DETECT_PIN   51
236
     #define SD_DETECT_PIN   51
234
 
237
 
235
   #elif ENABLED(SPARK_FULL_GRAPHICS)
238
   #elif ENABLED(SPARK_FULL_GRAPHICS)
239
+
236
     //http://doku.radds.org/dokumentation/other-electronics/sparklcd/
240
     //http://doku.radds.org/dokumentation/other-electronics/sparklcd/
237
-    #error "Oops! SPARK_FULL_GRAPHICS not supported with this board"
241
+    #error "Oops! SPARK_FULL_GRAPHICS not supported with RURAMPS4D."
238
     //#define LCD_PINS_D4     29//?
242
     //#define LCD_PINS_D4     29//?
239
     //#define LCD_PINS_ENABLE 27//?
243
     //#define LCD_PINS_ENABLE 27//?
240
     //#define LCD_PINS_RS     25//?
244
     //#define LCD_PINS_RS     25//?
241
     //#define BTN_EN1         35//?
245
     //#define BTN_EN1         35//?
242
     //#define BTN_EN2         33//?
246
     //#define BTN_EN2         33//?
243
     //#define BTN_ENC         37//?
247
     //#define BTN_ENC         37//?
248
+
244
   #endif // SPARK_FULL_GRAPHICS
249
   #endif // SPARK_FULL_GRAPHICS
245
 
250
 
246
 #endif // ULTRA_LCD
251
 #endif // ULTRA_LCD

+ 2
- 0
Marlin/src/pins/pins_STM32F1R.h View File

218
       #define DOGLCD_CS         29
218
       #define DOGLCD_CS         29
219
       #define DOGLCD_A0         27
219
       #define DOGLCD_A0         27
220
       #define LCD_BACKLIGHT_PIN 33
220
       #define LCD_BACKLIGHT_PIN 33
221
+
221
     #elif ENABLED(MINIPANEL)
222
     #elif ENABLED(MINIPANEL)
223
+
222
       #define BEEPER_PIN        42
224
       #define BEEPER_PIN        42
223
       // Pins for DOGM SPI LCD Support
225
       // Pins for DOGM SPI LCD Support
224
       #define DOGLCD_A0         44
226
       #define DOGLCD_A0         44

+ 3
- 0
Marlin/src/pins/pins_STM3R_MINI.h View File

216
       #define STAT_LED_BLUE_PIN 35
216
       #define STAT_LED_BLUE_PIN 35
217
 
217
 
218
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
218
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
219
+
219
       #define BTN_EN1           35
220
       #define BTN_EN1           35
220
       #define BTN_EN2           37
221
       #define BTN_EN2           37
221
       #define BTN_ENC           31
222
       #define BTN_ENC           31
226
       #define DOGLCD_CS         29
227
       #define DOGLCD_CS         29
227
       #define DOGLCD_A0         27
228
       #define DOGLCD_A0         27
228
       #define LCD_BACKLIGHT_PIN 33
229
       #define LCD_BACKLIGHT_PIN 33
230
+
229
     #elif ENABLED(MINIPANEL)
231
     #elif ENABLED(MINIPANEL)
232
+
230
       #define BEEPER_PIN        42
233
       #define BEEPER_PIN        42
231
       // Pins for DOGM SPI LCD Support
234
       // Pins for DOGM SPI LCD Support
232
       #define DOGLCD_A0         44
235
       #define DOGLCD_A0         44

Loading…
Cancel
Save