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

Merge branch 'Development' into planner_oh_planner

Browse Source 
Latest upstream commits
This commit is contained in:
Scott Lahteine
2015-03-22 23:40:29 -07:00
parent 88e81a4804 f65f61fa72
commit 34a41648ab
15 changed files with 99 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.h
View File

@ -240,7 +240,7 @@ extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in per
extern float filament_size[EXTRUDERS]; // cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder.
extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
extern float current_position[NUM_AXIS] ;
extern float add_homing[3];
extern float home_offset[3];
#ifdef DELTA
extern float endstop_adj[3];
extern float delta_radius;