Merge branch 'Marlin_v1' into revert-1154-sd_sorting

Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
This commit is contained in:
daid
2014-12-18 23:13:50 +01:00
457 changed files with 135015 additions and 2649 deletions

View File

@ -344,8 +344,8 @@
#define D_FILAMENT 2.85
#define STEPS_MM_E 836
#define EXTRUTION_AREA (0.25 * D_FILAMENT * D_FILAMENT * 3.14159)
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS]/ EXTRUTION_AREA)
#define EXTRUSION_AREA (0.25 * D_FILAMENT * D_FILAMENT * 3.14159)
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS]/ EXTRUSION_AREA)
#endif // ADVANCE