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,7 +148,7 @@
148 148
  *  ZONESTAR_LCD
149 149
  *  ANET_FULL_GRAPHICS_LCD
150 150
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
151
-*/
151
+ */
152 152
 
153 153
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
154 154
   #define LCD_SDSS           28

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

@@ -41,7 +41,7 @@
41 41
   #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
42 42
 #endif
43 43
 
44
-//DIGIPOT slave addresses
44
+// DIGIPOT slave addresses
45 45
 #define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
46 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,6 +213,7 @@
213 213
       #define STAT_LED_BLUE_PIN 35
214 214
 
215 215
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
216
+
216 217
       #define BTN_EN1           35
217 218
       #define BTN_EN2           37
218 219
       #define BTN_ENC           31
@@ -223,7 +224,9 @@
223 224
       #define DOGLCD_CS         29
224 225
       #define DOGLCD_A0         27
225 226
       #define LCD_BACKLIGHT_PIN 33
227
+
226 228
     #elif ENABLED(MINIPANEL)
229
+
227 230
       #define BEEPER_PIN        42
228 231
       // Pins for DOGM SPI LCD Support
229 232
       #define DOGLCD_A0         44

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

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

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

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

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

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

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

@@ -36,4 +36,4 @@
36 36
 #undef Z_MAX_PIN
37 37
 #define X_STOP_PIN          2
38 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,6 +133,7 @@
133 133
 // LCD / Controller
134 134
 //
135 135
 #if ENABLED(MINIPANEL)
136
+
136 137
   #define BEEPER_PIN       46
137 138
   // Pins for DOGM SPI LCD Support
138 139
   #define DOGLCD_A0        47
@@ -152,6 +153,7 @@
152 153
   #define BTN_ENC          10
153 154
 
154 155
   #define SD_DETECT_PIN    49
156
+
155 157
 #endif // MINIPANEL
156 158
 
157 159
 //

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

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

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

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

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

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

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

@@ -190,8 +190,9 @@
190 190
 // LCD / Controller
191 191
 //
192 192
 #if ENABLED(ULTRA_LCD)
193
-  // RADDS LCD panel
193
+
194 194
   #if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
195
+
195 196
     #define LCD_PINS_RS     63
196 197
     #define LCD_PINS_ENABLE 64
197 198
     #define LCD_PINS_D4     48
@@ -208,6 +209,7 @@
208 209
     #define SD_DETECT_PIN   51
209 210
 
210 211
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
212
+
211 213
     #define LCD_PINS_RS     52
212 214
     #define LCD_PINS_ENABLE 53
213 215
     #define LCD_PINS_D4     48
@@ -225,6 +227,7 @@
225 227
     #endif
226 228
 
227 229
   #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
230
+
228 231
     #define BTN_EN1         44
229 232
     #define BTN_EN2         42
230 233
     #define BTN_ENC         40
@@ -233,14 +236,16 @@
233 236
     #define SD_DETECT_PIN   51
234 237
 
235 238
   #elif ENABLED(SPARK_FULL_GRAPHICS)
239
+
236 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 242
     //#define LCD_PINS_D4     29//?
239 243
     //#define LCD_PINS_ENABLE 27//?
240 244
     //#define LCD_PINS_RS     25//?
241 245
     //#define BTN_EN1         35//?
242 246
     //#define BTN_EN2         33//?
243 247
     //#define BTN_ENC         37//?
248
+
244 249
   #endif // SPARK_FULL_GRAPHICS
245 250
 
246 251
 #endif // ULTRA_LCD

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

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

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

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

Loading…
Cancel
Save