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

Merge branch 'Development' into delta_auto_bed_level

Browse Source 
Conflicts:
	Marlin/Marlin_main.cpp
This commit is contained in:
maverikou
2015-03-16 08:24:26 +02:00
parent 53abc5e2f1 cbe4496123
commit 8a739b6fba
124 changed files with 43168 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/planner.h
View File

@ -114,6 +114,7 @@ extern unsigned long max_acceleration_units_per_sq_second[NUM_AXIS]; // Use M201
extern float minimumfeedrate;
extern float acceleration; // Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX
extern float retract_acceleration; // mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX
extern float travel_acceleration; // Travel acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
extern float max_xy_jerk; //speed than can be stopped at once, if i understand correctly.
extern float max_z_jerk;
extern float max_e_jerk;