|
@@ -423,6 +423,28 @@
|
423
|
423
|
#endif
|
424
|
424
|
|
425
|
425
|
//
|
|
426
|
+// AUX1 : 5V GND D2 D1
|
|
427
|
+// 5V GND A3 A4
|
|
428
|
+
|
|
429
|
+#define AUX1_05_PIN 57 // (A3)
|
|
430
|
+#define AUX1_06_PIN 2
|
|
431
|
+#define AUX1_07_PIN 58 // (A4)
|
|
432
|
+#define AUX1_08_PIN 1
|
|
433
|
+
|
|
434
|
+//
|
|
435
|
+// AUX2 : GND A9 D40 D42 A11
|
|
436
|
+// VCC A5 A10 D44 A12
|
|
437
|
+
|
|
438
|
+#define AUX2_03_PIN 59 // (A5)
|
|
439
|
+#define AUX2_04_PIN 63 // (A9)
|
|
440
|
+#define AUX2_05_PIN 64 // (A10)
|
|
441
|
+#define AUX2_06_PIN 40
|
|
442
|
+#define AUX2_07_PIN 44
|
|
443
|
+#define AUX2_08_PIN 42
|
|
444
|
+#define AUX2_09_PIN 66 // (A12)
|
|
445
|
+#define AUX2_10_PIN 65 // (A11)
|
|
446
|
+
|
|
447
|
+//
|
426
|
448
|
// AUX3 : GND D52 D50 5V
|
427
|
449
|
// NC D53 D51 D49
|
428
|
450
|
|
|
@@ -507,12 +529,12 @@
|
507
|
529
|
|
508
|
530
|
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
|
509
|
531
|
|
510
|
|
- #define LCD_PINS_RS 40
|
511
|
|
- #define LCD_PINS_ENABLE 42
|
512
|
|
- #define LCD_PINS_D4 65
|
513
|
|
- #define LCD_PINS_D5 66
|
514
|
|
- #define LCD_PINS_D6 44
|
515
|
|
- #define LCD_PINS_D7 64
|
|
532
|
+ #define LCD_PINS_RS AUX2_06_PIN
|
|
533
|
+ #define LCD_PINS_ENABLE AUX2_08_PIN
|
|
534
|
+ #define LCD_PINS_D4 AUX2_10_PIN
|
|
535
|
+ #define LCD_PINS_D5 AUX2_09_PIN
|
|
536
|
+ #define LCD_PINS_D6 AUX2_07_PIN
|
|
537
|
+ #define LCD_PINS_D7 AUX2_05_PIN
|
516
|
538
|
|
517
|
539
|
#elif ENABLED(TFTGLCD_PANEL_SPI)
|
518
|
540
|
|
|
@@ -533,12 +555,12 @@
|
533
|
555
|
#elif ENABLED(ZONESTAR_LCD)
|
534
|
556
|
|
535
|
557
|
#error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. Comment out this line to continue."
|
536
|
|
- #define LCD_PINS_RS 64
|
537
|
|
- #define LCD_PINS_ENABLE 44
|
538
|
|
- #define LCD_PINS_D4 63
|
539
|
|
- #define LCD_PINS_D5 40
|
540
|
|
- #define LCD_PINS_D6 42
|
541
|
|
- #define LCD_PINS_D7 65
|
|
558
|
+ #define LCD_PINS_RS AUX2_05_PIN
|
|
559
|
+ #define LCD_PINS_ENABLE AUX2_07_PIN
|
|
560
|
+ #define LCD_PINS_D4 AUX2_04_PIN
|
|
561
|
+ #define LCD_PINS_D5 AUX2_06_PIN
|
|
562
|
+ #define LCD_PINS_D6 AUX2_08_PIN
|
|
563
|
+ #define LCD_PINS_D7 AUX2_10_PIN
|
542
|
564
|
|
543
|
565
|
#else
|
544
|
566
|
|
|
@@ -570,8 +592,8 @@
|
570
|
592
|
// Buttons attached to a shift register
|
571
|
593
|
// Not wired yet
|
572
|
594
|
//#define SHIFT_CLK_PIN 38
|
573
|
|
- //#define SHIFT_LD_PIN 42
|
574
|
|
- //#define SHIFT_OUT_PIN 40
|
|
595
|
+ //#define SHIFT_LD_PIN AUX2_08_PIN
|
|
596
|
+ //#define SHIFT_OUT_PIN AUX2_06_PIN
|
575
|
597
|
//#define SHIFT_EN_PIN EXP1_08_PIN
|
576
|
598
|
#endif
|
577
|
599
|
|
|
@@ -612,10 +634,10 @@
|
612
|
634
|
|
613
|
635
|
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
614
|
636
|
|
615
|
|
- #define BTN_EN1 64
|
616
|
|
- #define BTN_EN2 59
|
617
|
|
- #define BTN_ENC 63
|
618
|
|
- #define SD_DETECT_PIN 42
|
|
637
|
+ #define BTN_EN1 AUX2_05_PIN
|
|
638
|
+ #define BTN_EN2 AUX2_03_PIN
|
|
639
|
+ #define BTN_ENC AUX2_04_PIN
|
|
640
|
+ #define SD_DETECT_PIN AUX2_08_PIN
|
619
|
641
|
|
620
|
642
|
#elif ENABLED(LCD_I2C_PANELOLU2)
|
621
|
643
|
|
|
@@ -627,8 +649,8 @@
|
627
|
649
|
|
628
|
650
|
#elif ENABLED(LCD_I2C_VIKI)
|
629
|
651
|
|
630
|
|
- #define BTN_EN1 40 // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
|
631
|
|
- #define BTN_EN2 42
|
|
652
|
+ #define BTN_EN1 AUX2_06_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08.
|
|
653
|
+ #define BTN_EN2 AUX2_08_PIN
|
632
|
654
|
#define BTN_ENC -1
|
633
|
655
|
|
634
|
656
|
#define LCD_SDSS SDSS
|
|
@@ -636,17 +658,17 @@
|
636
|
658
|
|
637
|
659
|
#elif ANY(VIKI2, miniVIKI)
|
638
|
660
|
|
639
|
|
- #define DOGLCD_CS 45
|
640
|
|
- #define DOGLCD_A0 44
|
|
661
|
+ #define DOGLCD_CS AUX4_05_PIN
|
|
662
|
+ #define DOGLCD_A0 AUX2_07_PIN
|
641
|
663
|
#define LCD_SCREEN_ROT_180
|
642
|
664
|
|
643
|
665
|
#define BEEPER_PIN EXP2_06_PIN
|
644
|
|
- #define STAT_LED_RED_PIN 32
|
|
666
|
+ #define STAT_LED_RED_PIN AUX4_03_PIN
|
645
|
667
|
#define STAT_LED_BLUE_PIN EXP1_09_PIN
|
646
|
668
|
|
647
|
669
|
#define BTN_EN1 22
|
648
|
670
|
#define BTN_EN2 7
|
649
|
|
- #define BTN_ENC 39
|
|
671
|
+ #define BTN_ENC AUX4_08_PIN
|
650
|
672
|
|
651
|
673
|
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
|
652
|
674
|
#define KILL_PIN EXP2_08_PIN
|
|
@@ -723,19 +745,18 @@
|
723
|
745
|
|
724
|
746
|
#elif ENABLED(MINIPANEL)
|
725
|
747
|
|
726
|
|
- #define BEEPER_PIN 42
|
727
|
|
- // not connected to a pin
|
728
|
|
- #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
|
|
748
|
+ #define BEEPER_PIN AUX2_08_PIN
|
|
749
|
+ #define LCD_BACKLIGHT_PIN AUX2_10_PIN
|
729
|
750
|
|
730
|
|
- #define DOGLCD_A0 44
|
731
|
|
- #define DOGLCD_CS 66
|
|
751
|
+ #define DOGLCD_A0 AUX2_07_PIN
|
|
752
|
+ #define DOGLCD_CS AUX2_09_PIN
|
732
|
753
|
|
733
|
|
- #define BTN_EN1 40
|
734
|
|
- #define BTN_EN2 63
|
735
|
|
- #define BTN_ENC 59
|
|
754
|
+ #define BTN_EN1 AUX2_06_PIN
|
|
755
|
+ #define BTN_EN2 AUX2_04_PIN
|
|
756
|
+ #define BTN_ENC AUX2_03_PIN
|
736
|
757
|
|
737
|
|
- #define SD_DETECT_PIN EXP2_04_PIN
|
738
|
|
- #define KILL_PIN 64
|
|
758
|
+ #define SD_DETECT_PIN AUX3_07_PIN
|
|
759
|
+ #define KILL_PIN AUX2_05_PIN
|
739
|
760
|
|
740
|
761
|
#elif ENABLED(ZONESTAR_LCD)
|
741
|
762
|
|
|
@@ -764,11 +785,10 @@
|
764
|
785
|
|
765
|
786
|
#define BEEPER_PIN EXP2_06_PIN
|
766
|
787
|
|
767
|
|
- // Buttons are directly attached to AUX-2
|
768
|
|
- #if ENABLED(PANEL_ONE)
|
769
|
|
- #define BTN_EN1 59 // AUX2 PIN 3
|
770
|
|
- #define BTN_EN2 63 // AUX2 PIN 4
|
771
|
|
- #define BTN_ENC EXP2_04_PIN
|
|
788
|
+ #if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
|
|
789
|
+ #define BTN_EN1 AUX2_03_PIN
|
|
790
|
+ #define BTN_EN2 AUX2_04_PIN
|
|
791
|
+ #define BTN_ENC AUX3_07_PIN
|
772
|
792
|
#else
|
773
|
793
|
#define BTN_EN1 EXP1_10_PIN
|
774
|
794
|
#define BTN_EN2 EXP1_09_PIN
|
|
@@ -781,17 +801,17 @@
|
781
|
801
|
#endif // HAS_WIRED_LCD
|
782
|
802
|
|
783
|
803
|
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
|
784
|
|
- #define SHIFT_OUT_PIN 40
|
785
|
|
- #define SHIFT_CLK_PIN 44
|
786
|
|
- #define SHIFT_LD_PIN 42
|
|
804
|
+ #define SHIFT_OUT_PIN AUX2_06_PIN
|
|
805
|
+ #define SHIFT_CLK_PIN AUX2_07_PIN
|
|
806
|
+ #define SHIFT_LD_PIN AUX2_08_PIN
|
787
|
807
|
#ifndef BTN_EN1
|
788
|
|
- #define BTN_EN1 64
|
|
808
|
+ #define BTN_EN1 AUX2_05_PIN
|
789
|
809
|
#endif
|
790
|
810
|
#ifndef BTN_EN2
|
791
|
|
- #define BTN_EN2 59
|
|
811
|
+ #define BTN_EN2 AUX2_03_PIN
|
792
|
812
|
#endif
|
793
|
813
|
#ifndef BTN_ENC
|
794
|
|
- #define BTN_ENC 63
|
|
814
|
+ #define BTN_ENC AUX2_04_PIN
|
795
|
815
|
#endif
|
796
|
816
|
#endif
|
797
|
817
|
|