Skip to content

Commit 921591d

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 SDIO_SUPPORT => ONBOARD_SDIO
1 parent 5664c02 commit 921591d

35 files changed

+47
-47
lines changed

‎Marlin/src/HAL/SAMD21/inc/SanityCheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#error "EMERGENCY_PARSER is not yet implemented for SAMD21. Disable EMERGENCY_PARSER to continue."
4242
#endif
4343

44-
#if ENABLED(SDIO_SUPPORT)
45-
#error "SDIO_SUPPORT is not supported on SAMD21."
44+
#if ENABLED(ONBOARD_SDIO)
45+
#error "ONBOARD_SDIO is not supported on SAMD21."
4646
#endif
4747

4848
#if ENABLED(FAST_PWM_FAN)

‎Marlin/src/HAL/SAMD51/inc/SanityCheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
#error "EMERGENCY_PARSER is not yet implemented for SAMD51. Disable EMERGENCY_PARSER to continue."
5555
#endif
5656

57-
#if ENABLED(SDIO_SUPPORT)
58-
#error "SDIO_SUPPORT is not supported on SAMD51."
57+
#if ENABLED(ONBOARD_SDIO)
58+
#error "ONBOARD_SDIO is not supported on SAMD51."
5959
#endif
6060

6161
#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY

‎Marlin/src/HAL/STM32/HAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void MarlinHAL::init() {
7070
constexpr int cpuFreq = F_CPU;
7171
UNUSED(cpuFreq);
7272

73-
#if HAS_MEDIA && DISABLED(SDIO_SUPPORT) && (defined(SDSS) && SDSS != -1)
73+
#if HAS_MEDIA && DISABLED(ONBOARD_SDIO) && (defined(SDSS) && SDSS != -1)
7474
OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up
7575
#endif
7676

‎Marlin/src/HAL/STM32/sdio.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "../../inc/MarlinConfig.h"
2828

29-
#if ENABLED(SDIO_SUPPORT)
29+
#if ENABLED(ONBOARD_SDIO)
3030

3131
#include "sdio.h"
3232

@@ -453,5 +453,5 @@ uint32_t SDIO_GetCardSize() {
453453
return (uint32_t)(hsd.SdCard.BlockNbr) * (hsd.SdCard.BlockSize);
454454
}
455455

456-
#endif // SDIO_SUPPORT
456+
#endif // ONBOARD_SDIO
457457
#endif // HAL_STM32

‎Marlin/src/HAL/STM32F1/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030

3131
// Allow for no media drives
3232
#if !HAS_MEDIA
33-
#undef SDIO_SUPPORT
33+
#undef ONBOARD_SDIO
3434
#endif

‎Marlin/src/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@
545545
#endif
546546

547547
#if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD)
548-
#if ENABLED(SDIO_SUPPORT)
548+
#if ENABLED(ONBOARD_SDIO)
549549
#define NEED_SD2CARD_SDIO 1
550550
#else
551551
#define NEED_SD2CARD_SPI 1

‎Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
//
116116
#define SD_DETECT_PIN PC7
117117

118-
#ifndef SDIO_SUPPORT
119-
#define SDIO_SUPPORT
118+
#ifndef ONBOARD_SDIO
119+
#define ONBOARD_SDIO
120120
#endif
121-
#if ENABLED(SDIO_SUPPORT)
121+
#if ENABLED(ONBOARD_SDIO)
122122
//
123123
// SPI
124124
//

‎Marlin/src/pins/stm32f1/pins_CHITU3D_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
//
170170
// SD Card
171171
//
172-
#define SDIO_SUPPORT
172+
#define ONBOARD_SDIO
173173
#define SD_DETECT_PIN -1 // PF0, but it isn't connected
174174
#define SDIO_CLOCK 4500000
175175
#define SDIO_READ_RETRIES 16

‎Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
#define SDCARD_CONNECTION ONBOARD
128128
#define ON_BOARD_SPI_DEVICE 1
129129
#define ONBOARD_SD_CS_PIN PC12 // SDSS
130-
#define SDIO_SUPPORT
130+
#define ONBOARD_SDIO
131131
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
132132

133133
//

‎Marlin/src/pins/stm32f1/pins_CREALITY_V4.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
//
160160
#define SD_DETECT_PIN PC7
161161
#define SDCARD_CONNECTION ONBOARD
162-
#define SDIO_SUPPORT
162+
#define ONBOARD_SDIO
163163
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
164164

165165
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)

