Browse Source

SPI and pins cleanup

Scott Lahteine 3 years ago
parent
commit
a9d18f0f57

+ 5
- 10
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp View File

@@ -64,12 +64,11 @@
64 64
 
65 65
 #include "../../../MarlinCore.h"
66 66
 
67
-void spiBegin();
68
-void spiInit(uint8_t spiRate);
69
-void spiSend(uint8_t b);
70
-void spiSend(const uint8_t* buf, size_t n);
67
+#ifndef LCD_SPI_SPEED
68
+  #define LCD_SPI_SPEED SPI_QUARTER_SPEED
69
+#endif
71 70
 
72
-#include "../../shared/Marduino.h"
71
+#include "../../shared/HAL_SPI.h"
73 72
 #include "../fastio.h"
74 73
 
75 74
 void u8g_SetPIOutput_DUE_hw_spi(u8g_t *u8g, uint8_t pin_index) {
@@ -100,11 +99,7 @@ uint8_t u8g_com_HAL_DUE_shared_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
100 99
 
101 100
       spiBegin();
102 101
 
103
-      #ifndef SPI_SPEED
104
-        #define SPI_SPEED SPI_FULL_SPEED  // use same SPI speed as SD card
105
-      #endif
106
-      spiInit(2);
107
-
102
+      spiInit(LCD_SPI_SPEED);
108 103
       break;
109 104
 
110 105
     case U8G_COM_MSG_ADDRESS:                     /* define cmd (arg_val = 0) or data mode (arg_val = 1) */

+ 0
- 3
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp View File

@@ -59,9 +59,6 @@
59 59
 
60 60
 #if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
61 61
 
62
-#undef SPI_SPEED
63
-#define SPI_SPEED 2  // About 2 MHz
64
-
65 62
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
66 63
 
67 64
 #include "../../shared/Marduino.h"

+ 1
- 1
Marlin/src/HAL/LPC1768/tft/xpt2046.h View File

@@ -37,7 +37,7 @@
37 37
   #define TOUCH_SCK_PIN  SCK_PIN
38 38
 #endif
39 39
 #ifndef TOUCH_CS_PIN
40
-  #define TOUCH_CS_PIN   CS_PIN
40
+  #define TOUCH_CS_PIN   SS_PIN
41 41
 #endif
42 42
 #ifndef TOUCH_INT_PIN
43 43
   #define TOUCH_INT_PIN  -1

+ 5
- 3
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp View File

@@ -62,9 +62,11 @@
62 62
 #include <U8glib.h>
63 63
 #include <SoftwareSPI.h>
64 64
 #include "../../shared/Delay.h"
65
+#include "../../shared/HAL_SPI.h"
65 66
 
66
-#undef SPI_SPEED
67
-#define SPI_SPEED 3  // About 1 MHz
67
+#ifndef LCD_SPI_SPEED
68
+  #define LCD_SPI_SPEED SPI_EIGHTH_SPEED  // About 1 MHz
69
+#endif
68 70
 
69 71
 static pin_t SCK_pin_ST7920_HAL, MOSI_pin_ST7920_HAL_HAL;
70 72
 static uint8_t SPI_speed = 0;
@@ -92,7 +94,7 @@ uint8_t u8g_com_HAL_LPC1768_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t ar
92 94
       u8g_SetPIOutput(u8g, U8G_PI_MOSI);
93 95
       u8g_Delay(5);
94 96
 
95
-      SPI_speed = swSpiInit(SPI_SPEED, SCK_pin_ST7920_HAL, MOSI_pin_ST7920_HAL_HAL);
97
+      SPI_speed = swSpiInit(LCD_SPI_SPEED, SCK_pin_ST7920_HAL, MOSI_pin_ST7920_HAL_HAL);
96 98
 
97 99
       u8g_SetPILevel(u8g, U8G_PI_CS, 0);
98 100
       u8g_SetPILevel(u8g, U8G_PI_SCK, 0);

+ 5
- 3
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp View File

@@ -60,9 +60,11 @@
60 60
 #if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
61 61
 
62 62
 #include <SoftwareSPI.h>
63
+#include "../../shared/HAL_SPI.h"
63 64
 
64
-#undef SPI_SPEED
65
-#define SPI_SPEED 2  // About 2 MHz
65
+#ifndef LCD_SPI_SPEED
66
+  #define LCD_SPI_SPEED SPI_QUARTER_SPEED  // About 2 MHz
67
+#endif
66 68
 
67 69
 #include <Arduino.h>
68 70
 #include <algorithm>
@@ -145,7 +147,7 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
145 147
       u8g_SetPIOutput(u8g, U8G_PI_CS);
146 148
       u8g_SetPIOutput(u8g, U8G_PI_A0);
147 149
       if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPIOutput(u8g, U8G_PI_RESET);
148
-      SPI_speed = swSpiInit(SPI_SPEED, u8g->pin_list[U8G_PI_SCK], u8g->pin_list[U8G_PI_MOSI]);
150
+      SPI_speed = swSpiInit(LCD_SPI_SPEED, u8g->pin_list[U8G_PI_SCK], u8g->pin_list[U8G_PI_MOSI]);
149 151
       u8g_SetPILevel(u8g, U8G_PI_SCK, 0);
150 152
       u8g_SetPILevel(u8g, U8G_PI_MOSI, 0);
151 153
       break;

+ 7
- 5
Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp View File

@@ -23,12 +23,14 @@
23 23
 #if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
24 24
 
25 25
 #include <U8glib.h>
26
+#include "../../shared/HAL_SPI.h"
26 27
 
27
-#undef SPI_SPEED
28
-#define SPI_SPEED 0 // Fastest
29
-//#define SPI_SPEED 2 // Slower
28
+#ifndef LCD_SPI_SPEED
29
+  #define LCD_SPI_SPEED SPI_FULL_SPEED    // Fastest
30
+  //#define LCD_SPI_SPEED SPI_QUARTER_SPEED // Slower
31
+#endif
30 32
 
31
-static uint8_t SPI_speed = SPI_SPEED;
33
+static uint8_t SPI_speed = LCD_SPI_SPEED;
32 34
 
33 35
 static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
34 36
   LOOP_L_N(i, 8) {
@@ -104,7 +106,7 @@ static uint8_t swSpiInit(const uint8_t spi_speed) {
104 106
 uint8_t u8g_com_HAL_STM32F1_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
105 107
   switch (msg) {
106 108
     case U8G_COM_MSG_INIT:
107
-      SPI_speed = swSpiInit(SPI_SPEED);
109
+      SPI_speed = swSpiInit(LCD_SPI_SPEED);
108 110
       break;
109 111
 
110 112
     case U8G_COM_MSG_STOP:

+ 1
- 1
Marlin/src/HAL/STM32F1/tft/xpt2046.h View File

@@ -37,7 +37,7 @@
37 37
   #define TOUCH_SCK_PIN  SCK_PIN
38 38
 #endif
39 39
 #ifndef TOUCH_CS_PIN
40
-  #define TOUCH_CS_PIN   CS_PIN
40
+  #define TOUCH_CS_PIN   SS_PIN
41 41
 #endif
42 42
 #ifndef TOUCH_INT_PIN
43 43
   #define TOUCH_INT_PIN  -1

+ 1
- 1
Marlin/src/libs/L64XX/README.md View File

@@ -16,7 +16,7 @@ This software assumes that all drivers are in one SPI daisy chain.
16 16
 
17 17
 - SDO of the last device is tied to MISO of the controller
18 18
 
19
-- All devices share the same `SCK` and `SS_PIN` pins. The user must supply a macro to control the `RESET_PIN`(s).
19
+- All devices share the same `SCK_PIN` and `SS_PIN` pins. The user must supply a macro to control the `RESET_PIN`(s).
20 20
 
21 21
 - Each L6470 passes the data it saw on its SDI to its neighbor on the **NEXT** SPI cycle (8 bit delay).
22 22
 

+ 1
- 1
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h View File

@@ -174,7 +174,7 @@
174 174
 #define FAN1_PIN                           P2_02
175 175
 
176 176
 #ifndef CONTROLLER_FAN_PIN
177
-  #define CONTROLLER_FAN_PIN               FAN1_PIN
177
+  #define CONTROLLER_FAN_PIN            FAN1_PIN
178 178
 #endif
179 179
 
180 180
 /**

+ 0
- 7
Marlin/src/pins/lpc1769/pins_FLY_CDY.h View File

@@ -33,7 +33,6 @@
33 33
 //
34 34
 #define SERVO0_PIN                         P1_26
35 35
 
36
-
37 36
 //
38 37
 // Limit Switches
39 38
 //
@@ -45,7 +44,6 @@
45 44
 #define Z_MIN_PIN                          P1_22  // Z-
46 45
 #define Z_MAX_PIN                          P0_27  // Z+
47 46
 
48
-
49 47
 //
50 48
 // Steppers
51 49
 //
@@ -106,7 +104,6 @@
106 104
   #endif
107 105
 #endif
108 106
 
109
-
110 107
 #if HAS_TMC_UART
111 108
   #define X_SERIAL_TX_PIN                  P1_04
112 109
   #define X_SERIAL_RX_PIN                  P1_04
@@ -130,8 +127,6 @@
130 127
   #define TMC_BAUD_RATE                    19200
131 128
 #endif
132 129
 
133
-
134
-
135 130
 //
136 131
 // Temperature Sensors
137 132
 //
@@ -153,7 +148,6 @@
153 148
 #define FAN1_PIN                           P1_21
154 149
 #define FAN2_PIN                           P1_24
155 150
 
156
-
157 151
 //
158 152
 // LCD / Controller
159 153
 //
@@ -168,7 +162,6 @@
168 162
 #define BTN_EN2                            P0_01
169 163
 #define BTN_ENC                            P0_28
170 164
 
171
-
172 165
 #ifndef SDCARD_CONNECTION
173 166
   #define SDCARD_CONNECTION              ONBOARD
174 167
 #endif

+ 10
- 136
Marlin/src/pins/stm32f1/pins_BEAST.h View File

@@ -123,16 +123,7 @@
123 123
 #if HAS_WIRED_LCD
124 124
 
125 125
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
126
-    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
127
-    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
128
-    #define LCD_PINS_D4                       52  // SCK (CLK) clock
129
-  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
130
-    #define LCD_PINS_RS                     PB8
131
-    #define LCD_PINS_ENABLE                 PD2
132
-    #define LCD_PINS_D4                     PB12
133
-    #define LCD_PINS_D5                     PB13
134
-    #define LCD_PINS_D6                     PB14
135
-    #define LCD_PINS_D7                     PB15
126
+    #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
136 127
   #else
137 128
     #define LCD_PINS_RS                     PB8
138 129
     #define LCD_PINS_ENABLE                 PD2
@@ -141,144 +132,27 @@
141 132
     #define LCD_PINS_D6                     PB14
142 133
     #define LCD_PINS_D7                     PB15
143 134
     #if !IS_NEWPANEL
144
-      #define BEEPER_PIN                      33
145
-      // Buttons attached to a shift register
146
-      // Not wired yet
147
-      //#define SHIFT_CLK                     38
148
-      //#define SHIFT_LD                      42
149
-      //#define SHIFT_OUT                     40
150
-      //#define SHIFT_EN                      17
135
+      #error "Non-NEWPANEL LCD is not supported."
151 136
     #endif
152 137
   #endif
153 138
 
154 139
   #if IS_NEWPANEL
155
-
156 140
     #if IS_RRD_SC
157
-
158
-      #define BEEPER_PIN                      37
159
-
160
-      #define BTN_EN1                         31
161
-      #define BTN_EN2                         33
162
-      #define BTN_ENC                         35
163
-
164
-      #define SD_DETECT_PIN                   49
165
-      #define KILL_PIN                        41
166
-
167
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
168
-        #define LCD_BACKLIGHT_PIN             39
169
-      #endif
170
-
141
+      #error "RRD Smart Controller is not supported."
171 142
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
172
-
173
-      #define BTN_EN1                         64
174
-      #define BTN_EN2                         59
175
-      #define BTN_ENC                         63
176
-      #define SD_DETECT_PIN                   42
177
-
143
+      #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
178 144
     #elif ENABLED(LCD_I2C_PANELOLU2)
179
-
180
-      #define BTN_EN1                         47
181
-      #define BTN_EN2                         43
182
-      #define BTN_ENC                         32
183
-      #define LCD_SDSS                        53
184
-      #define SD_DETECT_PIN                 -1
185
-      #define KILL_PIN                        41
186
-
145
+      #error "LCD_I2C_PANELOLU2 is not supported."
187 146
     #elif ENABLED(LCD_I2C_VIKI)
188
-
189
-      #define BTN_EN1                         22  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
190
-      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
191
-
192
-      #define BTN_ENC                       -1
193
-      #define LCD_SDSS                        53
194
-      #define SD_DETECT_PIN                   49
195
-
147
+      #error "LCD_I2C_VIKI is not supported."
196 148
     #elif ANY(VIKI2, miniVIKI)
197
-
198
-      #define BEEPER_PIN                      33
199
-
200
-      // Pins for DOGM SPI LCD Support
201
-      #define DOGLCD_A0                       44
202
-      #define DOGLCD_CS                       45
203
-      #define LCD_SCREEN_ROT_180
204
-
205
-      #define BTN_EN1                         22
206
-      #define BTN_EN2                          7
207
-      #define BTN_ENC                         39
208
-
209
-      #define SDSS                            53
210
-      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
211
-
212
-      #define KILL_PIN                        31
213
-
214
-      #define STAT_LED_RED_PIN                32
215
-      #define STAT_LED_BLUE_PIN               35
216
-
149
+      #error "VIKI2 / miniVIKI is not supported."
217 150
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
218
-
219
-      #define BTN_EN1                         35
220
-      #define BTN_EN2                         37
221
-      #define BTN_ENC                         31
222
-      #define SD_DETECT_PIN                   49
223
-      #define LCD_SDSS                        53
224
-      #define KILL_PIN                        41
225
-      #define BEEPER_PIN                      23
226
-      #define DOGLCD_CS                       29
227
-      #define DOGLCD_A0                       27
228
-      #define LCD_BACKLIGHT_PIN               33
229
-
151
+      #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
230 152
     #elif ENABLED(MINIPANEL)
231
-
232
-      #define BEEPER_PIN                      42
233
-      // Pins for DOGM SPI LCD Support
234
-      #define DOGLCD_A0                       44
235
-      #define DOGLCD_CS                       66
236
-      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
237
-      #define SDSS                            53
238
-
239
-      #define KILL_PIN                        64
240
-      // GLCD features
241
-      // Uncomment screen orientation
242
-      //#define LCD_SCREEN_ROT_90
243
-      //#define LCD_SCREEN_ROT_180
244
-      //#define LCD_SCREEN_ROT_270
245
-      // The encoder and click button
246
-      #define BTN_EN1                         40
247
-      #define BTN_EN2                         63
248
-      #define BTN_ENC                         59
249
-      // not connected to a pin
250
-      #define SD_DETECT_PIN                   49
251
-
153
+      #error "MINIPANEL is not supported."
252 154
     #else
253
-
254
-      // Beeper on AUX-4
255
-      #define BEEPER_PIN                      33
256
-
257
-      // Buttons directly attached to AUX-2
258
-      #if IS_RRW_KEYPAD
259
-        #define BTN_EN1                       64
260
-        #define BTN_EN2                       59
261
-        #define BTN_ENC                       63
262
-        #define SHIFT_OUT                     40
263
-        #define SHIFT_CLK                     44
264
-        #define SHIFT_LD                      42
265
-      #elif ENABLED(PANEL_ONE)
266
-        #define BTN_EN1                       59  // AUX2 PIN 3
267
-        #define BTN_EN2                       63  // AUX2 PIN 4
268
-        #define BTN_ENC                       49  // AUX3 PIN 7
269
-      #else
270
-        #define BTN_EN1                       37
271
-        #define BTN_EN2                       35
272
-        #define BTN_ENC                       31
273
-      #endif
274
-
275
-      #if ENABLED(G3D_PANEL)
276
-        #define SD_DETECT_PIN                 49
277
-        #define KILL_PIN                      41
278
-      #else
279
-        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
280
-      #endif
281
-
155
+      #error "Other generic NEWPANEL LCD is not supported."
282 156
     #endif
283 157
   #endif // IS_NEWPANEL
284 158
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h View File

@@ -188,7 +188,7 @@
188 188
        *               Board                                      Display
189 189
        *               _____                                       _____
190 190
        *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
191
-       * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)      (PA9)    GLCD_CS | 3 4 | SD_CS (PA10)
191
+       * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3 4 | SD_CS (PA10)
192 192
        * (FREE)   PB9 | 5 6 | PA10 (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
193 193
        *        RESET | 7 8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7 8 | (FREE)
194 194
        * (BEEPER) PB6 | 9 10| PB5  (SD_DET)                   GND | 9 10| 5V

+ 5
- 5
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h View File

@@ -62,10 +62,10 @@
62 62
 // SPI
63 63
 // Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
64 64
 //
65
+#define SCK_PIN                             PB13  // SPI2
66
+#define MISO_PIN                            PB14  // SPI2
67
+#define MOSI_PIN                            PB15  // SPI2
65 68
 #define SPI_DEVICE 2
66
-#define SCK_PIN                            PB13  // SPI2
67
-#define MISO_PIN                           PB14  // SPI2
68
-#define MOSI_PIN                           PB15  // SPI2
69 69
 
70 70
 // SPI Flash
71 71
 #define HAS_SPI_FLASH                          1
@@ -129,7 +129,7 @@
129 129
   #define Y_SERIAL_RX_PIN                   PA9   // TXD1
130 130
   #define Z_SERIAL_TX_PIN                   PC7   // IO1
131 131
   #define Z_SERIAL_RX_PIN                   PC7   // IO1
132
-  #define TMC_BAUD_RATE                   19200
132
+  #define TMC_BAUD_RATE                    19200
133 133
 #else
134 134
   // Motor current PWM pins
135 135
   #define MOTOR_CURRENT_PWM_XY_PIN          PA6   // VREF2/3 CONTROL XY
@@ -210,7 +210,7 @@
210 210
  */
211 211
 //#define SW_DIO                            PA13
212 212
 //#define SW_CLK                            PA14
213
-//#define SW_RST                            NRST   // (14)
213
+//#define SW_RST                            NRST  // (14)
214 214
 
215 215
 //
216 216
 // Power Supply Control

+ 11
- 136
Marlin/src/pins/stm32f1/pins_STM32F1R.h View File

@@ -100,16 +100,7 @@
100 100
 #if HAS_WIRED_LCD
101 101
 
102 102
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
103
-    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
104
-    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
105
-    #define LCD_PINS_D4                       52  // SCK (CLK) clock
106
-  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
107
-    #define LCD_PINS_RS                     PB8
108
-    #define LCD_PINS_ENABLE                 PD2
109
-    #define LCD_PINS_D4                     PB12
110
-    #define LCD_PINS_D5                     PB13
111
-    #define LCD_PINS_D6                     PB14
112
-    #define LCD_PINS_D7                     PB15
103
+    #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
113 104
   #else
114 105
     #define LCD_PINS_RS                     PB8
115 106
     #define LCD_PINS_ENABLE                 PD2
@@ -118,145 +109,29 @@
118 109
     #define LCD_PINS_D6                     PB14
119 110
     #define LCD_PINS_D7                     PB15
120 111
     #if !IS_NEWPANEL
121
-      #define BEEPER_PIN                      33
122
-      // Buttons attached to a shift register
123
-      // Not wired yet
124
-      //#define SHIFT_CLK                     38
125
-      //#define SHIFT_LD                      42
126
-      //#define SHIFT_OUT                     40
127
-      //#define SHIFT_EN                      17
112
+      #error "Non-NEWPANEL LCD is not supported."
128 113
     #endif
129 114
   #endif
130 115
 
131 116
   #if IS_NEWPANEL
132
-
133 117
     #if IS_RRD_SC
134
-
135
-      #define BEEPER_PIN                      37
136
-
137
-      #define BTN_EN1                         31
138
-      #define BTN_EN2                         33
139
-      #define BTN_ENC                         35
140
-
141
-      #define SD_DETECT_PIN                   49
142
-      #define KILL_PIN                        41
143
-
144
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
145
-        #define LCD_BACKLIGHT_PIN             39
146
-      #endif
147
-
118
+      #error "RRD Smart Controller is not supported."
148 119
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
149
-
150
-      #define BTN_EN1                         64
151
-      #define BTN_EN2                         59
152
-      #define BTN_ENC                         63
153
-      #define SD_DETECT_PIN                   42
154
-
120
+      #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
155 121
     #elif ENABLED(LCD_I2C_PANELOLU2)
156
-
157
-      #define BTN_EN1                         47
158
-      #define BTN_EN2                         43
159
-      #define BTN_ENC                         32
160
-      #define LCD_SDSS                        53
161
-      #define SD_DETECT_PIN                 -1
162
-      #define KILL_PIN                        41
163
-
122
+      #error "LCD_I2C_PANELOLU2 is not supported."
164 123
     #elif ENABLED(LCD_I2C_VIKI)
165
-
166
-      #define BTN_EN1                         22  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
167
-      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
168
-
169
-      #define BTN_ENC                       -1
170
-      #define LCD_SDSS                        53
171
-      #define SD_DETECT_PIN                   49
172
-
124
+      #error "LCD_I2C_VIKI is not supported."
173 125
     #elif ANY(VIKI2, miniVIKI)
174
-
175
-      #define BEEPER_PIN                      33
176
-
177
-      // Pins for DOGM SPI LCD Support
178
-      #define DOGLCD_A0                       44
179
-      #define DOGLCD_CS                       45
180
-      #define LCD_SCREEN_ROT_180
181
-
182
-      #define BTN_EN1                         22
183
-      #define BTN_EN2                          7
184
-      #define BTN_ENC                         39
185
-
186
-      #define SDSS                            53
187
-      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
188
-
189
-      #define KILL_PIN                        31
190
-
191
-      #define STAT_LED_RED_PIN                32
192
-      #define STAT_LED_BLUE_PIN               35
193
-
126
+      #error "VIKI2 / miniVIKI is not supported."
194 127
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
195
-      #define BTN_EN1                         35
196
-      #define BTN_EN2                         37
197
-      #define BTN_ENC                         31
198
-      #define SD_DETECT_PIN                   49
199
-      #define LCD_SDSS                        53
200
-      #define KILL_PIN                        41
201
-      #define BEEPER_PIN                      23
202
-      #define DOGLCD_CS                       29
203
-      #define DOGLCD_A0                       27
204
-      #define LCD_BACKLIGHT_PIN               33
205
-
128
+      #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
206 129
     #elif ENABLED(MINIPANEL)
207
-
208
-      #define BEEPER_PIN                      42
209
-      // Pins for DOGM SPI LCD Support
210
-      #define DOGLCD_A0                       44
211
-      #define DOGLCD_CS                       66
212
-      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
213
-      #define SDSS                            53
214
-
215
-      #define KILL_PIN                        64
216
-      // GLCD features
217
-      // Uncomment screen orientation
218
-      //#define LCD_SCREEN_ROT_90
219
-      //#define LCD_SCREEN_ROT_180
220
-      //#define LCD_SCREEN_ROT_270
221
-      // The encoder and click button
222
-      #define BTN_EN1                         40
223
-      #define BTN_EN2                         63
224
-      #define BTN_ENC                         59
225
-      // not connected to a pin
226
-      #define SD_DETECT_PIN                   49
227
-
130
+      #error "MINIPANEL is not supported."
228 131
     #else
229
-
230
-      // Beeper on AUX-4
231
-      #define BEEPER_PIN                      33
232
-
233
-      // Buttons directly attached to AUX-2
234
-      #if IS_RRW_KEYPAD
235
-        #define BTN_EN1                       64
236
-        #define BTN_EN2                       59
237
-        #define BTN_ENC                       63
238
-        #define SHIFT_OUT                     40
239
-        #define SHIFT_CLK                     44
240
-        #define SHIFT_LD                      42
241
-      #elif ENABLED(PANEL_ONE)
242
-        #define BTN_EN1                       59  // AUX2 PIN 3
243
-        #define BTN_EN2                       63  // AUX2 PIN 4
244
-        #define BTN_ENC                       49  // AUX3 PIN 7
245
-      #else
246
-        #define BTN_EN1                       37
247
-        #define BTN_EN2                       35
248
-        #define BTN_ENC                       31
249
-      #endif
250
-
251
-      #if ENABLED(G3D_PANEL)
252
-        #define SD_DETECT_PIN                 49
253
-        #define KILL_PIN                      41
254
-      #else
255
-        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
256
-      #endif
257
-
132
+      #error "Other generic NEWPANEL LCD is not supported."
258 133
     #endif
259
-  #endif // IS_NEWPANEL
134
+  #endif
260 135
 
261 136
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
262 137
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder

+ 12
- 136
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h View File

@@ -115,16 +115,7 @@
115 115
 #if HAS_WIRED_LCD
116 116
 
117 117
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
118
-    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
119
-    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
120
-    #define LCD_PINS_D4                       52  // SCK (CLK) clock
121
-  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
122
-    #define LCD_PINS_RS                     PB8
123
-    #define LCD_PINS_ENABLE                 PD2
124
-    #define LCD_PINS_D4                     PB12
125
-    #define LCD_PINS_D5                     PB13
126
-    #define LCD_PINS_D6                     PB14
127
-    #define LCD_PINS_D7                     PB15
118
+    #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
128 119
   #else
129 120
     #define LCD_PINS_RS                     PB8
130 121
     #define LCD_PINS_ENABLE                 PD2
@@ -133,13 +124,7 @@
133 124
     #define LCD_PINS_D6                     PB14
134 125
     #define LCD_PINS_D7                     PB15
135 126
     #if !IS_NEWPANEL
136
-      #define BEEPER_PIN                      33
137
-      // Buttons attached to a shift register
138
-      // Not wired yet
139
-      //#define SHIFT_CLK                     38
140
-      //#define SHIFT_LD                      42
141
-      //#define SHIFT_OUT                     40
142
-      //#define SHIFT_EN                      17
127
+      #error "Non-NEWPANEL LCD is not supported."
143 128
     #endif
144 129
   #endif
145 130
 
@@ -154,132 +139,23 @@
154 139
   #elif IS_NEWPANEL
155 140
 
156 141
     #if IS_RRD_SC
157
-
158
-      #define BEEPER_PIN                      37
159
-
160
-      #define BTN_EN1                         31
161
-      #define BTN_EN2                         33
162
-      #define BTN_ENC                         35
163
-
164
-      #define SD_DETECT_PIN                   49
165
-      #define KILL_PIN                        41
166
-
167
-      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
168
-        #define LCD_BACKLIGHT_PIN             39
169
-      #endif
170
-
142
+      #error "RRD Smart Controller is not supported."
171 143
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
172
-
173
-      #define BTN_EN1                         64
174
-      #define BTN_EN2                         59
175
-      #define BTN_ENC                         63
176
-      #define SD_DETECT_PIN                   42
177
-
144
+      #error "REPRAPWORLD_GRAPHICAL_LCD is not supported."
178 145
     #elif ENABLED(LCD_I2C_PANELOLU2)
179
-
180
-      #define BTN_EN1                         47
181
-      #define BTN_EN2                         43
182
-      #define BTN_ENC                         32
183
-      #define LCD_SDSS                        53
184
-      #define SD_DETECT_PIN                 -1
185
-      #define KILL_PIN                        41
186
-
146
+      #error "LCD_I2C_PANELOLU2 is not supported."
187 147
     #elif ENABLED(LCD_I2C_VIKI)
188
-
189
-      #define BTN_EN1                         22  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
190
-      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
191
-
192
-      #define BTN_ENC                       -1
193
-      #define LCD_SDSS                        53
194
-      #define SD_DETECT_PIN                   49
195
-
148
+      #error "LCD_I2C_VIKI is not supported."
196 149
     #elif ANY(VIKI2, miniVIKI)
197
-
198
-      #define BEEPER_PIN                      33
199
-
200
-      // Pins for DOGM SPI LCD Support
201
-      #define DOGLCD_A0                       44
202
-      #define DOGLCD_CS                       45
203
-      #define LCD_SCREEN_ROT_180
204
-
205
-      #define BTN_EN1                         22
206
-      #define BTN_EN2                          7
207
-      #define BTN_ENC                         39
208
-
209
-      #define SDSS                            53
210
-      #define SD_DETECT_PIN                 -1    // Pin 49 for display sd interface, 72 for easy adapter board
211
-
212
-      #define KILL_PIN                        31
213
-
214
-      #define STAT_LED_RED_PIN                32
215
-      #define STAT_LED_BLUE_PIN               35
216
-
150
+      #error "VIKI2 / miniVIKI is not supported."
217 151
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
218
-
219
-      #define BTN_EN1                         35
220
-      #define BTN_EN2                         37
221
-      #define BTN_ENC                         31
222
-      #define SD_DETECT_PIN                   49
223
-      #define LCD_SDSS                        53
224
-      #define KILL_PIN                        41
225
-      #define BEEPER_PIN                      23
226
-      #define DOGLCD_CS                       29
227
-      #define DOGLCD_A0                       27
228
-      #define LCD_BACKLIGHT_PIN               33
229
-
152
+      #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
230 153
     #elif ENABLED(MINIPANEL)
231
-
232
-      #define BEEPER_PIN                      42
233
-      // Pins for DOGM SPI LCD Support
234
-      #define DOGLCD_A0                       44
235
-      #define DOGLCD_CS                       66
236
-      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
237
-      #define SDSS                            53
238
-
239
-      #define KILL_PIN                        64
240
-      // GLCD features
241
-      // Uncomment screen orientation
242
-      //#define LCD_SCREEN_ROT_90
243
-      //#define LCD_SCREEN_ROT_180
244
-      //#define LCD_SCREEN_ROT_270
245
-      // The encoder and click button
246
-      #define BTN_EN1                         40
247
-      #define BTN_EN2                         63
248
-      #define BTN_ENC                         59
249
-      // not connected to a pin
250
-      #define SD_DETECT_PIN                   49
251
-
154
+      #error "MINIPANEL is not supported."
252 155
     #else
253
-
254
-      // Beeper on AUX-4
255
-      #define BEEPER_PIN                      33
256
-
257
-      // Buttons directly attached to AUX-2
258
-      #if IS_RRW_KEYPAD
259
-        #define BTN_EN1                       64
260
-        #define BTN_EN2                       59
261
-        #define BTN_ENC                       63
262
-        #define SHIFT_OUT                     40
263
-        #define SHIFT_CLK                     44
264
-        #define SHIFT_LD                      42
265
-      #elif ENABLED(PANEL_ONE)
266
-        #define BTN_EN1                       59  // AUX2 PIN 3
267
-        #define BTN_EN2                       63  // AUX2 PIN 4
268
-        #define BTN_ENC                       49  // AUX3 PIN 7
269
-      #else
270
-        #define BTN_EN1                       37
271
-        #define BTN_EN2                       35
272
-        #define BTN_ENC                       31
273
-      #endif
274
-
275
-      #if ENABLED(G3D_PANEL)
276
-        #define SD_DETECT_PIN                 49
277
-        #define KILL_PIN                      41
278
-      #else
279
-        //#define SD_DETECT_PIN             -1    // Ramps doesn't use this
280
-      #endif
281
-
156
+      #error "Other generic NEWPANEL LCD is not supported."
282 157
     #endif
283
-  #endif // IS_NEWPANEL
158
+
159
+  #endif
284 160
 
285 161
 #endif // HAS_WIRED_LCD

+ 15
- 15
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h View File

@@ -63,39 +63,39 @@
63 63
 // Limit Switches
64 64
 //
65 65
 #ifdef X_STALL_SENSITIVITY
66
-  #define X_STOP_PIN                        X_DIAG_PIN
66
+  #define X_STOP_PIN                  X_DIAG_PIN
67 67
   #if X_HOME_DIR < 0
68
-    #define X_MAX_PIN                       E0_DIAG_PIN  // X+
68
+    #define X_MAX_PIN                E0_DIAG_PIN  // X+
69 69
   #else
70
-    #define X_MIN_PIN                       E0_DIAG_PIN  // X+
70
+    #define X_MIN_PIN                E0_DIAG_PIN  // X+
71 71
   #endif
72 72
 #else
73
-  #define X_MIN_PIN                         X_DIAG_PIN   // X-
74
-  #define X_MAX_PIN                         E0_DIAG_PIN  // X+
73
+  #define X_MIN_PIN                   X_DIAG_PIN  // X-
74
+  #define X_MAX_PIN                  E0_DIAG_PIN  // X+
75 75
 #endif
76 76
 
77 77
 #ifdef Y_STALL_SENSITIVITY
78
-  #define Y_STOP_PIN                        Y_DIAG_PIN
78
+  #define Y_STOP_PIN                  Y_DIAG_PIN
79 79
   #if Y_HOME_DIR < 0
80
-    #define Y_MAX_PIN                       E1_DIAG_PIN  // Y+
80
+    #define Y_MAX_PIN                E1_DIAG_PIN  // Y+
81 81
   #else
82
-    #define Y_MIN_PIN                       E1_DIAG_PIN  // Y+
82
+    #define Y_MIN_PIN                E1_DIAG_PIN  // Y+
83 83
   #endif
84 84
 #else
85
-  #define Y_MIN_PIN                         Y_DIAG_PIN   // Y-
86
-  #define Y_MAX_PIN                         E1_DIAG_PIN  // Y+
85
+  #define Y_MIN_PIN                   Y_DIAG_PIN  // Y-
86
+  #define Y_MAX_PIN                  E1_DIAG_PIN  // Y+
87 87
 #endif
88 88
 
89 89
 #ifdef Z_STALL_SENSITIVITY
90
-  #define Z_STOP_PIN                        Z_DIAG_PIN
90
+  #define Z_STOP_PIN                  Z_DIAG_PIN
91 91
   #if Z_HOME_DIR < 0
92
-    #define Z_MAX_PIN                       E2_DIAG_PIN  // Z+
92
+    #define Z_MAX_PIN                E2_DIAG_PIN  // Z+
93 93
   #else
94
-    #define Z_MIN_PIN                       E2_DIAG_PIN  // Z+
94
+    #define Z_MIN_PIN                E2_DIAG_PIN  // Z+
95 95
   #endif
96 96
 #else
97
-  #define Z_MIN_PIN                         Z_DIAG_PIN   // Z-
98
-  #define Z_MAX_PIN                         E2_DIAG_PIN  // Z+
97
+  #define Z_MIN_PIN                   Z_DIAG_PIN  // Z-
98
+  #define Z_MAX_PIN                  E2_DIAG_PIN  // Z+
99 99
 #endif
100 100
 
101 101
 //

+ 1
- 1
Marlin/src/pins/stm32f4/pins_LERDGE_K.h View File

@@ -142,7 +142,7 @@
142 142
 // SD support
143 143
 //
144 144
 #define SDIO_SUPPORT
145
-#define SDIO_CLOCK                      4800000
145
+#define SDIO_CLOCK                       4800000
146 146
 
147 147
 //
148 148
 // Misc. Functions

+ 48
- 48
Marlin/src/pins/stm32f4/pins_LERDGE_S.h View File

@@ -35,61 +35,61 @@
35 35
 //
36 36
 // Servos
37 37
 //
38
-#define SERVO0_PIN                          PD12  //confirmed
38
+#define SERVO0_PIN                          PD12
39 39
 //#define SERVO1_PIN                        -1
40 40
 
41 41
 //
42 42
 // Limit Switches
43 43
 //
44
-#define X_MIN_PIN                           PG9   //confirmed
45
-#define Y_MIN_PIN                           PG10  //confirmed
46
-#define Z_MIN_PIN                           PG11  //confirmed
44
+#define X_MIN_PIN                           PG9
45
+#define Y_MIN_PIN                           PG10
46
+#define Z_MIN_PIN                           PG11
47 47
 
48
-#define X_MAX_PIN                           PG12  //confirmed
49
-#define Y_MAX_PIN                           PG13  //confirmed
50
-#define Z_MAX_PIN                           PG14  //confirmed
48
+#define X_MAX_PIN                           PG12
49
+#define Y_MAX_PIN                           PG13
50
+#define Z_MAX_PIN                           PG14
51 51
 
52 52
 //
53 53
 // Filament runout
54 54
 //
55
-#define FIL_RUNOUT_PIN                      PC5   //confirmed
55
+#define FIL_RUNOUT_PIN                      PC5
56 56
 
57 57
 //
58 58
 // Z Probe (when not Z_MIN_PIN)
59 59
 //
60 60
 #ifndef Z_MIN_PROBE_PIN
61
-  #define Z_MIN_PROBE_PIN                   PG8   //confirmed
61
+  #define Z_MIN_PROBE_PIN                   PG8
62 62
 #endif
63 63
 
64 64
 //
65 65
 // Steppers
66 66
 //
67
-#define X_STEP_PIN                          PF7   //confirmed
68
-#define X_DIR_PIN                           PF8   //confirmed
69
-#define X_ENABLE_PIN                        PF6   //confirmed
67
+#define X_STEP_PIN                          PF7
68
+#define X_DIR_PIN                           PF8
69
+#define X_ENABLE_PIN                        PF6
70 70
 
71
-#define Y_STEP_PIN                          PF10  //confirmed
72
-#define Y_DIR_PIN                           PF11  //confirmed
73
-#define Y_ENABLE_PIN                        PF9   //confirmed
71
+#define Y_STEP_PIN                          PF10
72
+#define Y_DIR_PIN                           PF11
73
+#define Y_ENABLE_PIN                        PF9
74 74
 
75
-#define Z_STEP_PIN                          PF13  //confirmed
76
-#define Z_DIR_PIN                           PF14  //confirmed
77
-#define Z_ENABLE_PIN                        PF12  //confirmed
75
+#define Z_STEP_PIN                          PF13
76
+#define Z_DIR_PIN                           PF14
77
+#define Z_ENABLE_PIN                        PF12
78 78
 
79
-#define E0_STEP_PIN                         PG0   //confirmed
80
-#define E0_DIR_PIN                          PG1   //confirmed
81
-#define E0_ENABLE_PIN                       PF15  //confirmed
79
+#define E0_STEP_PIN                         PG0
80
+#define E0_DIR_PIN                          PG1
81
+#define E0_ENABLE_PIN                       PF15
82 82
 
83
-#define E1_STEP_PIN                         PG3   //confirmed
84
-#define E1_DIR_PIN                          PG4   //confirmed
85
-#define E1_ENABLE_PIN                       PG2   //confirmed
83
+#define E1_STEP_PIN                         PG3
84
+#define E1_DIR_PIN                          PG4
85
+#define E1_ENABLE_PIN                       PG2
86 86
 
87 87
 //
88 88
 // Temperature Sensors
89 89
 //
90 90
 #define TEMP_0_PIN                          PC0   // See below for activation of thermistor readings
91 91
 #define TEMP_1_PIN                          PC1   // See below for activation of thermistor readings
92
-#define TEMP_BED_PIN                        PC3   //confirmed
92
+#define TEMP_BED_PIN                        PC3
93 93
 
94 94
 // Lergde-S can choose thermocouple/thermistor mode in software.
95 95
 // For use with thermistors, these pins must be OUT/LOW.
@@ -114,13 +114,13 @@
114 114
 //
115 115
 // Heaters / Fans
116 116
 //
117
-#define HEATER_0_PIN                        PA0   //confirmed
118
-#define HEATER_1_PIN                        PA1   //confirmed
119
-#define HEATER_BED_PIN                      PA3   //confirmed
117
+#define HEATER_0_PIN                        PA0
118
+#define HEATER_1_PIN                        PA1
119
+#define HEATER_BED_PIN                      PA3
120 120
 
121
-#define FAN_PIN                             PA15  // heater 0 fan 1 //confirmed
122
-#define FAN1_PIN                            PB10  // heater 1 fan 2 //confirmed
123
-#define FAN2_PIN                            PF5   // heater 0 fan 2 and heater 1 fan 1 (two sockets, switched together) //confirmed
121
+#define FAN_PIN                             PA15  // heater 0 fan 1
122
+#define FAN1_PIN                            PB10  // heater 1 fan 2
123
+#define FAN2_PIN                            PF5   // heater 0 fan 2 and heater 1 fan 1 (two sockets, switched together)
124 124
 
125 125
 #ifndef E0_AUTO_FAN_PIN
126 126
   #define E0_AUTO_FAN_PIN                   PF5
@@ -136,19 +136,19 @@
136 136
 // LED / Lighting
137 137
 //
138 138
 //Lerdge-S board has two LED connectors (this is the one on the mainboard)
139
-#define CASE_LIGHT_PIN                      PC7   //confirmed
139
+#define CASE_LIGHT_PIN                      PC7
140 140
 
141 141
 //on the dual extrusion addon board is a RGB connector
142
-#define RGB_LED_R_PIN                       PC7   // Shared with the mainboard LED light connector (CASE_LIGHT_PIN), confirmed
143
-#define RGB_LED_G_PIN                       PB0   //confirmed
144
-#define RGB_LED_B_PIN                       PB1   //confirmed
142
+#define RGB_LED_R_PIN                       PC7   // Shared with the mainboard LED light connector (CASE_LIGHT_PIN)
143
+#define RGB_LED_G_PIN                       PB0
144
+#define RGB_LED_B_PIN                       PB1
145 145
 
146 146
 //
147 147
 // Misc. Functions
148 148
 //
149 149
 #define SDSS                                PC11  // SD is working using SDIO, not sure if this definition is needed?
150
-#define LED_PIN                             PC6   // Mainboard soldered green LED, confirmed
151
-#define PS_ON_PIN                           PB2   // Board has a power module connector, confirmed
150
+#define LED_PIN                             PC6   // Mainboard soldered green LED
151
+#define PS_ON_PIN                           PB2   // Board has a power module connector
152 152
 #define KILL_PIN                            -1    // There is no reset button on the LCD
153 153
 #define POWER_LOSS_PIN                      -1    // PB2 could be used for this as well
154 154
 
@@ -158,12 +158,12 @@
158 158
 #define SDIO_SUPPORT
159 159
 #define SDIO_CLOCK                       4800000
160 160
 
161
-#define SCK_PIN                             PC12  //confirmed working
162
-#define MISO_PIN                            PC8   //confirmed working
163
-#define MOSI_PIN                            PD2   //confirmed working
164
-#define SS_PIN                              PC11  //confirmed working
161
+#define SCK_PIN                             PC12
162
+#define MISO_PIN                            PC8
163
+#define MOSI_PIN                            PD2
164
+#define SS_PIN                              PC11
165 165
 
166
-#define SD_DETECT_PIN                       PG15  //confirmed
166
+#define SD_DETECT_PIN                       PG15
167 167
 
168 168
 //
169 169
 // Persistent Storage
@@ -190,14 +190,14 @@
190 190
 //
191 191
 
192 192
 // The LCD is initialized in FSMC mode
193
-#define BEEPER_PIN                          PD13  //confirmed
193
+#define BEEPER_PIN                          PD13
194 194
 
195
-#define BTN_EN1                             PC14  //confirmed
196
-#define BTN_EN2                             PC15  //confirmed
197
-#define BTN_ENC                             PC13  //confirmed
195
+#define BTN_EN1                             PC14
196
+#define BTN_EN2                             PC15
197
+#define BTN_ENC                             PC13
198 198
 
199
-#define TFT_RESET_PIN                       PD6   //confirmed
200
-#define TFT_BACKLIGHT_PIN                   PD3   //confirmed
199
+#define TFT_RESET_PIN                       PD6
200
+#define TFT_BACKLIGHT_PIN                   PD3
201 201
 
202 202
 #define TFT_CS_PIN                          PD7   // TFT works
203 203
 #define TFT_RS_PIN                          PD11  // TFT works

+ 1
- 1
Marlin/src/pins/stm32f4/pins_LERDGE_X.h View File

@@ -127,7 +127,7 @@
127 127
 //
128 128
 #define SDIO_SUPPORT
129 129
 #define SD_DETECT_PIN                       PA8
130
-#define SDIO_CLOCK                      4800000
130
+#define SDIO_CLOCK                       4800000
131 131
 
132 132
 //
133 133
 // LCD / Controller

+ 0
- 3
buildroot/share/PlatformIO/variants/CHITU_F103/board/board.h View File

@@ -69,14 +69,11 @@
69 69
 #define BOARD_SPI1_MISO_PIN     PA6
70 70
 #define BOARD_SPI1_MOSI_PIN     PA7
71 71
 
72
-
73
-
74 72
 #define BOARD_SPI2_NSS_PIN      PB12
75 73
 #define BOARD_SPI2_SCK_PIN      PB13
76 74
 #define BOARD_SPI2_MISO_PIN     PB14
77 75
 #define BOARD_SPI2_MOSI_PIN     PB15
78 76
 
79
-
80 77
 #define BOARD_SPI3_NSS_PIN      PA15
81 78
 #define BOARD_SPI3_SCK_PIN      PB3
82 79
 #define BOARD_SPI3_MISO_PIN     PB4

Loading…
Cancel
Save