ソースを参照

Use pin/port names for CHITU pins

Scott Lahteine 4年前
コミット
e62b52da99
1個のファイルの変更76行の追加76行の削除
  1. 76
    76
      Marlin/src/pins/stm32f1/pins_CHITU3D.h

+ 76
- 76
Marlin/src/pins/stm32f1/pins_CHITU3D.h ファイルの表示

@@ -86,7 +86,7 @@
86 86
 //
87 87
 #define SDSS               -1
88 88
 #define LED_PIN            -1
89
-#define CASE_LIGHT_PIN      8
89
+#define CASE_LIGHT_PIN     PA8   // 8
90 90
 
91 91
 #define PS_ON_PIN          -1
92 92
 #define KILL_PIN           PD6      // LED strip 24v
@@ -111,8 +111,8 @@
111 111
 //
112 112
 // Temperature Sensors
113 113
 //
114
-#define TEMP_BED_PIN       PA0   // Analog Input
115
-#define TEMP_0_PIN         PA1   // Analog Input
114
+#define TEMP_BED_PIN       PA0  // Analog Input
115
+#define TEMP_0_PIN         PA1  // Analog Input
116 116
 #define TEMP_1_PIN         -1   // Analog Input
117 117
 #define TEMP_2_PIN         -1   // Analog Input
118 118
 
@@ -122,9 +122,9 @@
122 122
 #if HAS_SPI_LCD
123 123
 
124 124
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
125
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
126
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
127
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
125
+    #define LCD_PINS_RS         PD1   // 49  // CS chip select /SS chip slave select
126
+    #define LCD_PINS_ENABLE     PD3   // 51  // SID (MOSI)
127
+    #define LCD_PINS_D4         PD4   // 52  // SCK (CLK) clock
128 128
   #elif BOTH(NEWPANEL, PANEL_ONE)
129 129
     #define LCD_PINS_RS         PB8
130 130
     #define LCD_PINS_ENABLE     PD2
@@ -140,13 +140,13 @@
140 140
     #define LCD_PINS_D6         PB14
141 141
     #define LCD_PINS_D7         PB15
142 142
     #if DISABLED(NEWPANEL)
143
-      #define BEEPER_PIN        33
143
+      #define BEEPER_PIN        PC1   // 33
144 144
       // Buttons attached to a shift register
145 145
       // Not wired yet
146
-      //#define SHIFT_CLK       38
147
-      //#define SHIFT_LD        42
148
-      //#define SHIFT_OUT       40
149
-      //#define SHIFT_EN        17
146
+      //#define SHIFT_CLK       PC6   // 38
147
+      //#define SHIFT_LD        PC10  // 42
148
+      //#define SHIFT_OUT       PC8   // 40
149
+      //#define SHIFT_EN        PA1   // 17
150 150
     #endif
151 151
   #endif
152 152
 
@@ -154,125 +154,125 @@
154 154
 
155 155
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
156 156
 
157
-      #define BEEPER_PIN        37
157
+      #define BEEPER_PIN        PC5
158 158
 
159
-      #define BTN_EN1           31
160
-      #define BTN_EN2           33
161
-      #define BTN_ENC           35
159
+      #define BTN_EN1           PB15  // 31
160
+      #define BTN_EN2           PC1   // 33
161
+      #define BTN_ENC           PC3   // 35
162 162
 
163
-      #define SD_DETECT_PIN     49
164
-      #define KILL_PIN          41
163
+      #define SD_DETECT_PIN     PD1   // 49
164
+      #define KILL_PIN          PC9   // 41
165 165
 
166 166
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
167
-        #define LCD_BACKLIGHT_PIN 39
167
+        #define LCD_BACKLIGHT_PIN PC7   // 39
168 168
       #endif
169 169
 
170 170
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
171 171
 
172
-      #define BTN_EN1           64
173
-      #define BTN_EN2           59
174
-      #define BTN_ENC           63
175
-      #define SD_DETECT_PIN     42
172
+      #define BTN_EN1           PE0   // 64
173
+      #define BTN_EN2           PD11  // 59
174
+      #define BTN_ENC           PD15  // 63
175
+      #define SD_DETECT_PIN     PC10  // 42
176 176
 
177 177
     #elif ENABLED(LCD_I2C_PANELOLU2)
178 178
 
179
-      #define BTN_EN1           47
180
-      #define BTN_EN2           43
181
-      #define BTN_ENC           32
182
-      #define LCD_SDSS          53
179
+      #define BTN_EN1           PC15  // 47
180
+      #define BTN_EN2           PC11  // 43
181
+      #define BTN_ENC           PC0   // 32
182
+      #define LCD_SDSS          PD5   // 53
183 183
       #define SD_DETECT_PIN     -1
184
-      #define KILL_PIN          41
184
+      #define KILL_PIN          PC9   // 41
185 185
 
186 186
     #elif ENABLED(LCD_I2C_VIKI)
187 187
 
188
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
189
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
188
+      #define BTN_EN1           PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
189
+      #define BTN_EN2           PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
190 190
 
191 191
       #define BTN_ENC           -1
192
-      #define LCD_SDSS          53
193
-      #define SD_DETECT_PIN     49
192
+      #define LCD_SDSS          PD5   // 53
193
+      #define SD_DETECT_PIN     PD1   // 49
194 194
 
195 195
     #elif ANY(VIKI2, miniVIKI)
196 196
 
197
-      #define BEEPER_PIN        33
197
+      #define BEEPER_PIN        PC1   // 33
198 198
 
199 199
       // Pins for DOGM SPI LCD Support
200
-      #define DOGLCD_A0         44
201
-      #define DOGLCD_CS         45
200
+      #define DOGLCD_A0         PC12  // 44
201
+      #define DOGLCD_CS         PC13  // 45
202 202
       #define LCD_SCREEN_ROT_180
