|
@@ -257,47 +257,26 @@
|
257
|
257
|
|
258
|
258
|
#if ENABLED(ULTRA_LCD)
|
259
|
259
|
|
260
|
|
- #define BEEPER_PIN P1_30 // (37) not 5V tolerant
|
261
|
|
-
|
262
|
|
- #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
|
263
|
|
- #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
|
264
|
|
- #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
|
265
|
|
-
|
266
|
|
- #define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
267
|
|
- #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
268
|
|
- #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
|
269
|
|
- #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
|
270
|
|
- #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
271
|
|
- #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
|
272
|
|
- #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
|
273
|
|
-
|
274
|
|
- #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
|
275
|
|
- #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
|
276
|
|
-
|
277
|
|
- #ifdef ULTIPANEL
|
278
|
|
- #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
|
279
|
|
- #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
|
280
|
|
- #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
|
281
|
|
- #endif
|
|
260
|
+ #if ENABLED(CR10_STOCKDISPLAY)
|
282
|
261
|
|
283
|
|
- #if ENABLED(NEWPANEL)
|
284
|
|
- #if ENABLED(REPRAPWORLD_KEYPAD)
|
285
|
|
- #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
|
286
|
|
- #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
|
287
|
|
- #define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
288
|
|
- #endif
|
289
|
|
- #else
|
290
|
|
- //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
|
291
|
|
- //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
|
292
|
|
- //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
|
293
|
|
- //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
|
294
|
|
- #endif
|
|
262
|
+ // Re-Arm can support Creality stock display without SD card reader and single cable on EXP3.
|
|
263
|
+ // Re-Arm J3 pins 1 (p1.31) & 2 (P3.26) are not used. Stock cable will need to have one
|
|
264
|
+ // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
|
|
265
|
+ // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
|
|
266
|
+
|
|
267
|
+ #define BEEPER_PIN P2_11 // J3-3 & AUX-4
|
|
268
|
+
|
|
269
|
+ #define BTN_EN1 P0_16 // J3-7 & AUX-4
|
|
270
|
+ #define BTN_EN2 P1_23 // J3-5 & AUX-4
|
|
271
|
+ #define BTN_ENC P3_25 // J3-4 & AUX-4
|
295
|
272
|
|
296
|
|
- #if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
297
|
|
- // #define LCD_SCREEN_ROT_180
|
|
273
|
+ #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
|
|
274
|
+ #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
|
|
275
|
+ #define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
|
298
|
276
|
|
299
|
|
- #undef BEEPER_PIN
|
300
|
|
- #define BEEPER_PIN P1_30 // (37) may change if cable changes
|
|
277
|
+ #else
|
|
278
|
+
|
|
279
|
+ #define BEEPER_PIN P1_30 // (37) not 5V tolerant
|
301
|
280
|
|
302
|
281
|
#define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
|
303
|
282
|
#define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
|
|
@@ -305,36 +284,78 @@
|
305
|
284
|
|
306
|
285
|
#define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
307
|
286
|
#define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
|
287
|
+ #define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
|
|
288
|
+ #define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
|
|
289
|
+ #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
|
290
|
+ #define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
|
|
291
|
+ #define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
|
308
|
292
|
|
309
|
|
- #undef DOGLCD_CS
|
310
|
|
- #define DOGLCD_CS P0_16 // (16)
|
311
|
|
- #undef LCD_BACKLIGHT_PIN //P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
312
|
|
- #undef LCD_PINS_ENABLE //P0_18 // (51) (MOSI) J3-10 & AUX-3
|
313
|
|
- #undef LCD_PINS_D4 //P0_15 // (52) (SCK) J3-9 & AUX-3
|
314
|
|
-
|
315
|
|
- #undef LCD_PINS_D5 //P2_06 // (59) J3-8 & AUX-2
|
316
|
293
|
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
|
317
|
|
- #undef LCD_PINS_D6 //P0_26 // (63) J5-3 & AUX-2
|
318
|
|
- #undef LCD_PINS_D7 //P1_21 // ( 6) (SERVO1) J5-1 & SERVO connector
|
319
|
|
- #define DOGLCD_SCK SCK_PIN
|
320
|
|
- #define DOGLCD_MOSI MOSI_PIN
|
|
294
|
+ #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
|
321
|
295
|
|
322
|
|
- #define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
|
323
|
|
- #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
|
324
|
|
- #endif
|
|
296
|
+ #ifdef ULTIPANEL
|
|
297
|
+ #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
|
|
298
|
+ #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
|
|
299
|
+ #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
|
|
300
|
+ #endif
|
|
301
|
+
|
|
302
|
+ #if ENABLED(NEWPANEL)
|
|
303
|
+ #if ENABLED(REPRAPWORLD_KEYPAD)
|
|
304
|
+ #define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
|
|
305
|
+ #define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
|
|
306
|
+ #define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
|
307
|
+ #endif
|
|
308
|
+ #else
|
|
309
|
+ //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
|
|
310
|
+ //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
|
|
311
|
+ //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
|
|
312
|
+ //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4
|
|
313
|
+ #endif
|
|
314
|
+
|
|
315
|
+ #if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
|
316
|
+ // #define LCD_SCREEN_ROT_180
|
|
317
|
+
|
|
318
|
+ #undef BEEPER_PIN
|
|
319
|
+ #define BEEPER_PIN P1_30 // (37) may change if cable changes
|
|
320
|
+
|
|
321
|
+ #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
|
|
322
|
+ #define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
|
|
323
|
+ #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
|
|
324
|
+
|
|
325
|
+ #define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3
|
|
326
|
+ #define KILL_PIN P1_22 // (41) J5-4 & AUX-4
|
|
327
|
+
|
|
328
|
+ #undef DOGLCD_CS
|
|
329
|
+ #define DOGLCD_CS P0_16 // (16)
|
|
330
|
+ #undef LCD_BACKLIGHT_PIN //P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
|
|
331
|
+ #undef LCD_PINS_ENABLE //P0_18 // (51) (MOSI) J3-10 & AUX-3
|
|
332
|
+ #undef LCD_PINS_D4 //P0_15 // (52) (SCK) J3-9 & AUX-3
|
|
333
|
+
|
|
334
|
+ #undef LCD_PINS_D5 //P2_06 // (59) J3-8 & AUX-2
|
|
335
|
+ #define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
|
|
336
|
+ #undef LCD_PINS_D6 //P0_26 // (63) J5-3 & AUX-2
|
|
337
|
+ #undef LCD_PINS_D7 //P1_21 // ( 6) (SERVO1) J5-1 & SERVO connector
|
|
338
|
+ #define DOGLCD_SCK SCK_PIN
|
|
339
|
+ #define DOGLCD_MOSI MOSI_PIN
|
|
340
|
+
|
|
341
|
+ #define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
|
|
342
|
+ #define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
|
|
343
|
+ #endif
|
|
344
|
+
|
|
345
|
+ //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
|
|
346
|
+ //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
|
|
347
|
+ //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
|
|
348
|
+ //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 - sometimes called SDSS
|
|
349
|
+
|
|
350
|
+ #if ENABLED(MINIPANEL)
|
|
351
|
+ // GLCD features
|
|
352
|
+ //#define LCD_CONTRAST 190
|
|
353
|
+ // Uncomment screen orientation
|
|
354
|
+ //#define LCD_SCREEN_ROT_90
|
|
355
|
+ //#define LCD_SCREEN_ROT_180
|
|
356
|
+ //#define LCD_SCREEN_ROT_270
|
|
357
|
+ #endif
|
325
|
358
|
|
326
|
|
- //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
|
327
|
|
- //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
|
328
|
|
- //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
|
329
|
|
- //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 - sometimes called SDSS
|
330
|
|
-
|
331
|
|
- #if ENABLED(MINIPANEL)
|
332
|
|
- // GLCD features
|
333
|
|
- //#define LCD_CONTRAST 190
|
334
|
|
- // Uncomment screen orientation
|
335
|
|
- //#define LCD_SCREEN_ROT_90
|
336
|
|
- //#define LCD_SCREEN_ROT_180
|
337
|
|
- //#define LCD_SCREEN_ROT_270
|
338
|
359
|
#endif
|
339
|
360
|
|
340
|
361
|
#endif // ULTRA_LCD
|