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

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse Source
This commit is contained in:
Bob-the-Kuhn
2019-04-17 15:34:29 -05:00
parent 57aaa9110b e1acc09c6e
commit 520585c5ed
208 changed files with 1900 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/examples/Micromake/C1/enhanced/Configuration.h
View File

@ -931,6 +931,9 @@
// Before deploy/stow pause for user confirmation
//#define PAUSE_BEFORE_DEPLOY_STOW
#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
//#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe
#endif
/**
* Enable one or more of the following if probing seems unreliable.

11
config/examples/Micromake/C1/enhanced/Configuration_adv.h
View File

@ -907,6 +907,17 @@
// Add an optimized binary file transfer mode, initiated with 'M28 B1'
//#define BINARY_FILE_TRANSFER
// LPC-based boards have on-board SD Card options. Override here or defaults apply.
#ifdef TARGET_LPC1768
//#define LPC_SD_LCD // Use the SD drive in the external LCD controller.
//#define LPC_SD_ONBOARD // Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
//#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD (as defined in a pins file).
//#define USB_SD_DISABLED // Disable SD Card access over USB (for security).
#if ENABLED(LPC_SD_ONBOARD)
//#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device.
#endif
#endif
#endif // SDSUPPORT
/**