203 203
 
204
-      #define BTN_EN1           22
205
-      #define BTN_EN2            7
206
-      #define BTN_ENC           39
204
+      #define BTN_EN1           PB6   // 22
205
+      #define BTN_EN2           PA7   //  7
206
+      #define BTN_ENC           PC7   // 39
207 207
 
208
-      #define SDSS              53
208
+      #define SDSS              PD5   // 53
209 209
       #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
210 210
 
211
-      #define KILL_PIN          31
211
+      #define KILL_PIN          PB15  // 31
212 212
 
213
-      #define STAT_LED_RED_PIN  32
214
-      #define STAT_LED_BLUE_PIN 35
213
+      #define STAT_LED_RED_PIN  PC0   // 32
214
+      #define STAT_LED_BLUE_PIN PC3   // 35
215 215
 
216 216
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
217
-      #define BTN_EN1           35
218
-      #define BTN_EN2           37
219
-      #define BTN_ENC           31
220
-      #define SD_DETECT_PIN     49
221
-      #define LCD_SDSS          53
222
-      #define KILL_PIN          41
223
-      #define BEEPER_PIN        23
224
-      #define DOGLCD_CS         29
225
-      #define DOGLCD_A0         27
226
-      #define LCD_BACKLIGHT_PIN 33
217
+      #define BTN_EN1           PC3   // 35
218
+      #define BTN_EN2           PC5   // 37
219
+      #define BTN_ENC           PB15  // 31
220
+      #define SD_DETECT_PIN     PD1   // 49
221
+      #define LCD_SDSS          PD5   // 53
222
+      #define KILL_PIN          PC9   // 41
223
+      #define BEEPER_PIN        PB7   // 23
224
+      #define DOGLCD_CS         PB13  // 29
225
+      #define DOGLCD_A0         PB11  // 27
226
+      #define LCD_BACKLIGHT_PIN PC1   // 33
227 227
 
228 228
     #elif ENABLED(MINIPANEL)
229 229
 
230
-      #define BEEPER_PIN        42
230
+      #define BEEPER_PIN        PC10  // 42
231 231
       // Pins for DOGM SPI LCD Support
232
-      #define DOGLCD_A0         44
233
-      #define DOGLCD_CS         66
234
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
235
-      #define SDSS              53
232
+      #define DOGLCD_A0         PC12  // 44
233
+      #define DOGLCD_CS         PE2   // 66
234
+      #define LCD_BACKLIGHT_PIN PE1   // 65   // backlight LED on A11/D65
235
+      #define SDSS              PD5   // 53
236 236
 
237
-      #define KILL_PIN          64
237
+      #define KILL_PIN          PE0   // 64
238 238
       // GLCD features
239 239
       // Uncomment screen orientation
240 240
       //#define LCD_SCREEN_ROT_90
241 241
       //#define LCD_SCREEN_ROT_180
242 242
       //#define LCD_SCREEN_ROT_270
243 243
       // The encoder and click button
244
-      #define BTN_EN1           40
245
-      #define BTN_EN2           63
246
-      #define BTN_ENC           59
244
+      #define BTN_EN1           PC8   // 40
245
+      #define BTN_EN2           PD15  // 63
246
+      #define BTN_ENC           PD11  // 59
247 247
       // not connected to a pin
248
-      #define SD_DETECT_PIN     49
248
+      #define SD_DETECT_PIN     PD1   // 49
249 249
 
250 250
     #else
251 251
 
252 252
       // Beeper on AUX-4
253
-      #define BEEPER_PIN        33
253
+      #define BEEPER_PIN        PC1   // 33
254 254
 
255 255
       // Buttons directly attached to AUX-2
256 256
       #if ENABLED(REPRAPWORLD_KEYPAD)
257
-        #define BTN_EN1         64
258
-        #define BTN_EN2         59
259
-        #define BTN_ENC         63
260
-        #define SHIFT_OUT       40
261
-        #define SHIFT_CLK       44
262
-        #define SHIFT_LD        42
257
+        #define BTN_EN1         PE0   // 64
258
+        #define BTN_EN2         PD11  // 59
259
+        #define BTN_ENC         PD15  // 63
260
+        #define SHIFT_OUT       PC8   // 40
261
+        #define SHIFT_CLK       PC12  // 44
262
+        #define SHIFT_LD        PC10  // 42
263 263
       #elif ENABLED(PANEL_ONE)
264
-        #define BTN_EN1         59   // AUX2 PIN 3
265
-        #define BTN_EN2         63   // AUX2 PIN 4
266
-        #define BTN_ENC         49   // AUX3 PIN 7
264
+        #define BTN_EN1         PD11  // 59   // AUX2 PIN 3
265
+        #define BTN_EN2         PD15  // 63   // AUX2 PIN 4
266
+        #define BTN_ENC         PD1   // 49   // AUX3 PIN 7
267 267
       #else
268
-        #define BTN_EN1         37
269
-        #define BTN_EN2         35
270
-        #define BTN_ENC         31
268
+        #define BTN_EN1         PC5   // 37
269
+        #define BTN_EN2         PC3   // 35
270
+        #define BTN_ENC         PB15  // 31
271 271
       #endif
272 272
 
273 273
       #if ENABLED(G3D_PANEL)
274
-        #define SD_DETECT_PIN   49
275
-        #define KILL_PIN        41
274
+        #define SD_DETECT_PIN   PD1   // 49
275
+        #define KILL_PIN        PC9   // 41
276 276
       #else
277 277
         //#define SD_DETECT_PIN -1   // Ramps doesn't use this
278 278
       #endif

読み込み中…
キャンセル
保存