‎Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
#define SDCARD_CONNECTION ONBOARD
141141
#define ONBOARD_SPI_DEVICE 1
142142
#define ONBOARD_SD_CS_PIN PA4 // SDSS
143-
#define SDIO_SUPPORT
143+
#define ONBOARD_SDIO
144144
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
145145

146146
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)

‎Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
#define SD_DETECT_PIN PC7
106106
#define NO_SD_HOST_DRIVE // SD is only seen by the printer
107107

108-
#define SDIO_SUPPORT // Extra added by Creality
108+
#define ONBOARD_SDIO // Extra added by Creality
109109
#define SDIO_CLOCK 6000000 // In original source code overridden by Creality in sdio.h
110110

111111
//

‎Marlin/src/pins/stm32f1/pins_CREALITY_V521.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
#define SDCARD_CONNECTION ONBOARD
145145
#define ONBOARD_SPI_DEVICE 1
146146
#define ONBOARD_SD_CS_PIN PC11 // SDSS
147-
#define SDIO_SUPPORT
147+
#define ONBOARD_SDIO
148148
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
149149

150150
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)

‎Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
#define SD_SS_PIN -1
257257
#define SD_DETECT_PIN PD12 // SD_CD (if -1 no detection)
258258
#else
259-
#define SDIO_SUPPORT
259+
#define ONBOARD_SDIO
260260
#define SDIO_CLOCK 4500000 // 4.5 MHz
261261
#define SDIO_READ_RETRIES 16
262262
#define ONBOARD_SPI_DEVICE 1 // SPI1

‎Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
#define LCD_BRIGHTNESS_DEFAULT TFT_BACKLIGHT_PWM
159159
#endif
160160

161-
#if ENABLED(SDIO_SUPPORT)
161+
#if ENABLED(ONBOARD_SDIO)
162162
#define SD_SS_PIN -1 // else SDSS set to PA4 in M43 (spi_pins.h)
163163
#endif
164164

‎Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
#define SDCARD_CONNECTION ONBOARD
121121
#endif
122122

123-
#define SDIO_SUPPORT
123+
#define ONBOARD_SDIO
124124
#define SDIO_CLOCK 4500000 // 4.5 MHz
125125
#define SDIO_READ_RETRIES 16
126126

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@
197197
// SPI1(PA7) & SPI3(PB5) not available
198198
#define SPI_DEVICE 2
199199

200-
#define SDIO_SUPPORT
200+
#define ONBOARD_SDIO
201201
#define SDIO_CLOCK 4500000
202202
#define SDIO_READ_RETRIES 16
203-
#if ENABLED(SDIO_SUPPORT)
203+
#if ENABLED(ONBOARD_SDIO)
204204
#define SD_SCK_PIN PB13 // SPI2
205205
#define SD_MISO_PIN PB14 // SPI2
206206
#define SD_MOSI_PIN PB15 // SPI2

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
#endif
240240

241241
#if SD_CONNECTION_IS(ONBOARD)
242-
#define SDIO_SUPPORT
242+
#define ONBOARD_SDIO
243243
#define SDIO_CLOCK 4500000 // 4.5 MHz
244244
#define SD_DETECT_PIN PD12
245245
#define ONBOARD_SD_CS_PIN PC11

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
#define SDCARD_CONNECTION ONBOARD
134134
#endif
135135

