Browse Source

MKS Robin Mini uses ONBOARD_SPI_DEVICE (#19460)

Jason Smith 3 years ago
parent
commit
023cb54fae
No account linked to committer's email address

+ 8
- 8
Marlin/src/HAL/STM32F1/onboard_sd.cpp View File

@@ -21,23 +21,23 @@
21 21
 #include "fastio.h"
22 22
 
23 23
 #if HAS_SHARED_MEDIA
24
-  #ifndef ON_BOARD_SPI_DEVICE
25
-    #define ON_BOARD_SPI_DEVICE SPI_DEVICE
24
+  #ifndef ONBOARD_SPI_DEVICE
25
+    #define ONBOARD_SPI_DEVICE SPI_DEVICE
26 26
   #endif
27 27
   #define ONBOARD_SD_SPI SPI
28 28
 #else
29
-  SPIClass OnBoardSPI(ON_BOARD_SPI_DEVICE);
30
-  #define ONBOARD_SD_SPI OnBoardSPI
29
+  SPIClass OnboardSPI(ONBOARD_SPI_DEVICE);
30
+  #define ONBOARD_SD_SPI OnboardSPI
31 31
 #endif
32 32
 
33
-#if ON_BOARD_SPI_DEVICE == 1
33
+#if ONBOARD_SPI_DEVICE == 1
34 34
   #define SPI_CLOCK_MAX SPI_BAUD_PCLK_DIV_4
35 35
 #else
36 36
   #define SPI_CLOCK_MAX SPI_BAUD_PCLK_DIV_2
37 37
 #endif
38 38
 
39
-#define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  /* Set OnBoardSPI cs low */
40
-#define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) /* Set OnBoardSPI cs high */
39
+#define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  /* Set OnboardSPI cs low */
40
+#define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) /* Set OnboardSPI cs high */
41 41
 
42 42
 #define FCLK_FAST() ONBOARD_SD_SPI.setClockDivider(SPI_CLOCK_MAX)
43 43
 #define FCLK_SLOW() ONBOARD_SD_SPI.setClockDivider(SPI_BAUD_PCLK_DIV_256)
@@ -152,7 +152,7 @@ static int select() { /* 1:OK, 0:Timeout */
152 152
 /*-----------------------------------------------------------------------*/
153 153
 
154 154
 static void power_on() {  /* Enable SSP module and attach it to I/O pads */
155
-  ONBOARD_SD_SPI.setModule(ON_BOARD_SPI_DEVICE);
155
+  ONBOARD_SD_SPI.setModule(ONBOARD_SPI_DEVICE);
156 156
   ONBOARD_SD_SPI.begin();
157 157
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
158 158
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);

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

@@ -288,5 +288,5 @@
288 288
   #error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
289 289
 #endif
290 290
 
291
-#define ON_BOARD_SPI_DEVICE                    1  // SPI1
291
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
292 292
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card

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

@@ -236,5 +236,5 @@
236 236
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
237 237
 #endif
238 238
 
239
-#define ON_BOARD_SPI_DEVICE                    1  // SPI1
239
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
240 240
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card

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

@@ -213,5 +213,5 @@
213 213
   #define MOSI_PIN                          PA7
214 214
   #define SS_PIN                            PA4
215 215
 #endif
216
-#define ON_BOARD_SPI_DEVICE                    1  // SPI1
216
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
217 217
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card

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

@@ -173,7 +173,7 @@
173 173
   #define SS_PIN                            PA4
174 174
 #endif
175 175
 
176
-#define ON_BOARD_SPI_DEVICE                    1  // SPI1
176
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
177 177
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for SD-NAND
178 178
 
179 179
 #endif

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

@@ -150,7 +150,7 @@
150 150
 //
151 151
 #define SD_DETECT_PIN                       PC7
152 152
 #define SDCARD_CONNECTION                ONBOARD
153
-#define ON_BOARD_SPI_DEVICE                    1
153
+#define ONBOARD_SPI_DEVICE                     1
154 154
 #define ONBOARD_SD_CS_PIN                   PA4   // SDSS
155 155
 #define SDIO_SUPPORT
156 156
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer

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

@@ -126,6 +126,7 @@
126 126
 #define SDIO_SUPPORT
127 127
 #define SDIO_CLOCK                       4500000  // 4.5 MHz
128 128
 #define SD_DETECT_PIN                       PD12
129
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
129 130
 #define ONBOARD_SD_CS_PIN                   PC11
130 131
 
131 132
 //

Loading…
Cancel
Save