thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/Development' into Development

Browse Source 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
This commit is contained in:
Jérémie FRANCOIS
2015-02-11 06:38:36 +01:00
parent 85e5aa4011 d75cd69de4
commit 9d75a56b56
95 changed files with 8144 additions and 4772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@@ -228,7 +228,7 @@
#define INVERT_Z_STEP_PIN false
#define INVERT_E_STEP_PIN false
//default stepper release if idle
//default stepper release if idle. Set to 0 to deactivate.
#define DEFAULT_STEPPER_DEACTIVE_TIME 60
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate