Merge tag '2.0.5.3'

# Conflicts:
#	.gitignore
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	Marlin/src/HAL/LPC1768/upload_extra_script.py
#	Marlin/src/HAL/STM32F1/build_flags.py
#	buildroot/bin/generate_version
#	buildroot/bin/opt_add
#	buildroot/bin/opt_disable
#	buildroot/bin/opt_enable
#	buildroot/bin/opt_set
#	buildroot/bin/pins_set
#	buildroot/bin/restore_configs
#	buildroot/bin/use_example_configs
#	buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld
#	buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld
#	buildroot/share/PlatformIO/scripts/mks_robin_mini.py
#	buildroot/share/PlatformIO/scripts/mks_robin_nano.py
#	buildroot/share/fonts/genallfont.sh
#	buildroot/share/fonts/get-bdf2u8g.sh
#	buildroot/share/fonts/uxggenpages.sh
#	buildroot/share/git/README.md
#	buildroot/share/git/firstpush
#	buildroot/share/git/ghpc
#	buildroot/share/git/ghtp
#	buildroot/share/git/mfadd
#	buildroot/share/git/mfclean
#	buildroot/share/git/mfdoc
#	buildroot/share/git/mffp
#	buildroot/share/git/mfhelp
#	buildroot/share/git/mfinfo
#	buildroot/share/git/mfinit
#	buildroot/share/git/mfnew
#	buildroot/share/git/mfpr
#	buildroot/share/git/mfpub
#	buildroot/share/git/mfqp
#	buildroot/share/git/mfrb
#	buildroot/share/git/mftest
#	buildroot/share/git/mfup
#	buildroot/share/scripts/createSpeedLookupTable.py
#	buildroot/share/scripts/createTemperatureLookupMarlin.py
#	buildroot/share/scripts/findMissingTranslations.sh
#	buildroot/share/scripts/g29_auto.py
#	buildroot/share/scripts/pinsformat.js
#	buildroot/share/tests/DUE-tests
#	buildroot/share/tests/LPC1768-tests
#	buildroot/share/tests/LPC1769-tests
#	buildroot/share/tests/STM32F103RE-tests
#	buildroot/share/tests/STM32F103VE_longer-tests
#	buildroot/share/tests/STM32F407VE_black-tests
#	buildroot/share/tests/esp32-tests
#	buildroot/share/tests/linux_native-tests
#	buildroot/share/tests/mega2560-tests
#	buildroot/share/tests/run_tests
#	buildroot/share/tests/teensy31-tests
#	buildroot/share/tests/teensy35-tests
#	config/README.md
#	platformio.ini
This commit is contained in:
2020-10-03 16:47:31 -05:00
7 changed files with 472 additions and 1 deletions

View File

@ -340,6 +340,7 @@
*
* The fan turns on automatically whenever any driver is enabled and turns
* off (or reduces to idle speed) shortly after drivers are turned off.
*
*/
//#define USE_CONTROLLER_FAN
#if ENABLED(USE_CONTROLLER_FAN)
@ -1060,6 +1061,9 @@
* during SD printing. If the recovery file is found at boot time, present
* an option on the LCD screen to continue the print from the last-known
* point in the file.
*
* If the machine reboots when resuming a print you may need to replace or
* reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
*/
//#define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)