bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

It looks like HAS_ONBOARD_SD is obsolete

Browse Source
This commit is contained in:
Scott Lahteine 2020-04-16 01:56:37 -05:00
parent bc856fd8ec
commit 880f63b008
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/STM32F1/msc_sd.cpp
View File

@ -25,7 +25,7 @@ USBCompositeSerial MarlinCompositeSerial;
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#ifdef HAS_ONBOARD_SD #if SD_CONNECTION_IS(ONBOARD)
#include "onboard_sd.h" #include "onboard_sd.h"
@ -47,7 +47,7 @@ void MSC_SD_init() {
USBComposite.end(); USBComposite.end();
USBComposite.clear(); USBComposite.clear();
// Set api and register mass storage // Set api and register mass storage
#ifdef HAS_ONBOARD_SD #if SD_CONNECTION_IS(ONBOARD)
uint32_t cardSize; uint32_t cardSize;
if (disk_initialize(0) == RES_OK) { if (disk_initialize(0) == RES_OK) {
if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) { if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) {

6
Marlin/src/HAL/STM32F1/onboard_sd.cpp
View File

@ -14,13 +14,13 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#ifdef HAS_ONBOARD_SD #if SD_CONNECTION_IS(ONBOARD)
#include "onboard_sd.h" #include "onboard_sd.h"
#include "SPI.h" #include "SPI.h"
#include "fastio.h" #include "fastio.h"
#ifdef SHARED_SD_CARD #if ENABLED(SHARED_SD_CARD)
#ifndef ON_BOARD_SPI_DEVICE #ifndef ON_BOARD_SPI_DEVICE
#define ON_BOARD_SPI_DEVICE SPI_DEVICE #define ON_BOARD_SPI_DEVICE SPI_DEVICE
#endif #endif
@ -553,4 +553,4 @@ DRESULT disk_read (
#endif // _DISKIO_IOCTL #endif // _DISKIO_IOCTL
#endif // HAS_ONBOARD_SD #endif // SD_CONNECTION_IS(ONBOARD)

2
Marlin/src/inc/Conditionals_post.h
View File

@ -339,7 +339,7 @@
#endif #endif
#if DISABLED(SHARED_SD_CARD) #if DISABLED(SHARED_SD_CARD)
#define INIT_SDCARD_ON_BOOT 1 #define INIT_SDCARD_ON_BOOT
#endif #endif
#if PIN_EXISTS(SD_DETECT) #if PIN_EXISTS(SD_DETECT)

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@ -223,8 +223,6 @@
// //
// SD Support // SD Support
// //
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
View File

@ -181,8 +181,6 @@
// //
// SD Support // SD Support
// //
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif

3
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -179,8 +179,7 @@
// //
// By default the onboard SD is enabled. // By default the onboard SD is enabled.
// set SDCARD_CONNECTION form 'ONBOARD' to 'LCD' and use an external SD (connected to LCD) // Change SDCARD_CONNECTION from 'ONBOARD' to 'LCD' for an external (LCD module) SD
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif