Kaynağa Gözat

USB Media Host followup

Restore HAS_SHARED_MEDIA
Scott Lahteine 4 yıl önce
ebeveyn
işleme
11b811820f

+ 3
- 2
Marlin/src/HAL/LPC1768/main.cpp Dosyayı Görüntüle

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

263
 
263
 
264
 // HAL idle task
264
 // HAL idle task
265
 void HAL_idletask() {
265
 void HAL_idletask() {
266
-  #if HAS_SD_HOST_DRIVE
266
+  #if HAS_SHARED_MEDIA
267
     // If Marlin is using the SD card we need to lock it to prevent access from
267
     // If Marlin is using the SD card we need to lock it to prevent access from
268
     // a PC via USB.
268
     // a PC via USB.
269
     // Other HALs use IS_SD_PRINTING() and IS_SD_FILE_OPEN() to check for access but
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 Dosyayı Görüntüle

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

Loading…
İptal
Kaydet