Browse Source

More FTDI EVE fixes (RAMPS, Cheetah) (#17759)

Gustavo Alvarez 4 years ago
parent
commit
3fd8ef52c5
No account linked to committer's email address

+ 1
- 1
Marlin/Configuration_adv.h View File

@@ -1387,7 +1387,7 @@
1387 1387
   //#define CR10_TFT_PINMAP     // Rudolph Riedel's CR10 pin mapping
1388 1388
   //#define S6_TFT_PINMAP       // FYSETC S6 pin mapping
1389 1389
   //#define CHEETAH_TFT_PINMAP  // FYSETC Cheetah pin mapping
1390
-  //#define E3_EXP1_PINMAP      // E3 type boards (SKR E3/DIP, FYSETC Cheetah and Stock boards) EXP1 pin mapping
1390
+  //#define E3_EXP1_PINMAP      // E3 type boards (SKR E3/DIP, and Stock boards) EXP1 pin mapping
1391 1391
   //#define GENERIC_EXP2_PINMAP // GENERIC EXP2 pin mapping
1392 1392
 
1393 1393
   //#define OTHER_PIN_LAYOUT  // Define pins manually below

+ 24
- 27
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h View File

@@ -27,31 +27,13 @@
27 27
  * without adding new pin definitions to the board.
28 28
  */
29 29
 
30
-#ifdef CHEETAH_TFT_PINMAP
31
-  #ifndef __MARLIN_FIRMWARE__
32
-    #error "This pin mapping requires Marlin."
33
-  #endif
34
-
35
-    #define CLCD_SPI_BUS    2
36
-
37
-    #define CLCD_MOD_RESET  PC9
38
-    #define CLCD_SPI_CS     PB12
39
-
40
-    //#define CLCD_USE_SOFT_SPI
41
-    #if ENABLED(CLCD_USE_SOFT_SPI)
42
-      #define CLCD_SOFT_SPI_MOSI PB15
43
-      #define CLCD_SOFT_SPI_MISO PB14
44
-      #define CLCD_SOFT_SPI_SCLK PB13
45
-    #endif
46
-#endif
47
-
48 30
 #ifdef S6_TFT_PINMAP
49 31
   #ifndef __MARLIN_FIRMWARE__
50 32
     #error "This pin mapping requires Marlin."
51 33
   #endif
52 34
 
53
-  #define CLCD_SPI_CS         PC7
54
-  #define CLCD_MOD_RESET      PC6
35
+  #define CLCD_SPI_CS                    PC7
36
+  #define CLCD_MOD_RESET                 PC6
55 37
 #endif
56 38
 
57 39
 #ifdef CR10_TFT_PINMAP
@@ -60,13 +42,13 @@
60 42
   #endif
61 43
 
62 44
   #define CLCD_USE_SOFT_SPI
63
-  #define CLCD_SOFT_SPI_SCLK  LCD_PINS_D4      // PORTA1               Pin 6
64
-  #define CLCD_SOFT_SPI_MOSI  LCD_PINS_ENABLE  // PORTC1               Pin 8
65
-  #define CLCD_SPI_CS         LCD_PINS_RS      // PORTA3               Pin 7
66
-  #define CLCD_SOFT_SPI_MISO  16               // PORTC0   BTN_ENC     Pin 2
67
-  #define CLCD_MOD_RESET      11               // PORTD3   BTN_EN1     Pin 3
68
-  #define CLCD_AUX_0          10               // PORTD2   BTN_EN2     Pin 5
69
-  #define CLCD_AUX_1          BEEPER_PIN       // PORTA4               Pin 1
45
+  #define CLCD_SOFT_SPI_SCLK             LCD_PINS_D4      // PORTA1               Pin 6
46
+  #define CLCD_SOFT_SPI_MOSI             LCD_PINS_ENABLE  // PORTC1               Pin 8
47
+  #define CLCD_SPI_CS                    LCD_PINS_RS      // PORTA3               Pin 7
48
+  #define CLCD_SOFT_SPI_MISO             16               // PORTC0   BTN_ENC     Pin 2
49
+  #define CLCD_MOD_RESET                 11               // PORTD3   BTN_EN1     Pin 3
50
+  #define CLCD_AUX_0                     10               // PORTD2   BTN_EN2     Pin 5
51
+  #define CLCD_AUX_1                     BEEPER_PIN       // PORTA4               Pin 1
70 52
 #endif
71 53
 
72 54
 /**
@@ -181,3 +163,18 @@
181 163
   #define CLCD_MOD_RESET                 BTN_EN1
182 164
   #define CLCD_SPI_CS                    LCD_PINS_RS
183 165
 #endif
166
+
167
+#ifdef CHEETAH_TFT_PINMAP
168
+  #ifndef __MARLIN_FIRMWARE__
169
+    #error "This pin mapping requires Marlin."
170
+  #endif
171
+
172
+  #define CLCD_MOD_RESET                 BTN_EN2
173
+  #define CLCD_SPI_CS                    LCD_PINS_RS
174
+
175
+  #if ENABLED(CLCD_USE_SOFT_SPI)
176
+    #define CLCD_SOFT_SPI_MOSI           LCD_PINS_ENABLE
177
+    #define CLCD_SOFT_SPI_MISO           LCD_PINS_RS
178
+    #define CLCD_SOFT_SPI_SCLK           LCD_PINS_D4
179
+  #endif
180
+#endif

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

@@ -753,6 +753,8 @@
753 753
    *   EXP2-1 ----------- EXP1-2
754 754
    *  EXP1-10 ----------- EXP1-1
755 755
    *
756
+   *  NOTE: The MISO pin should not get a 5V signal.
757
+   *        To fix, insert a 1N4148 diode in the MISO line.
756 758
    */
757 759
 
758 760
   #define BEEPER_PIN                          37

+ 45
- 11
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h View File

@@ -107,15 +107,35 @@
107 107
 //
108 108
 // LCD Pins
109 109
 //
110
+/**
111
+ *                 _____
112
+ *             5V | 1 2 | GND
113
+ *    (MOSI) PB15 | 3 4 | PB12 (LCD_EN)
114
+ *     (SCK) PB13 | 5 6   PC11 (BTN_EN1)
115
+ *  (LCD_RS) PB14 | 7 8 | PC10 (BTN_EN2)
116
+ * (BTN_ENC) PC12 | 9 10| PC9  (BEEPER)
117
+ *                 -----
118
+ *                 EXP1
119
+ */
120
+
121
+#define EXPA1_03_PIN                        PB15
122
+#define EXPA1_04_PIN                        PB12
123
+#define EXPA1_05_PIN                        PB13
124
+#define EXPA1_06_PIN                        PC11
125
+#define EXPA1_07_PIN                        PB14
126
+#define EXPA1_08_PIN                        PC10
127
+#define EXPA1_09_PIN                        PC12
128
+#define EXPA1_10_PIN                        PC9
129
+
110 130
 #if HAS_SPI_LCD
111 131
 
112
-  #define BEEPER_PIN                        PC9
132
+  #define BEEPER_PIN                EXPA1_10_PIN
113 133
 
114 134
   #if HAS_GRAPHICAL_LCD
115
-    #define DOGLCD_A0                       PB14
116
-    #define DOGLCD_CS                       PB12
117
-    #define DOGLCD_SCK                      PB13
118
-    #define DOGLCD_MOSI                     PB15
135
+    #define DOGLCD_A0               EXPA1_07_PIN
136
+    #define DOGLCD_CS               EXPA1_04_PIN
137
+    #define DOGLCD_SCK              EXPA1_05_PIN
138
+    #define DOGLCD_MOSI             EXPA1_03_PIN
119 139
     //#define LCD_SCREEN_ROT_90
120 140
     //#define LCD_SCREEN_ROT_180
121 141
     //#define LCD_SCREEN_ROT_270
@@ -125,9 +145,9 @@
125 145
     #endif
126 146
   #endif
127 147
 
128
-  #define LCD_PINS_RS                       PB12  // CS -- SOFT SPI for ENDER3 LCD
129
-  #define LCD_PINS_D4                       PB13  // SCLK
130
-  #define LCD_PINS_ENABLE                   PB15  // DATA MOSI
148
+  #define LCD_PINS_RS               EXPA1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
149
+  #define LCD_PINS_D4               EXPA1_05_PIN  // SCLK
150
+  #define LCD_PINS_ENABLE           EXPA1_03_PIN  // DATA MOSI
131 151
 
132 152
   // not connected to a pin
133 153
   #define SD_DETECT_PIN                     PC3
@@ -145,9 +165,23 @@
145 165
   //#define LCD_CONTRAST_INIT 190
146 166
 
147 167
   #if ENABLED(NEWPANEL)
148
-    #define BTN_EN1                         PC11
149
-    #define BTN_EN2                         PC10
150
-    #define BTN_ENC                         PC12
168
+    #define BTN_EN1                 EXPA1_06_PIN
169
+    #define BTN_EN2                 EXPA1_08_PIN
170
+    #define BTN_ENC                 EXPA1_09_PIN
151 171
   #endif
152 172
 
153 173
 #endif
174
+
175
+#if ENABLED(TOUCH_UI_FTDI_EVE)
176
+  #define BEEPER_PIN                EXPA1_10_PIN
177
+
178
+  #define BTN_EN2                   EXPA1_08_PIN
179
+
180
+  #define CLCD_SPI_BUS 2
181
+  //#define CLCD_USE_SOFT_SPI
182
+  #if ENABLED(CLCD_USE_SOFT_SPI)
183
+    #define LCD_PINS_RS             EXPA1_04_PIN
184
+    #define LCD_PINS_D4             EXPA1_07_PIN
185
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
186
+  #endif
187
+#endif

Loading…
Cancel
Save