136-
#define SDIO_SUPPORT
136+
#define ONBOARD_SDIO
137137
#define SDIO_CLOCK 4500000 // 4.5 MHz
138138
#define SD_DETECT_PIN PD12
139139
#define ONBOARD_SPI_DEVICE 1 // SPI1

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
#endif
240240

241241
#if SD_CONNECTION_IS(ONBOARD)
242-
#define SDIO_SUPPORT
242+
#define ONBOARD_SDIO
243243
#define SDIO_CLOCK 4500000 // 4.5 MHz
244244
#define SD_DETECT_PIN PD12
245245
#define ONBOARD_SD_CS_PIN PC11

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
#define SDCARD_CONNECTION ONBOARD
164164
#endif
165165

166-
#define SDIO_SUPPORT
166+
#define ONBOARD_SDIO
167167
#define SDIO_CLOCK 4500000 // 4.5 MHz
168168
#define SD_DETECT_PIN PD12
169169
#define ONBOARD_SD_CS_PIN PC11

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
#define SD_MOSI_PIN PB15
211211
#define SD_SS_PIN PG6
212212
#elif SD_CONNECTION_IS(ONBOARD)
213-
#define SDIO_SUPPORT
213+
#define ONBOARD_SDIO
214214
#define SD_DETECT_PIN PD12
215215
#define ONBOARD_SD_CS_PIN PC11
216216
#elif SD_CONNECTION_IS(CUSTOM_CABLE)

‎Marlin/src/pins/stm32f1/pins_SOVOL_V131.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
#define SDCARD_CONNECTION ONBOARD
188188
#define ONBOARD_SPI_DEVICE 1
189189
#define ONBOARD_SD_CS_PIN PA4 // SDSS
190-
#define SDIO_SUPPORT
190+
#define ONBOARD_SDIO
191191
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
192192

193193
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)

‎Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
// SPI1(PA7) & SPI3(PB5) not available
187187
#define SPI_DEVICE 2
188188

189-
#if ENABLED(SDIO_SUPPORT)
189+
#if ENABLED(ONBOARD_SDIO)
190190
#define SD_SCK_PIN PB13 // SPI2 ok
191191
#define SD_MISO_PIN PB14 // SPI2 ok
192192
#define SD_MOSI_PIN PB15 // SPI2 ok

‎Marlin/src/pins/stm32f4/pins_ANET_ET4.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@
195195
//
196196
// SD Card
197197
//
198-
//#define SDIO_SUPPORT
198+
//#define ONBOARD_SDIO
199199

200200
#ifndef SDCARD_CONNECTION
201201
#define SDCARD_CONNECTION CUSTOM_CABLE
202202
#endif
203203

204204
#if HAS_MEDIA
205205

206-
#if DISABLED(SDIO_SUPPORT)
206+
#if DISABLED(ONBOARD_SDIO)
207207
#define SOFTWARE_SPI
208208
#define SDSS PC11
209209
#define SD_SS_PIN SDSS

‎Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
#endif
146146

147147
#if SD_CONNECTION_IS(ONBOARD)
148-
#define SDIO_SUPPORT // Use SDIO for onboard SD
149-
#if DISABLED(SDIO_SUPPORT)
148+
#define ONBOARD_SDIO // Use SDIO for onboard SD
149+
#if DISABLED(ONBOARD_SDIO)
150150
#define SOFTWARE_SPI // Use soft SPI for onboard SD
151151
#define SDSS PC11
152152
#define SD_SCK_PIN PC12

‎Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
#endif
384384

385385
#if SD_CONNECTION_IS(ONBOARD)
386-
#define SDIO_SUPPORT // Use SDIO for onboard SD
386+
#define ONBOARD_SDIO // Use SDIO for onboard SD
387387
//#define SDIO_CLOCK 48000000
388388
#define SD_DETECT_PIN PC4
389389
#elif SD_CONNECTION_IS(CUSTOM_CABLE)

‎Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
352352
//
353353
#if SD_CONNECTION_IS(ONBOARD)
354-
#define SDIO_SUPPORT // Use SDIO for onboard SD
354+
#define ONBOARD_SDIO // Use SDIO for onboard SD
355355
#ifndef SD_DETECT_STATE
356356
#define SD_DETECT_STATE HIGH
357357
#elif SD_DETECT_STATE == LOW

‎Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
#define SD_MOSI_PIN EXP2_06_PIN
373373
#define SD_DETECT_PIN EXP2_07_PIN
374374
#elif SD_CONNECTION_IS(ONBOARD)
375-
#define SDIO_SUPPORT // Use SDIO for onboard SD
375+
#define ONBOARD_SDIO // Use SDIO for onboard SD
376376
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
377377
#error "No custom SD drive cable defined for this board."
378378
#endif

‎Marlin/src/pins/stm32f4/pins_FLYF407ZG.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@
214214

215215
#if SD_CONNECTION_IS(ONBOARD)
216216

217-
#define SDIO_SUPPORT // Use SDIO for onboard SD
217+
#define ONBOARD_SDIO // Use SDIO for onboard SD
218218

219-
#if DISABLED(SDIO_SUPPORT)
219+
#if DISABLED(ONBOARD_SDIO)
220220
#define SOFTWARE_SPI // Use soft SPI for onboard SD
221221
#define SDSS PC11
222222
#define SD_SCK_PIN PC12

‎Marlin/src/pins/stm32f4/pins_LERDGE_K.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@
217217
//
218218
// SD support
219219
//
220-
#define SDIO_SUPPORT
220+
#define ONBOARD_SDIO
221221
#define SDIO_CLOCK 4800000
222222
#define SD_DETECT_PIN PA8
223-
#if DISABLED(SDIO_SUPPORT)
223+
#if DISABLED(ONBOARD_SDIO)
224224
#define SOFTWARE_SPI
225225
#define SD_SCK_PIN PC12
226226
#define SD_MISO_PIN PC8

‎Marlin/src/pins/stm32f4/pins_LERDGE_S.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@
160160
//
161161
// SD support
162162
//
163-
#define SDIO_SUPPORT
163+
#define ONBOARD_SDIO
164164
#define SDIO_CLOCK 4800000
165165
#define SD_DETECT_PIN PG15
166-
#if DISABLED(SDIO_SUPPORT)
166+
#if DISABLED(ONBOARD_SDIO)
167167
#define SOFTWARE_SPI
168168
#define SD_SCK_PIN PC12
169169
#define SD_MISO_PIN PC8

‎Marlin/src/pins/stm32f4/pins_LERDGE_X.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
//
119119
// SD support (On board)
120120
//
121-
#define SDIO_SUPPORT
121+
#define ONBOARD_SDIO
122122
#define SD_DETECT_PIN PA8
123123
#define SDIO_CLOCK 4800000
124-
#if DISABLED(SDIO_SUPPORT)
124+
#if DISABLED(ONBOARD_SDIO)
125125
#define SOFTWARE_SPI
126126
#define SD_SCK_PIN PC12
127127
#define SD_MISO_PIN PC8

‎Marlin/src/pins/stm32f4/pins_TRONXY_V10.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
//
252252
// SD Card
253253
//
254-
#define SDIO_SUPPORT
254+
#define ONBOARD_SDIO
255255
#define SD_DETECT_PIN -1 // PF0, but not connected
256256
#define SDIO_CLOCK 4500000
257257
#define SDIO_READ_RETRIES 16

‎Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
#define SD_MOSI_PIN EXP2_06_PIN
361361
#define SD_DETECT_PIN EXP2_07_PIN
362362
#elif SD_CONNECTION_IS(ONBOARD)
363-
#define SDIO_SUPPORT
363+
#define ONBOARD_SDIO
364364
#define SDIO_CLOCK 24000000 // 24MHz
365365
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
366366
#error "No custom SD drive cable defined for this board."

0 commit comments

Comments
 (0)