CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB Media Host followup

Browse Source 
Restore HAS_SHARED_MEDIA
This commit is contained in:
Scott Lahteine 2020-11-18 00:13:17 -06:00
parent 39305aa47c
commit 11b811820f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/HAL/LPC1768/main.cpp
View File

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

2
Marlin/src/HAL/STM32F1/HAL.cpp
View File

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

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

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