Browse Source

USB Media Host followup

Restore HAS_SHARED_MEDIA
Scott Lahteine 4 years ago
parent
commit
11b811820f

+ 3
- 2
Marlin/src/HAL/LPC1768/main.cpp View File

@@ -35,10 +35,11 @@ extern "C" {
35 35
   #include <debug_frmwrk.h>
36 36
 }
37 37
 
38
-#include "../../sd/cardreader.h"
39 38
 #include "../../inc/MarlinConfig.h"
40 39
 #include "../../core/millis_t.h"
41 40
 
41
+#include "../../sd/cardreader.h"
42
+
42 43
 extern uint32_t MSC_SD_Init(uint8_t pdrv);
43 44
 extern "C" int isLPC1769();
44 45
 extern "C" void disk_timerproc();
@@ -140,7 +141,7 @@ void HAL_init() {
140 141
 
141 142
 // HAL idle task
142 143
 void HAL_idletask() {
143
-  #if HAS_SD_HOST_DRIVE
144
+  #if HAS_SHARED_MEDIA
144 145
     // If Marlin is using the SD card we need to lock it to prevent access from
145 146
     // a PC via USB.
146 147
     // Other HALs use IS_SD_PRINTING() and IS_SD_FILE_OPEN() to check for access but

+ 1
- 1
Marlin/src/HAL/STM32F1/HAL.cpp View File

@@ -263,7 +263,7 @@ void HAL_init() {
263 263
 
264 264
 // HAL idle task
265 265
 void HAL_idletask() {
266
-  #if HAS_SD_HOST_DRIVE
266
+  #if HAS_SHARED_MEDIA
267 267
     // If Marlin is using the SD card we need to lock it to prevent access from
268 268
     // a PC via USB.
269 269
     // Other HALs use IS_SD_PRINTING() and IS_SD_FILE_OPEN() to check for access but

+ 1
- 0
Marlin/src/inc/Conditionals_post.h View File

@@ -367,6 +367,7 @@
367 367
     // mount/unmount the card and refresh it. So we disable card detect.
368 368
     //
369 369
     #undef SD_DETECT_PIN
370
+    #define HAS_SHARED_MEDIA 1
370 371
   #endif
371 372
 
372 373
   #if PIN_EXISTS(SD_DETECT)

Loading…
Cancel
Save