Selaa lähdekoodia

It looks like HAS_ONBOARD_SD is obsolete

Scott Lahteine 5 vuotta sitten
vanhempi
commit
880f63b008

+ 2
- 2
Marlin/src/HAL/STM32F1/msc_sd.cpp Näytä tiedosto

25
 
25
 
26
 #include "../../inc/MarlinConfig.h"
26
 #include "../../inc/MarlinConfig.h"
27
 
27
 
28
-#ifdef HAS_ONBOARD_SD
28
+#if SD_CONNECTION_IS(ONBOARD)
29
 
29
 
30
   #include "onboard_sd.h"
30
   #include "onboard_sd.h"
31
 
31
 
47
   USBComposite.end();
47
   USBComposite.end();
48
   USBComposite.clear();
48
   USBComposite.clear();
49
   // Set api and register mass storage
49
   // Set api and register mass storage
50
-  #ifdef HAS_ONBOARD_SD
50
+  #if SD_CONNECTION_IS(ONBOARD)
51
     uint32_t cardSize;
51
     uint32_t cardSize;
52
     if (disk_initialize(0) == RES_OK) {
52
     if (disk_initialize(0) == RES_OK) {
53
       if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) {
53
       if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) {

+ 3
- 3
Marlin/src/HAL/STM32F1/onboard_sd.cpp Näytä tiedosto

14
 
14
 
15
 #include "../../inc/MarlinConfig.h"
15
 #include "../../inc/MarlinConfig.h"
16
 
16
 
17
-#ifdef HAS_ONBOARD_SD
17
+#if SD_CONNECTION_IS(ONBOARD)
18
 
18
 
19
 #include "onboard_sd.h"
19
 #include "onboard_sd.h"
20
 #include "SPI.h"
20
 #include "SPI.h"
21
 #include "fastio.h"
21
 #include "fastio.h"
22
 
22
 
23
-#ifdef SHARED_SD_CARD
23
+#if ENABLED(SHARED_SD_CARD)
24
   #ifndef ON_BOARD_SPI_DEVICE
24
   #ifndef ON_BOARD_SPI_DEVICE
25
     #define ON_BOARD_SPI_DEVICE SPI_DEVICE
25
     #define ON_BOARD_SPI_DEVICE SPI_DEVICE
26
   #endif
26
   #endif
553
 
553
 
554
 #endif // _DISKIO_IOCTL
554
 #endif // _DISKIO_IOCTL
555
 
555
 
556
-#endif // HAS_ONBOARD_SD
556
+#endif // SD_CONNECTION_IS(ONBOARD)

+ 1
- 1
Marlin/src/inc/Conditionals_post.h Näytä tiedosto

339
   #endif
339
   #endif
340
 
340
 
341
   #if DISABLED(SHARED_SD_CARD)
341
   #if DISABLED(SHARED_SD_CARD)
342
-    #define INIT_SDCARD_ON_BOOT 1
342
+    #define INIT_SDCARD_ON_BOOT
343
   #endif
343
   #endif
344
 
344
 
345
   #if PIN_EXISTS(SD_DETECT)
345
   #if PIN_EXISTS(SD_DETECT)

+ 0
- 2
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h Näytä tiedosto

223
 //
223
 //
224
 // SD Support
224
 // SD Support
225
 //
225
 //
226
-#define HAS_ONBOARD_SD
227
-
228
 #ifndef SDCARD_CONNECTION
226
 #ifndef SDCARD_CONNECTION
229
   #define SDCARD_CONNECTION              ONBOARD
227
   #define SDCARD_CONNECTION              ONBOARD
230
 #endif
228
 #endif

+ 0
- 2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h Näytä tiedosto

181
 //
181
 //
182
 // SD Support
182
 // SD Support
183
 //
183
 //
184
-#define HAS_ONBOARD_SD
185
-
186
 #ifndef SDCARD_CONNECTION
184
 #ifndef SDCARD_CONNECTION
187
   #define SDCARD_CONNECTION              ONBOARD
185
   #define SDCARD_CONNECTION              ONBOARD
188
 #endif
186
 #endif

+ 1
- 2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h Näytä tiedosto

179
 //
179
 //
180
 
180
 
181
 // By default the onboard SD is enabled.
181
 // By default the onboard SD is enabled.
182
-// set SDCARD_CONNECTION form 'ONBOARD' to 'LCD' and use an external SD (connected to LCD)
183
-#define HAS_ONBOARD_SD
182
+// Change SDCARD_CONNECTION from 'ONBOARD' to 'LCD' for an external (LCD module) SD
184
 #ifndef SDCARD_CONNECTION
183
 #ifndef SDCARD_CONNECTION
185
   #define SDCARD_CONNECTION              ONBOARD
184
   #define SDCARD_CONNECTION              ONBOARD
186
 #endif
185
 #endif

Loading…
Peruuta
Tallenna